diff --git a/jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy b/jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy
index ba0ca7104..a4c82fa47 100644
--- a/jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy
+++ b/jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy
@@ -6,7 +6,16 @@ def run(params) {
 
         // The junit plugin doesn't affect full paths
         junit_resultdir = "results/${BUILD_NUMBER}/results_junit"
-        env.common_params = "--outputdir ${resultdir} --tf ${params.tf_file} --gitfolder ${resultdir}/sumaform --terraform-bin ${params.bin_path}"
+
+        String tf_file             = 'susemanager-ci/terracumber_config/tf_files/templates/salt-shaker.tf'
+        String tfvariables_file    = 'susemanager-ci/terracumber_config/tf_files/variables/salt-shaker.tf'
+        String tfvars_file         = 'susemanager-ci/terracumber_config/tf_files/tfvars/salt-shaker/salt-shaker.tfvars'
+
+        GString common_params = "--outputdir ${resultdir} --tf ${tf_file} --tf_variables_description_file ${tfvariables_file} --gitfolder ${resultdir}/sumaform --terraform-bin ${params.bin_path}"
+
+        if (params.deploy_parallelism) {
+            common_params = "${common_params} --parallelism ${params.deploy_parallelism}"
+        }
 
         // Start pipeline
         deployed = false
@@ -27,19 +36,18 @@ def run(params) {
             }
             stage('Deploy') {
                 // Provision the environment
+                String TERRAFORM_INIT = ''
                 if (params.terraform_init) {
-                    env.TERRAFORM_INIT = '--init'
-                } else {
-                    env.TERRAFORM_INIT = ''
+                    TERRAFORM_INIT = '--init'
                 }
-                env.TERRAFORM_TAINT = ''
+                String TERRAFORM_TAINT = ''
                 if (params.terraform_taint) {
                     switch(params.sumaform_backend) {
                         case "libvirt":
-                            env.TERRAFORM_TAINT = " --taint '.*(domain|combustion_disk|cloudinit_disk|ignition_disk|main_disk|data_disk|database_disk|standalone_provisioning).*'";
+                            TERRAFORM_TAINT = " --taint '.*(domain|combustion_disk|cloudinit_disk|ignition_disk|main_disk|data_disk|database_disk|standalone_provisioning).*'";
                             break;
                         case "aws":
-                            env.TERRAFORM_TAINT = " --taint '.*(host).*'";
+                            TERRAFORM_TAINT = " --taint '.*(host).*'";
                             break;
                         default:
                             println("ERROR: Unknown backend ${params.sumaform_backend}");
@@ -47,8 +55,12 @@ def run(params) {
                             break;
                     }
                 }
+                // Write the tfvars file and append the selected environment key
+                sh "rm -f ${resultdir}/sumaform/terraform.tfvars"
+                sh "cat ${tfvars_file} >> ${resultdir}/sumaform/terraform.tfvars"
+                sh "echo 'ENVIRONMENT = \"${params.minion}\"' >> ${resultdir}/sumaform/terraform.tfvars"
                 retry(count: 3) {
-                    sh "set +x; source /home/jenkins/.credentials set -x; export TERRAFORM=${params.bin_path}; export TERRAFORM_PLUGINS=${params.bin_plugins_path}; ./terracumber-cli ${common_params} --logfile ${resultdirbuild}/sumaform.log ${env.TERRAFORM_INIT} ${env.TERRAFORM_TAINT} --sumaform-backend ${params.sumaform_backend} --runstep provision"
+                    sh "set +x; source /home/jenkins/.credentials set -x; export TERRAFORM=${params.bin_path}; export TERRAFORM_PLUGINS=${params.bin_plugins_path}; ./terracumber-cli ${common_params} --logfile ${resultdirbuild}/sumaform.log ${TERRAFORM_INIT} ${TERRAFORM_TAINT} --sumaform-backend ${params.sumaform_backend} --runstep provision"
                     deployed = true
                     if (params.wait_after_deploy) {
                         echo "Waiting ${params.wait_after_deploy} seconds after sumaform deployment (usually to allow transactional system to reboot)"
@@ -100,7 +112,7 @@ def run(params) {
         }
         finally {
             stage('Save TF state') {
-                    archiveArtifacts artifacts: "results/sumaform/terraform.tfstate, results/sumaform/.terraform/**/*"
+                archiveArtifacts artifacts: "results/sumaform/terraform.tfstate, results/sumaform/.terraform/**/*"
             }
 
             stage('Get results') {
diff --git a/jenkins_pipelines/environments/manager-Head-infra-reference-mcp-server b/jenkins_pipelines/environments/manager-Head-infra-reference-mcp-server
index 2c07bde3e..05cd51f92 100644
--- a/jenkins_pipelines/environments/manager-Head-infra-reference-mcp-server
+++ b/jenkins_pipelines/environments/manager-Head-infra-reference-mcp-server
@@ -27,9 +27,9 @@ node('sumaform-cucumber') {
 
             // The junit plugin doesn't affect full paths
             junit_resultdir = "results/${BUILD_NUMBER}/results_junit"
-            env.common_params = "--outputdir ${resultdir} --tf ${params.tf_file} --gitfolder ${resultdir}/sumaform --terraform-bin ${params.bin_path}"
+            common_params = "--outputdir ${resultdir} --tf ${params.tf_file} --gitfolder ${resultdir}/sumaform --terraform-bin ${params.bin_path}"
             if (params.deploy_parallelism) {
-                env.common_params = "${env.common_params} --parallelism ${params.deploy_parallelism}"
+                common_params = "${common_params} --parallelism ${params.deploy_parallelism}"
             }
 
             // Start pipeline
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux10-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux10-bundle
index eaafbcd42..bd86bf8e7 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux10-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux10-bundle
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux10-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-almalinux10-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux8 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux8
index 5add20dcb..34db9d729 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux8
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux8
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux8.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-almalinux8"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux8-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux8-bundle
index 37a52926b..4248c8d4d 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux8-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux8-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux8-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-almalinux8-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux9-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux9-bundle
index d3ec93971..67eeea619 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux9-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-almalinux9-bundle
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux9-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-almalinux9-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-centos7-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-centos7-bundle
index 97f8b8be3..df3e980c6 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-centos7-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-centos7-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-CENTOS7-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-centos7-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-debian11-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-debian11-bundle
index de710adfc..c2c8003b4 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-debian11-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-debian11-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian11-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-debian11-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-debian12-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-debian12-bundle
index 9592911ed..ff315355f 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-debian12-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-debian12-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian12-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-debian12-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-leap156 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-leap156
index 439a8267a..a3adb44a5 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-leap156
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-leap156
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap156.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-leap156"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-leap156-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-leap156-bundle
index 10fb57462..8e90775e0 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-leap156-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-leap156-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap156-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-leap156-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles12sp5-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles12sp5-bundle
index 2ca218456..7bc37a5e6 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles12sp5-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles12sp5-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES12SP5-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-sles12sp5-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp3 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp3
index 3c404c5ea..decd782e3 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp3
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp3
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP3.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-sles15sp3"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp3-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp3-bundle
index 25c4df651..bf610490f 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp3-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp3-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP3-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-sles15sp3-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp4 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp4
index 553edfe66..c451f6a6f 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp4
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp4
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP4.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-sles15sp4"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp4-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp4-bundle
index 2a2f8fe97..3a5648ca4 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp4-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp4-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP4-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-sles15sp4-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp5 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp5
index c3153bdf7..672a77bfd 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp5
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp5
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP5.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-sles15sp5"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp5-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp5-bundle
index f2d978cfe..16f19b3de 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp5-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp5-bundle
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP5-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-sles15sp5-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp6 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp6
index 4f68557bb..aa73b8deb 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp6
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp6
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP6.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-sles15sp6"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp6-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp6-bundle
index 93f6f850a..740980bf1 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp6-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp6-bundle
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP6-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-sles15sp6-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp7 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp7
index 1e3394ee5..12916a517 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp7
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp7
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP7.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-sles15sp7"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp7-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp7-bundle
index 96e3de40c..37be99865 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp7-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-sles15sp7-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP7-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-sles15sp7-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro60 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro60
index caf4c78d8..4a1edb272 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro60
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro60
@@ -25,7 +25,6 @@ node('salt-shaker-tests') {
             string(name: 'wait_after_deploy', defaultValue: '120', description: 'Optional: Seconds to wait after deployment is done (usually to allow transactional systems to reboot)'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro60.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -44,7 +43,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-slmicro60"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro60-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro60-bundle
index b2f0e43b7..594d5a611 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro60-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro60-bundle
@@ -25,7 +25,6 @@ node('salt-shaker-tests') {
             string(name: 'wait_after_deploy', defaultValue: '120', description: 'Optional: Seconds to wait after deployment is done (usually to allow transactional systems to reboot)'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro60-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -44,7 +43,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-slmicro60-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro61 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro61
index 1f02a8dba..ec3853c32 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro61
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro61
@@ -25,7 +25,6 @@ node('salt-shaker-tests') {
             string(name: 'wait_after_deploy', defaultValue: '120', description: 'Optional: Seconds to wait after deployment is done (usually to allow transactional systems to reboot)'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro61.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -44,7 +43,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-slmicro61"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro61-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro61-bundle
index ab7b090bd..601b8cf93 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro61-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-slmicro61-bundle
@@ -25,7 +25,6 @@ node('salt-shaker-tests') {
             string(name: 'wait_after_deploy', defaultValue: '120', description: 'Optional: Seconds to wait after deployment is done (usually to allow transactional systems to reboot)'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro61-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -44,7 +43,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-slmicro61-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu1804 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu1804
index cd2197316..48468a065 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu1804
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu1804
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu1804.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-ubuntu1804"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu1804-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu1804-bundle
index 1d37c7b20..b0ae15faa 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu1804-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu1804-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu1804-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-ubuntu1804-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2004 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2004
index 793a1026e..91c4d71e2 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2004
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2004
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2004.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-ubuntu2004"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2004-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2004-bundle
index aebe8ad9a..33322c0d5 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2004-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2004-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2004-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-ubuntu2004-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2204-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2204-bundle
index 27e8d154d..5554ae5bc 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2204-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2204-bundle
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2204-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-ubuntu2204-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2404-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2404-bundle
index 4e3f066fd..cba97b026 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2404-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-next-ubuntu2404-bundle
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2404-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "next-ubuntu2404-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux10-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux10-bundle
index 5e9dfb660..29f65fb11 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux10-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux10-bundle
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux10-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-almalinux10-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux8 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux8
index 111fb35a5..d765bf66f 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux8
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux8
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux8.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-almalinux8"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux8-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux8-bundle
index 70b119d9a..ec1b0c64e 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux8-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux8-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux8-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-almalinux8-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux9-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux9-bundle
index a37f71a10..d8d9c27db 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux9-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-almalinux9-bundle
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux9-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-almalinux9-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-centos7-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-centos7-bundle
index a04d0498f..28dd7f834 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-centos7-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-centos7-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-CENTOS7-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-centos7-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-debian12-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-debian12-bundle
index a9184d041..325d1558b 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-debian12-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-debian12-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian12-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-debian12-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-leap156 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-leap156
index 7361a26f8..b260438b9 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-leap156
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-leap156
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap156.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-leap156"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-leap156-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-leap156-bundle
index 9a9095ba7..89f163e1b 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-leap156-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-leap156-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap156-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-leap156-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles12sp5-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles12sp5-bundle
index 5b4597467..d3a71f39a 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles12sp5-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles12sp5-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES12SP5-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-sles12sp5-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp3 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp3
index fae87f0ba..48ba455d4 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp3
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp3
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP3.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-sles15sp3"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp3-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp3-bundle
index 9ee4ddc7e..c376106d4 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp3-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp3-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP3-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-sles15sp3-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp4 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp4
index 58aca08de..72ce87506 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp4
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp4
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP4.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-sles15sp4"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp4-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp4-bundle
index 015daf11a..21b91e4bf 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp4-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp4-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP4-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-sles15sp4-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp5 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp5
index bb82bce2f..1767a35bd 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp5
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp5
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP5.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-sles15sp5"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp5-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp5-bundle
index a1d9d9385..f1417f097 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp5-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp5-bundle
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP5-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-sles15sp5-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp6 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp6
index 2dfbc6a89..687e27549 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp6
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp6
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP6.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-sles15sp6"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp6-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp6-bundle
index 34b1cc305..23c38a030 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp6-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp6-bundle
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP6-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-sles15sp6-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp7 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp7
index 0351a32da..1710e4411 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp7
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp7
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP7.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-sles15sp7"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp7-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp7-bundle
index 3da9afddc..2a272b3cb 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp7-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-sles15sp7-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP7-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-sles15sp7-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro60 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro60
index b3feb32fd..b06534ce0 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro60
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro60
@@ -25,7 +25,6 @@ node('salt-shaker-tests') {
             string(name: 'wait_after_deploy', defaultValue: '120', description: 'Optional: Seconds to wait after deployment is done (usually to allow transactional systems to reboot)'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro60.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -44,7 +43,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-slmicro60"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro60-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro60-bundle
index 855d744de..03f758069 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro60-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro60-bundle
@@ -25,7 +25,6 @@ node('salt-shaker-tests') {
             string(name: 'wait_after_deploy', defaultValue: '120', description: 'Optional: Seconds to wait after deployment is done (usually to allow transactional systems to reboot)'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro60-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -44,7 +43,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-slmicro60-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro61 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro61
index d2915252f..1fc6a699d 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro61
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro61
@@ -25,7 +25,6 @@ node('salt-shaker-tests') {
             string(name: 'wait_after_deploy', defaultValue: '120', description: 'Optional: Seconds to wait after deployment is done (usually to allow transactional systems to reboot)'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro61.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -44,7 +43,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-slmicro61"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro61-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro61-bundle
index f4a5ed5b3..cff4a7031 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro61-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-slmicro61-bundle
@@ -25,7 +25,6 @@ node('salt-shaker-tests') {
             string(name: 'wait_after_deploy', defaultValue: '120', description: 'Optional: Seconds to wait after deployment is done (usually to allow transactional systems to reboot)'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro61-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -44,7 +43,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-slmicro61-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu1804 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu1804
index fec91ac70..25e0311c5 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu1804
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu1804
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu1804.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-ubuntu1804"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu1804-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu1804-bundle
index a6ce08e6e..15356c5e7 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu1804-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu1804-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu1804-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-ubuntu1804-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2004 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2004
index 929ff26c1..3cf89f621 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2004
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2004
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2004.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-ubuntu2004"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2004-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2004-bundle
index 1325fa5b8..745ec064a 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2004-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2004-bundle
@@ -12,7 +12,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2004-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -31,7 +30,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-ubuntu2004-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2204-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2204-bundle
index 036cb6625..af91f0af2 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2204-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2204-bundle
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2204-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-ubuntu2204-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2404-bundle b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2404-bundle
index 9c00a29d9..5b0416587 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2404-bundle
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-products-testing-ubuntu2404-bundle
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2404-Bundle.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "testing-ubuntu2404-bundle"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-saltstack-leap156 b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-saltstack-leap156
index 15e311c79..e1c71248d 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-saltstack-leap156
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-saltstack-leap156
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap156.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "saltstack-leap156"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-saltstack-tumbleweed b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-saltstack-tumbleweed
index 45bce228c..2b5eb1bef 100644
--- a/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-saltstack-tumbleweed
+++ b/jenkins_pipelines/environments/salt-shaker/manager-salt-shaker-saltstack-tumbleweed
@@ -23,7 +23,6 @@ node('salt-shaker-tests') {
             booleanParam(name: 'run_functional_tests', defaultValue: true, description: 'Run the Salt functional tests'),
             string(name: 'cucumber_ref', defaultValue: 'master', description: 'Testsuite Git reference (branch, tag...)'),
             string(name: 'skip_list_url', defaultValue: 'https://github.com/openSUSE/salt-test-skiplist/raw/refs/heads/main/skipped_tests.toml', description: 'URL to the skiplist.toml file to run Salt shaker'),
-            string(name: 'tf_file', defaultValue: 'susemanager-ci/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Tumbleweed.tf', description: 'Path to the tf file to be used'),
             string(name: 'sumaform_gitrepo', defaultValue: 'https://github.com/uyuni-project/sumaform.git', description: 'Sumaform Git Repository'),
             string(name: 'sumaform_ref', defaultValue: 'master', description: 'Sumaform Git reference (branch, tag...)'),
             choice(name: 'sumaform_backend', choices: ['libvirt', 'aws'], description: 'Sumaform backend to be used (see https://github.com/uyuni-project/sumaform#backend-choice)'),
@@ -42,7 +41,9 @@ node('salt-shaker-tests') {
         checkout scm
     }
     timeout(activity: false, time: 3, unit: 'HOURS') {
+        def mutableParams = [:] + params
+        mutableParams.minion = "saltstack-tumbleweed"
         def pipeline = load "jenkins_pipelines/environments/common/pipeline-salt-shaker.groovy"
-        pipeline.run(params)
+        pipeline.run(mutableParams)
     }
 }
diff --git a/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-code-coverage b/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-code-coverage
index e71a2c3e8..c4b7d913f 100644
--- a/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-code-coverage
+++ b/jenkins_pipelines/environments/uyuni-master-dev-acceptance-tests-code-coverage
@@ -32,10 +32,10 @@ node('sumaform-cucumber-slc1') {
 
         // The junit plugin doesn't affect full paths
         junit_resultdir = "results/${BUILD_NUMBER}/results_junit"
-        env.common_params = "--outputdir ${resultdir} --tf ${params.tf_file} --gitfolder ${resultdir}/sumaform --terraform-bin ${params.bin_path}"
+        common_params = "--outputdir ${resultdir} --tf ${params.tf_file} --gitfolder ${resultdir}/sumaform --terraform-bin ${params.bin_path}"
         env.cucumber_cmd = "--logfile ${resultdirbuild}/testsuite.log --runstep cucumber --cucumber-cmd"
         if (params.deploy_parallelism) {
-            env.common_params = "${env.common_params} --parallelism ${params.deploy_parallelism}"
+            common_params = "${common_params} --parallelism ${params.deploy_parallelism}"
         }
 
         // Start pipeline
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux10-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux10-Bundle.tf
deleted file mode 100644
index 7f6eee79a..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux10-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-almalinux10-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - AlmaLinux10 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - AlmaLinux10 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "almalinux10o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-almalinux10-bundle"
-  image              = "almalinux10o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:0a"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux8-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux8-Bundle.tf
deleted file mode 100644
index 1c9782c2d..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux8-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-almalinux8-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - AlmaLinux8 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - AlmaLinux8 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "almalinux8o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-almalinux8-bundle"
-  image              = "almalinux8o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:05"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux8.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux8.tf
deleted file mode 100644
index f203cd325..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux8.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-almalinux8"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - AlmaLinux8 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - AlmaLinux8: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "almalinux8o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-almalinux8"
-  image              = "almalinux8o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:04"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux9-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux9-Bundle.tf
deleted file mode 100644
index 30457f2bb..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux9-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-almalinux9-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - AlmaLinux9 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - AlmaLinux9 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "almalinux9o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-almalinux9-bundle"
-  image              = "almalinux9o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:06"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-CENTOS7-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-CENTOS7-Bundle.tf
deleted file mode 100644
index 38fc2717c..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-CENTOS7-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-centos7-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - CentOS7 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - CentOS7 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "centos7o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-centos7-bundle"
-  image              = "centos7o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:07"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian10-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian10-Bundle.tf
deleted file mode 100644
index 32288764f..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian10-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-debian10-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Debian10 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Debian10 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "debian10o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-debian10-bundle"
-  image              = "debian10o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:09"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian10.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian10.tf
deleted file mode 100644
index 8584bb74c..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian10.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-debian10"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Debian10 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Debian10: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "debian10o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-debian10"
-  image              = "debian10o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:08"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian12-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian12-Bundle.tf
deleted file mode 100644
index eb967494b..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian12-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-debian12-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Debian12 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Debian12 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "debian12o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-debian12-bundle"
-  image              = "debian12o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:0b"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap156-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap156-Bundle.tf
deleted file mode 100644
index 89a5aee91..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap156-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-leap156-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Leap 15.6 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Leap 15.6 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "opensuse156o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-leap156-bundle"
-  image              = "opensuse156o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:0d"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap156.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap156.tf
deleted file mode 100644
index 38222a52b..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap156.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-leap156"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Leap 15.6 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Leap 15.6: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "opensuse156o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-leap156"
-  image              = "opensuse156o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:0c"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES12SP5-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES12SP5-Bundle.tf
deleted file mode 100644
index b277aef31..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES12SP5-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles12sp5-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES12SP5 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES12SP5 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles12sp5o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles12sp5-bundle"
-  image              = "sles12sp5o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:0e"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP1-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP1-Bundle.tf
deleted file mode 100644
index 1ed496b24..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP1-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp1-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP1 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP1 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp1o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles15sp1-bundle"
-  image              = "sles15sp1o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:10"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP1.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP1.tf
deleted file mode 100644
index 6962ddb22..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP1.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp1"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP1 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP1: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp1o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles15sp1"
-  image              = "sles15sp1o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:0f"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP3-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP3-Bundle.tf
deleted file mode 100644
index d90cec02f..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP3-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp3-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP3 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP3 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp3o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles15sp3-bundle"
-  image              = "sles15sp3o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:14"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP3.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP3.tf
deleted file mode 100644
index ef0f5d2fe..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP3.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp3"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP3 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP3: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp3o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles15sp3"
-  image              = "sles15sp3o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:13"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP4-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP4-Bundle.tf
deleted file mode 100644
index 44f6dd9c2..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP4-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp4-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP4 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP4 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp4o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles15sp4-bundle"
-  image              = "sles15sp4o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:16"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP4.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP4.tf
deleted file mode 100644
index 37604baff..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP4.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp4"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP4 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP4: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp4o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles15sp4"
-  image              = "sles15sp4o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:15"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP5-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP5-Bundle.tf
deleted file mode 100644
index 9b764efd9..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP5-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp5-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP5 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP5 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp5o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles15sp5-bundle"
-  image              = "sles15sp5o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:18"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP5.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP5.tf
deleted file mode 100644
index 41a7028e8..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP5.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp5"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP5 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP5: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp5o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles15sp5"
-  image              = "sles15sp5o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:17"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP6-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP6-Bundle.tf
deleted file mode 100644
index 488cb9370..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP6-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp6-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - products:next - SLES15SP6 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - products:next - SLES15SP6 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp6o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles15sp6-bundle"
-  image              = "sles15sp6o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:1a"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP6.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP6.tf
deleted file mode 100644
index 13f8543a3..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP6.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp6"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - products:next - SLES15SP6 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - products:next - SLES15SP5: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp6o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles15sp6"
-  image              = "sles15sp6o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:19"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP7-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP7-Bundle.tf
deleted file mode 100644
index a8c0f939c..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP7-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp7-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP7 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP7 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp7o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles15sp7-bundle"
-  image              = "sles15sp7o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:12"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP7.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP7.tf
deleted file mode 100644
index d5fc87865..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP7.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp7"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP7 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - SLES15SP7: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp7o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-sles15sp7"
-  image              = "sles15sp7o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:11"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro60-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro60-Bundle.tf
deleted file mode 100644
index c2b94d733..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro60-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-slmicro60-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - products:next - SLMicro6.0 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - products:next - SLMicro6.0 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "slmicro60o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-slmicro60-bundle"
-  image              = "slmicro60o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:03"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro60.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro60.tf
deleted file mode 100644
index a21023eba..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro60.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-slmicro60"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - products:next - SLMicro6.0 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - products:next - SLMicro6.0: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "slmicro60o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-slmicro60"
-  image              = "slmicro60o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:02"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro61-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro61-Bundle.tf
deleted file mode 100644
index 11b1ad113..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro61-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-slmicro61-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - products:next - SLMicro6.1 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - products:next - SLMicro6.1 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "slmicro61o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-slmicro61-bundle"
-  image              = "slmicro61o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:09"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro61.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro61.tf
deleted file mode 100644
index 38e65c7f0..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro61.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-slmicro61"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - products:next - SLMicro6.1 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - products:next - SLMicro6.1: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "slmicro61o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-slmicro61"
-  image              = "slmicro61o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:08"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu1804-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu1804-Bundle.tf
deleted file mode 100644
index faf579dd4..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu1804-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-ubuntu1804-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Ubuntu1804 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Ubuntu1804 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "ubuntu1804o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-ubuntu1804-bundle"
-  image              = "ubuntu1804o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:1c"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu1804.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu1804.tf
deleted file mode 100644
index 590e39910..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu1804.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-ubuntu1804"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Ubuntu1804 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Ubuntu1804: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "ubuntu1804o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-ubuntu1804"
-  image              = "ubuntu1804o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:1b"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2004-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2004-Bundle.tf
deleted file mode 100644
index 197ea1074..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2004-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-ubuntu2004-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Ubuntu2004 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Ubuntu2004 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "ubuntu2004o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-ubuntu2004-bundle"
-  image              = "ubuntu2004o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:1e"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2004.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2004.tf
deleted file mode 100644
index f8d22a9d7..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2004.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-ubuntu2004"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Ubuntu2004 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Ubuntu2004: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "ubuntu2004o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-ubuntu2004"
-  image              = "ubuntu2004o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:1d"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2204-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2204-Bundle.tf
deleted file mode 100644
index 12750bcbb..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2204-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-ubuntu2204-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Ubuntu2204 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Ubuntu2204 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "ubuntu2204o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-ubuntu2204-bundle"
-  image              = "ubuntu2204o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:1f"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2404-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2404-Bundle.tf
deleted file mode 100644
index 1b9e79a5f..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2404-Bundle.tf
+++ /dev/null
@@ -1,116 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-ubuntu2404-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Ubuntu2404 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:next - Ubuntu2404 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-04.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "ubuntu2404o" ]
-}
-
-module "salt-shaker-products-next" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-next-ubuntu2404-bundle"
-  image              = "ubuntu2404o"
-  salt_obs_flavor    = "saltstack:products:next"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:3e"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-next.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap156.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap156.tf
deleted file mode 100644
index b963e369b..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap156.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-saltstack-leap156"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack - openSUSE Leap 15.6 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack - openSUSE Leap 15.6: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "opensuse156o" ]
-}
-
-module "salt-shaker-saltstack" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-saltstack-leap156"
-  image              = "opensuse156o"
-  salt_obs_flavor    = "saltstack"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:3b"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-saltstack.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Tumbleweed.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Tumbleweed.tf
deleted file mode 100644
index b613ae284..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Tumbleweed.tf
+++ /dev/null
@@ -1,119 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-saltstack-tumbleweed"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack - openSUSE Tumbleweed $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack - openSUSE Tumbleweed: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "tumbleweedo" ]
-}
-
-module "salt-shaker-saltstack-tumbleweed" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-saltstack-tumbleweed"
-  image              = "tumbleweedo"
-  salt_obs_flavor    = "saltstack"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:3c"
-  }
-  install_salt_bundle = false
-}
-
-output "configuration" {
-  value = module.salt-shaker-saltstack-tumbleweed.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux10-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux10-Bundle.tf
deleted file mode 100644
index f548d8051..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux10-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-almalinux10-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - AlmaLinux10 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - AlmaLinux10 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "almalinux10o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-almalinux10-bundle"
-  image              = "almalinux10o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:27"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux8-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux8-Bundle.tf
deleted file mode 100644
index b6b1c16f1..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux8-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-almalinux8-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - AlmaLinux8 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - AlmaLinux8 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "almalinux8o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-almalinux8-bundle"
-  image              = "almalinux8o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:22"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux8.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux8.tf
deleted file mode 100644
index f9b45a533..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux8.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-almalinux8"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - AlmaLinux8 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - AlmaLinux8: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "almalinux8o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-almalinux8"
-  image              = "almalinux8o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:21"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux9-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux9-Bundle.tf
deleted file mode 100644
index 2006d2dfc..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux9-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-almalinux9-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - AlmaLinux9 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - AlmaLinux9 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "almalinux9o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-almalinux9-bundle"
-  image              = "almalinux9o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:23"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-CENTOS7-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-CENTOS7-Bundle.tf
deleted file mode 100644
index 19e761106..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-CENTOS7-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-centos7-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - CentOS7 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - CentOS7 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "centos7o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-centos7-bundle"
-  image              = "centos7o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:24"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian10-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian10-Bundle.tf
deleted file mode 100644
index 10da2e6b7..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian10-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-debian10-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Debian10 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Debian10 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "debian10o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-debian10-bundle"
-  image              = "debian10o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:26"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian10.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian10.tf
deleted file mode 100644
index e65c3ad80..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian10.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-debian10"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Debian10 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Debian10: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "debian10o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-debian10"
-  image              = "debian10o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:25"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian12-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian12-Bundle.tf
deleted file mode 100644
index 9f07abb76..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian12-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-debian12-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Debian12 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Debian12 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "debian12o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-debian12-bundle"
-  image              = "debian12o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:28"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap156-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap156-Bundle.tf
deleted file mode 100644
index 14ffe25ec..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap156-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-leap156-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Leap 15.6 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Leap 15.6 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "opensuse156o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-leap156-bundle"
-  image              = "opensuse156o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:2a"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap156.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap156.tf
deleted file mode 100644
index 14ece321d..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap156.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-leap156"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Leap 15.6 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Leap 15.6: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "opensuse156o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-leap156"
-  image              = "opensuse156o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:29"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES12SP5-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES12SP5-Bundle.tf
deleted file mode 100644
index 4cc7ba47c..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES12SP5-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles12sp5-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES12SP5 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES12SP5 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles12sp5o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles12sp5-bundle"
-  image              = "sles12sp5o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:2b"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP1-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP1-Bundle.tf
deleted file mode 100644
index 1398b7744..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP1-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp1-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLE15SP1 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLE15SP1 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp1o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles15sp1-bundle"
-  image              = "sles15sp1o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:2d"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP1.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP1.tf
deleted file mode 100644
index 380d3b033..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP1.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp1"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLE15SP1 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLE15SP1: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp1o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles15sp1"
-  image              = "sles15sp1o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:2c"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP3-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP3-Bundle.tf
deleted file mode 100644
index 166e8189a..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP3-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp3-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP3 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP3 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp3o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles15sp3-bundle"
-  image              = "sles15sp3o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:31"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP3.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP3.tf
deleted file mode 100644
index f95947e16..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP3.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp3"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP3 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP3: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp3o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles15sp3"
-  image              = "sles15sp3o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:30"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP4-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP4-Bundle.tf
deleted file mode 100644
index 4effbe57d..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP4-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp4-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLE15SP4 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLE15SP4 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp4o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles15sp4-bundle"
-  image              = "sles15sp4o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:33"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP4.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP4.tf
deleted file mode 100644
index 6e2b0ed83..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP4.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp4"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLE15SP4 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLE15SP4: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp4o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles15sp4"
-  image              = "sles15sp4o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:32"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP5-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP5-Bundle.tf
deleted file mode 100644
index 74735827d..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP5-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp5-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP5 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP5 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp5o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles15sp5-bundle"
-  image              = "sles15sp5o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:35"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP5.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP5.tf
deleted file mode 100644
index cba7429e0..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP5.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp5"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP5 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP5: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp5o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles15sp5"
-  image              = "sles15sp5o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:34"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP6-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP6-Bundle.tf
deleted file mode 100644
index 45dd934bb..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP6-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp6-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP6 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP6 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp6o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles15sp6-bundle"
-  image              = "sles15sp6o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:40"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP6.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP6.tf
deleted file mode 100644
index 713a9c64d..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP6.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp6"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP6 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP6: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp6o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles15sp6"
-  image              = "sles15sp6o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:3f"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP7-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP7-Bundle.tf
deleted file mode 100644
index 095b90c59..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP7-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp7-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP7 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP7 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp7o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles15sp7-bundle"
-  image              = "sles15sp7o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:2f"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP7.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP7.tf
deleted file mode 100644
index 2eb0648f9..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP7.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp7"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP7 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - SLES15SP7: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "sles15sp7o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-sles15sp7"
-  image              = "sles15sp7o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:2e"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro60-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro60-Bundle.tf
deleted file mode 100644
index 3c42fe5d3..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro60-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-slmicro60-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - products:testing - SLMicro6.0 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - products:testing - SLMicro6.0 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "slmicro60o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-slmicro60-bundle"
-  image              = "slmicro60o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:01"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro60.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro60.tf
deleted file mode 100644
index c42f55e0e..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro60.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-slmicro60"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - products:testing - SLMicro6.0 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - products:testing - SLMicro6.0: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "slmicro60o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-slmicro60"
-  image              = "slmicro60o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:00"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro61-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro61-Bundle.tf
deleted file mode 100644
index 5ba64b259..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro61-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-slmicro61-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - products:testing - SLMicro6.0 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - products:testing - SLMicro6.0 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "slmicro61o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-slmicro61-bundle"
-  image              = "slmicro61o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:26"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro61.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro61.tf
deleted file mode 100644
index 8b3c51db9..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro61.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-slmicro61"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - products:testing - SLMicro6.1 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - products:testing - SLMicro6.1: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "slmicro61o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-slmicro61"
-  image              = "slmicro61o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:25"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu1804-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu1804-Bundle.tf
deleted file mode 100644
index 244c5a9d0..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu1804-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-ubuntu1804-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Ubuntu1804 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Ubuntu1804 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "ubuntu1804o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-ubuntu1804-bundle"
-  image              = "ubuntu1804o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:37"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu1804.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu1804.tf
deleted file mode 100644
index 7d3329ed1..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu1804.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-ubuntu1804"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Ubuntu1804 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Ubuntu1804: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "ubuntu1804o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-ubuntu1804"
-  image              = "ubuntu1804o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:36"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2004-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2004-Bundle.tf
deleted file mode 100644
index db4cc6c42..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2004-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-ubuntu2004-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Ubuntu2004 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Ubuntu2004 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "ubuntu2004o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-ubuntu2004-bundle"
-  image              = "ubuntu2004o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:39"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2004.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2004.tf
deleted file mode 100644
index 18ee7cff4..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2004.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-ubuntu2004"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Ubuntu2004 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Ubuntu2004: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "ubuntu2004o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-ubuntu2004"
-  image              = "ubuntu2004o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:38"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2204-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2204-Bundle.tf
deleted file mode 100644
index 3f010eed3..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2204-Bundle.tf
+++ /dev/null
@@ -1,118 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-ubuntu2204-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Ubuntu2204 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Ubuntu2204 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-  use_avahi   = false
-  domain      = "mgr.suse.de"
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "ubuntu2204o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-ubuntu2204-bundle"
-  image              = "ubuntu2204o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:3a"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2404-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2404-Bundle.tf
deleted file mode 100644
index b7cdb73bf..000000000
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2404-Bundle.tf
+++ /dev/null
@@ -1,116 +0,0 @@
-// Mandatory variables for terracumber
-variable "URL_PREFIX" {
-  type = string
-  default = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-ubuntu2404-bundle"
-}
-
-// Not really used as this is for --runall parameter, and we run cucumber step by step
-variable "CUCUMBER_COMMAND" {
-  type = string
-  default = "echo EXECUTE SALT TESTS HERE"
-}
-variable "CUCUMBER_BRANCH" {
-  type = string
-  default = "master"
-}
-
-variable "CUCUMBER_RESULTS" {
-  type = string
-  default = "/root/"
-}
-
-variable "MAIL_SUBJECT" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Ubuntu2404 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
-}
-
-variable "MAIL_TEMPLATE" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker.txt"
-}
-
-variable "MAIL_SUBJECT_ENV_FAIL" {
-  type = string
-  default = "Results Salt Shaker - saltstack:products:testing - Ubuntu2404 Salt Bundle: Environment setup failed"
-}
-
-variable "MAIL_TEMPLATE_ENV_FAIL" {
-  type = string
-  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
-}
-
-variable "MAIL_FROM" {
-  type = string
-  default = "salt-shaker@suse.de"
-}
-
-variable "MAIL_TO" {
-  type = string
-  default = "salt-ci@suse.de"
-}
-
-// sumaform specific variables
-variable "SCC_USER" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "SCC_PASSWORD" {
-  type = string
-  default = null // Not needed for Salt tests
-}
-
-variable "GIT_USER" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-variable "GIT_PASSWORD" {
-  type = string
-  default = null // Not needed for master, as it is public
-}
-
-terraform {
-  required_version = ">= 1.6.0"
-  required_providers {
-    libvirt = {
-      source = "dmacvicar/libvirt"
-      version = "0.8.3"
-    }
-  }
-}
-
-provider "libvirt" {
-  uri = "qemu+tcp://suma-03.mgr.suse.de/system"
-}
-
-module "base" {
-  source = "./modules/base"
-
-  cc_username = var.SCC_USER
-  cc_password = var.SCC_PASSWORD
-
-  provider_settings = {
-    pool               = "ssd"
-    network_name       = null
-    bridge             = "br1"
-  }
-
-  images = [ "ubuntu2404o" ]
-}
-
-module "salt-shaker-products-testing" {
-  source             = "./modules/salt_testenv"
-  base_configuration = module.base.configuration
-
-  name               = "salt-shaker-products-testing-ubuntu2404-bundle"
-  image              = "ubuntu2404o"
-  salt_obs_flavor    = "saltstack:products:testing"
-  provider_settings  = {
-    mac = "aa:b2:93:02:02:3d"
-  }
-}
-
-output "configuration" {
-  value = module.salt-shaker-products-testing.configuration
-}
diff --git a/terracumber_config/tf_files/templates/salt-shaker.tf b/terracumber_config/tf_files/templates/salt-shaker.tf
new file mode 100644
index 000000000..82b970583
--- /dev/null
+++ b/terracumber_config/tf_files/templates/salt-shaker.tf
@@ -0,0 +1,52 @@
+terraform {
+  required_version = ">= 1.6.0"
+  required_providers {
+    libvirt = {
+      source  = "dmacvicar/libvirt"
+      version = "0.8.3"
+    }
+  }
+}
+
+locals {
+  libvirt_uri = "qemu+tcp://suma-04.mgr.suse.de/system"
+  env         = var.ENVIRONMENT_CONFIGURATION[var.ENVIRONMENT]
+}
+
+provider "libvirt" {
+  uri = local.libvirt_uri
+}
+
+module "base" {
+  source = "./modules/base"
+
+  cc_username = var.SCC_USER
+  cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
+
+  provider_settings = {
+    pool         = "ssd"
+    network_name = null
+    bridge       = "br1"
+    libvirt_uri  = local.libvirt_uri
+  }
+
+  images = [local.env.image]
+}
+
+module "salt-shaker-products-next" {
+  source             = "./modules/salt_testenv"
+  base_configuration = module.base.configuration
+
+  name              = "salt-shaker-products-next-${var.ENVIRONMENT}"
+  image             = local.env.image
+  salt_obs_flavor   = local.env.salt_obs_flavor
+  provider_settings = {
+    mac = local.env.mac_address
+  }
+}
+
+output "configuration" {
+  value = module.salt-shaker-products-next.configuration
+}
diff --git a/terracumber_config/tf_files/tfvars/salt-shaker/salt-shaker.tfvars b/terracumber_config/tf_files/tfvars/salt-shaker/salt-shaker.tfvars
new file mode 100644
index 000000000..cba9db0bc
--- /dev/null
+++ b/terracumber_config/tf_files/tfvars/salt-shaker/salt-shaker.tfvars
@@ -0,0 +1,546 @@
+ENVIRONMENT_CONFIGURATION = {
+  next-almalinux10-bundle = {
+    image             = "almalinux10o"
+    mac_address       = "aa:b2:93:02:02:0a"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-almalinux10-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - AlmaLinux10 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - AlmaLinux10 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-almalinux8-bundle = {
+    image             = "almalinux8o"
+    mac_address       = "aa:b2:93:02:02:05"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-almalinux8-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - AlmaLinux8 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - AlmaLinux8 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-almalinux8 = {
+    image             = "almalinux8o"
+    mac_address       = "aa:b2:93:02:02:04"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-almalinux8"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - AlmaLinux8 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - AlmaLinux8: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-almalinux9-bundle = {
+    image             = "almalinux9o"
+    mac_address       = "aa:b2:93:02:02:06"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-almalinux9-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - AlmaLinux9 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - AlmaLinux9 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-centos7-bundle = {
+    image             = "centos7o"
+    mac_address       = "aa:b2:93:02:02:07"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-centos7-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - CentOS7 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - CentOS7 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-debian10-bundle = {
+    image             = "debian10o"
+    mac_address       = "aa:b2:93:02:02:09"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-debian10-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - Debian10 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - Debian10 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-debian10 = {
+    image             = "debian10o"
+    mac_address       = "aa:b2:93:02:02:08"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-debian10"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - Debian10 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - Debian10: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-debian12-bundle = {
+    image             = "debian12o"
+    mac_address       = "aa:b2:93:02:02:0b"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-debian12-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - Debian12 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - Debian12 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-leap156-bundle = {
+    image             = "opensuse156o"
+    mac_address       = "aa:b2:93:02:02:0d"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-leap156-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - Leap 15.6 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - Leap 15.6 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-leap156 = {
+    image             = "opensuse156o"
+    mac_address       = "aa:b2:93:02:02:0c"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-leap156"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - Leap 15.6 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - Leap 15.6: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles12sp5-bundle = {
+    image             = "sles12sp5o"
+    mac_address       = "aa:b2:93:02:02:0e"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles12sp5-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - SLES12SP5 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - SLES12SP5 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles15sp1-bundle = {
+    image             = "sles15sp1o"
+    mac_address       = "aa:b2:93:02:02:10"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp1-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - SLES15SP1 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - SLES15SP1 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles15sp1 = {
+    image             = "sles15sp1o"
+    mac_address       = "aa:b2:93:02:02:0f"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp1"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - SLES15SP1 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - SLES15SP1: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles15sp3-bundle = {
+    image             = "sles15sp3o"
+    mac_address       = "aa:b2:93:02:02:14"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp3-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - SLES15SP3 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - SLES15SP3 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles15sp3 = {
+    image             = "sles15sp3o"
+    mac_address       = "aa:b2:93:02:02:13"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp3"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - SLES15SP3 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - SLES15SP3: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles15sp4-bundle = {
+    image             = "sles15sp4o"
+    mac_address       = "aa:b2:93:02:02:16"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp4-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - SLES15SP4 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - SLES15SP4 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles15sp4 = {
+    image             = "sles15sp4o"
+    mac_address       = "aa:b2:93:02:02:15"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp4"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - SLES15SP4 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - SLES15SP4: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles15sp5-bundle = {
+    image             = "sles15sp5o"
+    mac_address       = "aa:b2:93:02:02:18"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp5-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - SLES15SP5 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - SLES15SP5 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles15sp5 = {
+    image             = "sles15sp5o"
+    mac_address       = "aa:b2:93:02:02:17"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp5"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - SLES15SP5 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - SLES15SP5: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles15sp6-bundle = {
+    image             = "sles15sp6o"
+    mac_address       = "aa:b2:93:02:02:1a"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp6-bundle"
+    mail_subject      = "Results Salt Shaker - products:next - SLES15SP6 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - products:next - SLES15SP6 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles15sp6 = {
+    image             = "sles15sp6o"
+    mac_address       = "aa:b2:93:02:02:19"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp6"
+    mail_subject      = "Results Salt Shaker - products:next - SLES15SP6 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - products:next - SLES15SP5: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles15sp7-bundle = {
+    image             = "sles15sp7o"
+    mac_address       = "aa:b2:93:02:02:12"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp7-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - SLES15SP7 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - SLES15SP7 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-sles15sp7 = {
+    image             = "sles15sp7o"
+    mac_address       = "aa:b2:93:02:02:11"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-sles15sp7"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - SLES15SP7 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - SLES15SP7: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-slmicro60-bundle = {
+    image             = "slmicro60o"
+    mac_address       = "aa:b2:93:02:02:03"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-slmicro60-bundle"
+    mail_subject      = "Results Salt Shaker - products:next - SLMicro6.0 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - products:next - SLMicro6.0 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-slmicro60 = {
+    image             = "slmicro60o"
+    mac_address       = "aa:b2:93:02:02:02"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-slmicro60"
+    mail_subject      = "Results Salt Shaker - products:next - SLMicro6.0 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - products:next - SLMicro6.0: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-slmicro61-bundle = {
+    image             = "slmicro61o"
+    mac_address       = "aa:b2:93:02:02:09"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-slmicro61-bundle"
+    mail_subject      = "Results Salt Shaker - products:next - SLMicro6.1 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - products:next - SLMicro6.1 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-slmicro61 = {
+    image             = "slmicro61o"
+    mac_address       = "aa:b2:93:02:02:08"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-slmicro61"
+    mail_subject      = "Results Salt Shaker - products:next - SLMicro6.1 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - products:next - SLMicro6.1: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-ubuntu1804-bundle = {
+    image             = "ubuntu1804o"
+    mac_address       = "aa:b2:93:02:02:1c"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-ubuntu1804-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - Ubuntu1804 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - Ubuntu1804 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-ubuntu1804 = {
+    image             = "ubuntu1804o"
+    mac_address       = "aa:b2:93:02:02:1b"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-ubuntu1804"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - Ubuntu1804 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - Ubuntu1804: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-ubuntu2004-bundle = {
+    image             = "ubuntu2004o"
+    mac_address       = "aa:b2:93:02:02:1e"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-ubuntu2004-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - Ubuntu2004 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - Ubuntu2004 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-ubuntu2004 = {
+    image             = "ubuntu2004o"
+    mac_address       = "aa:b2:93:02:02:1d"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-ubuntu2004"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - Ubuntu2004 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - Ubuntu2004: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-ubuntu2204-bundle = {
+    image             = "ubuntu2204o"
+    mac_address       = "aa:b2:93:02:02:1f"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-ubuntu2204-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - Ubuntu2204 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - Ubuntu2204 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  next-ubuntu2404-bundle = {
+    image             = "ubuntu2404o"
+    mac_address       = "aa:b2:93:02:02:3e"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-next-ubuntu2404-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:next - Ubuntu2404 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:next - Ubuntu2404 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:next"
+  }
+  saltstack-leap156 = {
+    image             = "opensuse156o"
+    mac_address       = "aa:b2:93:02:02:3b"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-saltstack-leap156"
+    mail_subject      = "Results Salt Shaker - saltstack - openSUSE Leap 15.6 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack - openSUSE Leap 15.6: Environment setup failed"
+    salt_obs_flavor   = "saltstack"
+  }
+  saltstack-tumbleweed = {
+    image             = "tumbleweedo"
+    mac_address       = "aa:b2:93:02:02:3c"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-saltstack-tumbleweed"
+    mail_subject      = "Results Salt Shaker - saltstack - openSUSE Tumbleweed $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack - openSUSE Tumbleweed: Environment setup failed"
+    salt_obs_flavor   = "saltstack"
+  }
+  testing-almalinux10-bundle = {
+    image             = "almalinux10o"
+    mac_address       = "aa:b2:93:02:02:27"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-almalinux10-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - AlmaLinux10 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - AlmaLinux10 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-almalinux8-bundle = {
+    image             = "almalinux8o"
+    mac_address       = "aa:b2:93:02:02:22"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-almalinux8-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - AlmaLinux8 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - AlmaLinux8 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-almalinux8 = {
+    image             = "almalinux8o"
+    mac_address       = "aa:b2:93:02:02:21"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-almalinux8"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - AlmaLinux8 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - AlmaLinux8: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-almalinux9-bundle = {
+    image             = "almalinux9o"
+    mac_address       = "aa:b2:93:02:02:23"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-almalinux9-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - AlmaLinux9 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - AlmaLinux9 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-centos7-bundle = {
+    image             = "centos7o"
+    mac_address       = "aa:b2:93:02:02:24"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-centos7-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - CentOS7 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - CentOS7 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-debian10-bundle = {
+    image             = "debian10o"
+    mac_address       = "aa:b2:93:02:02:26"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-debian10-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - Debian10 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - Debian10 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-debian10 = {
+    image             = "debian10o"
+    mac_address       = "aa:b2:93:02:02:25"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-debian10"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - Debian10 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - Debian10: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-debian12-bundle = {
+    image             = "debian12o"
+    mac_address       = "aa:b2:93:02:02:28"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-debian12-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - Debian12 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - Debian12 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-leap156-bundle = {
+    image             = "opensuse156o"
+    mac_address       = "aa:b2:93:02:02:2a"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-leap156-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - Leap 15.6 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - Leap 15.6 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-leap156 = {
+    image             = "opensuse156o"
+    mac_address       = "aa:b2:93:02:02:29"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-leap156"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - Leap 15.6 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - Leap 15.6: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles12sp5-bundle = {
+    image             = "sles12sp5o"
+    mac_address       = "aa:b2:93:02:02:2b"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles12sp5-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLES12SP5 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLES12SP5 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles15sp1-bundle = {
+    image             = "sles15sp1o"
+    mac_address       = "aa:b2:93:02:02:2d"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp1-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLE15SP1 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLE15SP1 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles15sp1 = {
+    image             = "sles15sp1o"
+    mac_address       = "aa:b2:93:02:02:2c"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp1"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLE15SP1 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLE15SP1: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles15sp3-bundle = {
+    image             = "sles15sp3o"
+    mac_address       = "aa:b2:93:02:02:31"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp3-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLES15SP3 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLES15SP3 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles15sp3 = {
+    image             = "sles15sp3o"
+    mac_address       = "aa:b2:93:02:02:30"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp3"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLES15SP3 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLES15SP3: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles15sp4-bundle = {
+    image             = "sles15sp4o"
+    mac_address       = "aa:b2:93:02:02:33"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp4-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLE15SP4 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLE15SP4 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles15sp4 = {
+    image             = "sles15sp4o"
+    mac_address       = "aa:b2:93:02:02:32"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp4"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLE15SP4 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLE15SP4: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles15sp5-bundle = {
+    image             = "sles15sp5o"
+    mac_address       = "aa:b2:93:02:02:35"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp5-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLES15SP5 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLES15SP5 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles15sp5 = {
+    image             = "sles15sp5o"
+    mac_address       = "aa:b2:93:02:02:34"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp5"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLES15SP5 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLES15SP5: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles15sp6-bundle = {
+    image             = "sles15sp6o"
+    mac_address       = "aa:b2:93:02:02:40"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp6-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLES15SP6 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLES15SP6 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles15sp6 = {
+    image             = "sles15sp6o"
+    mac_address       = "aa:b2:93:02:02:3f"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp6"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLES15SP6 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLES15SP6: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles15sp7-bundle = {
+    image             = "sles15sp7o"
+    mac_address       = "aa:b2:93:02:02:2f"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp7-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLES15SP7 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLES15SP7 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-sles15sp7 = {
+    image             = "sles15sp7o"
+    mac_address       = "aa:b2:93:02:02:2e"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-sles15sp7"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - SLES15SP7 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - SLES15SP7: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-slmicro60-bundle = {
+    image             = "slmicro60o"
+    mac_address       = "aa:b2:93:02:02:01"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-slmicro60-bundle"
+    mail_subject      = "Results Salt Shaker - products:testing - SLMicro6.0 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - products:testing - SLMicro6.0 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-slmicro60 = {
+    image             = "slmicro60o"
+    mac_address       = "aa:b2:93:02:02:00"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-slmicro60"
+    mail_subject      = "Results Salt Shaker - products:testing - SLMicro6.0 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - products:testing - SLMicro6.0: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-slmicro61-bundle = {
+    image             = "slmicro61o"
+    mac_address       = "aa:b2:93:02:02:26"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-slmicro61-bundle"
+    mail_subject      = "Results Salt Shaker - products:testing - SLMicro6.0 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - products:testing - SLMicro6.0 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-slmicro61 = {
+    image             = "slmicro61o"
+    mac_address       = "aa:b2:93:02:02:25"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-slmicro61"
+    mail_subject      = "Results Salt Shaker - products:testing - SLMicro6.1 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - products:testing - SLMicro6.1: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-ubuntu1804-bundle = {
+    image             = "ubuntu1804o"
+    mac_address       = "aa:b2:93:02:02:37"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-ubuntu1804-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - Ubuntu1804 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - Ubuntu1804 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-ubuntu1804 = {
+    image             = "ubuntu1804o"
+    mac_address       = "aa:b2:93:02:02:36"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-ubuntu1804"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - Ubuntu1804 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - Ubuntu1804: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-ubuntu2004-bundle = {
+    image             = "ubuntu2004o"
+    mac_address       = "aa:b2:93:02:02:39"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-ubuntu2004-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - Ubuntu2004 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - Ubuntu2004 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-ubuntu2004 = {
+    image             = "ubuntu2004o"
+    mac_address       = "aa:b2:93:02:02:38"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-ubuntu2004"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - Ubuntu2004 $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - Ubuntu2004: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-ubuntu2204-bundle = {
+    image             = "ubuntu2204o"
+    mac_address       = "aa:b2:93:02:02:3a"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-ubuntu2204-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - Ubuntu2204 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - Ubuntu2204 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+  testing-ubuntu2404-bundle = {
+    image             = "ubuntu2404o"
+    mac_address       = "aa:b2:93:02:02:3d"
+    url_prefix        = "https://ci.suse.de/user/manager/my-views/view/Salt%20Shaker/job/manager-salt-shaker-products-testing-ubuntu2404-bundle"
+    mail_subject      = "Results Salt Shaker - saltstack:products:testing - Ubuntu2404 Salt Bundle $status: $tests scenarios ($failures failed, $errors errors, $skipped skipped, $passed passed)"
+    mail_subject_fail = "Results Salt Shaker - saltstack:products:testing - Ubuntu2404 Salt Bundle: Environment setup failed"
+    salt_obs_flavor   = "saltstack:products:testing"
+  }
+}
diff --git a/terracumber_config/tf_files/variables/salt-shaker.tf b/terracumber_config/tf_files/variables/salt-shaker.tf
new file mode 100644
index 000000000..4cdf88e0b
--- /dev/null
+++ b/terracumber_config/tf_files/variables/salt-shaker.tf
@@ -0,0 +1,74 @@
+// Mandatory variables for terracumber
+variable "CUCUMBER_COMMAND" {
+  type    = string
+  default = "echo EXECUTE SALT TESTS HERE"
+}
+
+variable "CUCUMBER_BRANCH" {
+  type    = string
+  default = "master"
+}
+
+variable "CUCUMBER_RESULTS" {
+  type    = string
+  default = "/root/"
+}
+
+variable "MAIL_TEMPLATE" {
+  type    = string
+  default = "../../mail_templates/mail-template-salt-shaker.txt"
+}
+
+variable "MAIL_TEMPLATE_ENV_FAIL" {
+  type    = string
+  default = "../../mail_templates/mail-template-salt-shaker-env-fail.txt"
+}
+
+variable "MAIL_FROM" {
+  type    = string
+  default = "salt-shaker@suse.de"
+}
+
+variable "MAIL_TO" {
+  type    = string
+  default = "salt-ci@suse.de"
+}
+
+// sumaform specific variables
+variable "SCC_USER" {
+  type    = string
+  default = null // Not needed for Salt tests
+}
+
+variable "SCC_PASSWORD" {
+  type    = string
+  default = null // Not needed for Salt tests
+}
+
+variable "GIT_USER" {
+  type    = string
+  default = null // Not needed for master, as it is public
+}
+
+variable "GIT_PASSWORD" {
+  type    = string
+  default = null // Not needed for master, as it is public
+}
+
+// Environment-specific variables
+variable "ENVIRONMENT" {
+  type        = string
+  description = "Key into ENVIRONMENT_CONFIGURATION to select the active environment (set by Jenkins)"
+}
+
+variable "ENVIRONMENT_CONFIGURATION" {
+  type = map(object({
+    image             = string
+    mac_address       = string
+    url_prefix        = string
+    mail_subject      = string
+    mail_subject_fail = string
+    salt_obs_flavor   = string
+  }))
+  description = "Map of environment configurations keyed by distro name"
+}