diff --git a/terracumber_config/tf_files/SUSEManager-4.3-SLE-update.tf b/terracumber_config/tf_files/SUSEManager-4.3-SLE-update.tf
index 2e9ec3bbc..fc9530578 100644
--- a/terracumber_config/tf_files/SUSEManager-4.3-SLE-update.tf
+++ b/terracumber_config/tf_files/SUSEManager-4.3-SLE-update.tf
@@ -113,7 +113,7 @@ module "server" {
   source             = "./modules/server"
   base_configuration = module.base.configuration
   product_version    = "4.3-released"
-  name               = "srv"
+  name               = "server"
   provider_settings = {
     mac                = "aa:b2:92:05:00:f9"
     memory             = 16384
@@ -149,13 +149,13 @@ module "proxy" {
   source             = "./modules/proxy"
   base_configuration = module.base.configuration
   product_version    = "4.3-released"
-  name               = "pxy"
+  name               = "proxy"
   provider_settings = {
     mac                = "aa:b2:92:05:00:fa"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-su-43-srv.mgr.prv.suse.net"
+    hostname = "suma-su-43-server.mgr.prv.suse.net"
     username = "admin"
     password = "admin"
   }
@@ -177,7 +177,7 @@ module "sles15sp4_minion" {
   source             = "./modules/minion"
   base_configuration = module.base.configuration
   product_version    = "4.3-released"
-  name               = "min-sles15sp4"
+  name               = "sles15sp4-minion"
   image              = "sles15sp4o"
   provider_settings = {
     mac                = "aa:b2:92:05:00:fb"
@@ -185,7 +185,7 @@ module "sles15sp4_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-su-43-pxy.mgr.prv.suse.net"
+    hostname = "suma-su-43-proxy.mgr.prv.suse.net"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -198,7 +198,7 @@ module "sles15sp4_minion" {
 module "controller" {
   source             = "./modules/controller"
   base_configuration = module.base.configuration
-  name               = "ctl"
+  name               = "controller"
   provider_settings = {
     mac                = "aa:b2:92:05:00:f8"
     memory             = 16384
diff --git a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf
index bb36325b3..6ae4c2b32 100644
--- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf
+++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-NUE.tf
@@ -213,7 +213,7 @@ module "proxy" {
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-srv.mgr.suse.de"
+    hostname = "suma-bv-43-server.mgr.suse.de"
     username = "admin"
     password = "admin"
   }
diff --git a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf
index f592b7212..7e6a6d187 100644
--- a/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf
+++ b/terracumber_config/tf_files/SUSEManager-4.3-build-validation-PRV.tf
@@ -362,7 +362,7 @@ module "proxy" {
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-43-srv.mgr.prv.suse.net"
+    hostname = "suma-bv-43-server.mgr.prv.suse.net"
     username = "admin"
     password = "admin"
   }
diff --git a/terracumber_config/tf_files/SUSEManager-5.0-SLE-update.tf b/terracumber_config/tf_files/SUSEManager-5.0-SLE-update.tf
index 4de088e53..642d287e8 100644
--- a/terracumber_config/tf_files/SUSEManager-5.0-SLE-update.tf
+++ b/terracumber_config/tf_files/SUSEManager-5.0-SLE-update.tf
@@ -113,7 +113,7 @@ module "server_containerized" {
   source             = "./modules/server_containerized"
   base_configuration = module.base.configuration
   product_version    = "5.0-released"
-  name               = "srv"
+  name               = "server"
   image              = "slemicro55o"
   provider_settings = {
     mac                = "aa:b2:92:05:00:fd"
@@ -152,14 +152,14 @@ module "proxy_containerized" {
   source             = "./modules/proxy_containerized"
   base_configuration = module.base.configuration
   product_version    = "5.0-released"
-  name               = "pxy"
+  name               = "proxy"
   image              = "slemicro55o"
   provider_settings = {
     mac                = "aa:b2:92:05:00:fe"
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-su-50-srv.mgr.prv.suse.net"
+    hostname = "suma-su-50-server.mgr.prv.suse.net"
     username = "admin"
     password = "admin"
   }
@@ -180,7 +180,7 @@ module "sles15sp6_minion" {
   source             = "./modules/minion"
   base_configuration = module.base.configuration
   product_version    = "5.0-released"
-  name               = "min-sles15sp6"
+  name               = "sles15sp6-minion"
   image              = "sles15sp6o"
   provider_settings = {
     mac                = "aa:b2:92:05:00:ff"
@@ -188,7 +188,7 @@ module "sles15sp6_minion" {
   }
 
   server_configuration = {
-    hostname = "suma-su-50-pxy.mgr.prv.suse.net"
+    hostname = "suma-su-50-proxy.mgr.prv.suse.net"
   }
   auto_connect_to_master  = false
   use_os_released_updates = false
@@ -201,7 +201,7 @@ module "sles15sp6_minion" {
 module "controller" {
   source             = "./modules/controller"
   base_configuration = module.base.configuration
-  name               = "ctl"
+  name               = "controller"
   provider_settings = {
     mac                = "aa:b2:92:05:00:fc"
     memory             = 16384
diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf
index f9cf72a9a..e05a5f2b5 100644
--- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf
+++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-PRV.tf
@@ -359,7 +359,7 @@ module "proxy_containerized" {
     memory             = 4096
   }
   server_configuration = {
-    hostname = "suma-bv-50-srv.mgr.prv.suse.net"
+    hostname = "suma-bv-50-server.mgr.prv.suse.net"
     username = "admin"
     password = "admin"
   }
diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf
index fa1060ae8..ebf581f76 100644
--- a/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf
+++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-NUE.tf
@@ -216,7 +216,7 @@ module "proxy_containerized" {
     memory             = 4096
   }
   server_configuration = {
-    hostname = "uyuni-bv-master-srv.mgr.suse.de"
+    hostname = "uyuni-bv-master-server.mgr.suse.de"
     username = "admin"
     password = "admin"
   }
diff --git a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf
index a3f705ca4..c0a9afd0f 100644
--- a/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf
+++ b/terracumber_config/tf_files/Uyuni-Master-build-validation-PRV.tf
@@ -364,7 +364,7 @@ module "proxy_containerized" {
     memory             = 4096
   }
   server_configuration = {
-    hostname = "uyuni-bv-master-srv.mgr.prv.suse.net"
+    hostname = "uyuni-bv-master-server.mgr.prv.suse.net"
     username = "admin"
     password = "admin"
   }