diff --git a/terracumber_config/tf_files/SUSEManager-5.0-NUE.tf b/terracumber_config/tf_files/SUSEManager-5.0-NUE.tf
index 15301deff..48eaeb678 100644
--- a/terracumber_config/tf_files/SUSEManager-5.0-NUE.tf
+++ b/terracumber_config/tf_files/SUSEManager-5.0-NUE.tf
@@ -143,7 +143,7 @@ module "cucumber_testsuite" {
       main_disk_size = 500
       login_timeout = 28800
       runtime = "podman"
-      container_repository = "registry.suse.de/devel/galaxy/manager/5.0/containerfile/suse/manager/5.0/x86_64"
+      container_repository = "registry.suse.de/devel/galaxy/manager/5.0/containerfile"
       container_tag = "latest"
     }
     proxy_containerized = {
@@ -157,7 +157,7 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
       runtime = "podman"
-      container_repository = "registry.suse.de/devel/galaxy/manager/5.0/containerfile/suse/manager/5.0/x86_64"
+      container_repository = "registry.suse.de/devel/galaxy/manager/5.0/containerfile"
       container_tag = "latest"
     }
     suse-minion = {
diff --git a/terracumber_config/tf_files/SUSEManager-5.0-PRV.tf b/terracumber_config/tf_files/SUSEManager-5.0-PRV.tf
index 98590d21d..761e4e9b0 100644
--- a/terracumber_config/tf_files/SUSEManager-5.0-PRV.tf
+++ b/terracumber_config/tf_files/SUSEManager-5.0-PRV.tf
@@ -143,7 +143,7 @@ module "cucumber_testsuite" {
       main_disk_size = 500
       login_timeout = 28800
       runtime = "podman"
-      container_repository = "registry.suse.de/devel/galaxy/manager/5.0/containerfile/suse/manager/5.0/x86_64"
+      container_repository = "registry.suse.de/devel/galaxy/manager/5.0/containerfile"
       container_tag = "latest"
     }
     proxy_containerized = {
@@ -157,7 +157,7 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
       runtime = "podman"
-      container_repository = "registry.suse.de/devel/galaxy/manager/5.0/containerfile/suse/manager/5.0/x86_64"
+      container_repository = "registry.suse.de/devel/galaxy/manager/5.0/containerfile"
       container_tag = "latest"
     }
     suse-minion = {
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 7a8db2e51..2226253ad 100644
--- a/terracumber_config/tf_files/SUSEManager-5.0-SLE-update.tf
+++ b/terracumber_config/tf_files/SUSEManager-5.0-SLE-update.tf
@@ -166,7 +166,7 @@ module "proxy_containerized" {
 
   runtime              = "podman"
   // Temporary workaround to see if we pass proxy stage. Also needs to be updated on next MU
-  container_repository = "registry.suse.de/suse/maintenance/35237/suse_sle-15-sp6_update_products_manager50_update_containerfile/suse/manager/5.0/x86_64"
+  container_repository = "registry.suse.de/suse/maintenance/35237/suse_sle-15-sp6_update_products_manager50_update_containerfile"
   container_tag         = "latest"
 
   auto_configure            = false
diff --git a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf
index eb5a13b82..c71f2ef7b 100644
--- a/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf
+++ b/terracumber_config/tf_files/SUSEManager-5.0-build-validation-NUE.tf
@@ -215,7 +215,7 @@ module "proxy_containerized" {
     password = "admin"
   }
   runtime = "podman"
-  container_repository = "registry.suse.de/suse/sle-15-sp6/update/products/manager50/containerfile/suse/manager/5.0/x86_64"
+  container_repository = "registry.suse.de/suse/sle-15-sp6/update/products/manager50/containerfile"
   auto_configure            = false
   ssh_key_path              = "./salt/controller/id_rsa.pub"
 }
diff --git a/terracumber_config/tf_files/SUSEManager-5.0-refenv-NUE.tf b/terracumber_config/tf_files/SUSEManager-5.0-refenv-NUE.tf
index 41c6bf6cd..b25ae1157 100644
--- a/terracumber_config/tf_files/SUSEManager-5.0-refenv-NUE.tf
+++ b/terracumber_config/tf_files/SUSEManager-5.0-refenv-NUE.tf
@@ -158,7 +158,7 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
       runtime = "podman"
-      container_repository = "registry.suse.de/suse/sle-15-sp6/update/products/manager50/containerfile/suse/manager/5.0/x86_64"
+      container_repository = "registry.suse.de/suse/sle-15-sp6/update/products/manager50/containerfile"
       container_tag = "latest"
     }
     suse-minion = {
diff --git a/terracumber_config/tf_files/SUSEManager-Head-NUE.tf b/terracumber_config/tf_files/SUSEManager-Head-NUE.tf
index 5b0b2ea27..4cebaade4 100644
--- a/terracumber_config/tf_files/SUSEManager-Head-NUE.tf
+++ b/terracumber_config/tf_files/SUSEManager-Head-NUE.tf
@@ -156,7 +156,7 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
       runtime = "podman"
-      container_repository = "registry.suse.de/devel/galaxy/manager/head/containerfile/suse/manager/5.1/x86_64"
+      container_repository = "registry.suse.de/devel/galaxy/manager/head/containerfile"
       container_tag = "latest"
     }
     suse-minion = {
diff --git a/terracumber_config/tf_files/SUSEManager-Head-refenv-NUE.tf b/terracumber_config/tf_files/SUSEManager-Head-refenv-NUE.tf
index af0e29147..9a6af8cc0 100644
--- a/terracumber_config/tf_files/SUSEManager-Head-refenv-NUE.tf
+++ b/terracumber_config/tf_files/SUSEManager-Head-refenv-NUE.tf
@@ -158,7 +158,7 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
       runtime = "podman"
-      container_repository = "registry.suse.de/devel/galaxy/manager/head/containerfile/suse/manager/5.1/x86_64"
+      container_repository = "registry.suse.de/devel/galaxy/manager/head/containerfile"
       container_tag = "latest"
     }
     suse-minion = {
diff --git a/terracumber_config/tf_files/SUSEManager-Test-Hexagon-NUE.tf b/terracumber_config/tf_files/SUSEManager-Test-Hexagon-NUE.tf
index 83eec2498..e3fbb8907 100644
--- a/terracumber_config/tf_files/SUSEManager-Test-Hexagon-NUE.tf
+++ b/terracumber_config/tf_files/SUSEManager-Test-Hexagon-NUE.tf
@@ -117,6 +117,7 @@ module "cucumber_testsuite" {
   git_profiles_repo = "https://github.com/uyuni-project/uyuni.git#:testsuite/features/profiles/internal_nue"
   
   container_server = true
+  container_proxy = true
   
   mirror                   = "minima-mirror-ci-bv.mgr.suse.de"
   use_mirror_images        = true
@@ -139,7 +140,7 @@ module "cucumber_testsuite" {
       main_disk_size = 500
       login_timeout = 28800
       runtime = "podman"
-      container_repository = "registry.suse.de/devel/galaxy/manager/test/hexagon/containerfile/suse/manager/5.0/x86_64"
+      container_repository = "registry.suse.de/devel/galaxy/manager/test/hexagon/containerfile"
       additional_repos = {
         Test_repo = "http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/TEST:/Hexagon/SLE_15_SP6/"
       }
diff --git a/terracumber_config/tf_files/SUSEManager-Test-Orion-NUE.tf b/terracumber_config/tf_files/SUSEManager-Test-Orion-NUE.tf
index 878ba51c4..e01089241 100644
--- a/terracumber_config/tf_files/SUSEManager-Test-Orion-NUE.tf
+++ b/terracumber_config/tf_files/SUSEManager-Test-Orion-NUE.tf
@@ -139,7 +139,7 @@ module "cucumber_testsuite" {
       }
       login_timeout = 28800
       runtime = "podman"
-      container_repository = "registry.suse.de/devel/galaxy/manager/test/orion/containerfile/suse/manager/5.0/x86_64"
+      container_repository = "registry.suse.de/devel/galaxy/manager/test/orion/containerfile"
       container_tag = "latest"
       additional_repos = {
         Test_repo = "http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/TEST:/Orion/SLE_15_SP5/"
@@ -156,7 +156,7 @@ module "cucumber_testsuite" {
       additional_packages = [ "venv-salt-minion" ]
       install_salt_bundle = true
       runtime = "podman"
-      container_repository = "registry.suse.de/devel/galaxy/manager/test/orion/containerfile/suse/manager/5.0/x86_64"
+      container_repository = "registry.suse.de/devel/galaxy/manager/test/orion/containerfile"
       container_tag = "latest"
       additional_repos = {
         Test_repo = "http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/TEST:/Orion/SLE_15_SP5/"