From f680cdef263db4683c400a9cfedb9526e198e06b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
 <psuarezhernandez@suse.com>
Date: Fri, 5 Jul 2024 10:32:17 +0100
Subject: [PATCH] Salt Shaker: Do not use avahi but static ip/hostname

---
 .../tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux8-Bundle.tf  | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux8.tf         | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux9-Bundle.tf  | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-CENTOS7-Bundle.tf     | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-Debian10-Bundle.tf    | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-Debian10.tf           | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-Debian11-Bundle.tf    | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-Debian12-Bundle.tf    | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-Leap155-Bundle.tf     | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-Leap155.tf            | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES12SP5-Bundle.tf   | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP1-Bundle.tf   | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP1.tf          | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP2-Bundle.tf   | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP2.tf          | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP3-Bundle.tf   | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP3.tf          | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP4-Bundle.tf   | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP4.tf          | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP5-Bundle.tf   | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP5.tf          | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP6-Bundle.tf   | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP6.tf          | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLMicro60-Bundle.tf   | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-SLMicro60.tf          | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu1804-Bundle.tf  | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu1804.tf         | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2004-Bundle.tf  | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2004.tf         | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2204-Bundle.tf  | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Products-SLES15SP5.tf      | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap154.tf       | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap155.tf       | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Saltstack-Tumbleweed.tf    | 2 ++
 .../salt-shaker/Salt-Shaker-Testing-AlmaLinux8-Bundle.tf        | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux8.tf      | 2 ++
 .../salt-shaker/Salt-Shaker-Testing-AlmaLinux9-Bundle.tf        | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-CENTOS7-Bundle.tf  | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-Debian10-Bundle.tf | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-Debian10.tf        | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-Debian11-Bundle.tf | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-Debian12-Bundle.tf | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-Leap155-Bundle.tf  | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-Leap155.tf         | 2 ++
 .../salt-shaker/Salt-Shaker-Testing-SLES12SP5-Bundle.tf         | 2 ++
 .../salt-shaker/Salt-Shaker-Testing-SLES15SP1-Bundle.tf         | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP1.tf       | 2 ++
 .../salt-shaker/Salt-Shaker-Testing-SLES15SP2-Bundle.tf         | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP2.tf       | 2 ++
 .../salt-shaker/Salt-Shaker-Testing-SLES15SP3-Bundle.tf         | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP3.tf       | 2 ++
 .../salt-shaker/Salt-Shaker-Testing-SLES15SP4-Bundle.tf         | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP4.tf       | 2 ++
 .../salt-shaker/Salt-Shaker-Testing-SLES15SP5-Bundle.tf         | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP5.tf       | 2 ++
 .../salt-shaker/Salt-Shaker-Testing-SLMicro60-Bundle.tf         | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro60.tf       | 2 ++
 .../salt-shaker/Salt-Shaker-Testing-Ubuntu1804-Bundle.tf        | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu1804.tf      | 2 ++
 .../salt-shaker/Salt-Shaker-Testing-Ubuntu2004-Bundle.tf        | 2 ++
 .../tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2004.tf      | 2 ++
 .../salt-shaker/Salt-Shaker-Testing-Ubuntu2204-Bundle.tf        | 2 ++
 62 files changed, 124 insertions(+)

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
index 9ade73b28..0ea28dc73 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index d9720b54d..dfeed6e48 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux8.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-AlmaLinux8.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index d61ef204e..5ec9ade21 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 328fe8c7d..7b4cfc639 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index f2f8583df..f0ff1b2fc 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index b788a5c52..3665e7fa3 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian10.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian10.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian11-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian11-Bundle.tf
index a437c1905..10bd7d424 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian11-Bundle.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Debian11-Bundle.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 4897955fe..9eac5fae2 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap155-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap155-Bundle.tf
index f98c55105..d310e4340 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap155-Bundle.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap155-Bundle.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap155.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap155.tf
index 1d30e3c3f..d06390889 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap155.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Leap155.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index c41a96eb6..03f048083 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 8fb8aaa55..c5bf14e9b 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 59d216ea1..18ee5bf27 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP1.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP1.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP2-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP2-Bundle.tf
index 355b2fccc..466e4142b 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP2-Bundle.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP2-Bundle.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP2.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP2.tf
index 51319630a..9ddf176a4 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP2.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP2.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 15fe1172a..6ef7200c4 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 50927c6ae..beea7daff 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP3.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP3.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index f1243efac..268bb442c 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index b556d6a5a..08cf681e4 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP4.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP4.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 5ab97edbc..f6330cf01 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 42d95311d..439c70e77 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP5.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP5.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index a5876e5b6..c39789fd9 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 8ab5458c0..472f084df 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP6.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLES15SP6.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 51e4da264..ca77abc52 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index c8f71f23e..70de9fff9 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro60.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-SLMicro60.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 61385c6d5..683412d56 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 063b3e0b9..386c2a58c 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu1804.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu1804.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 1b3e08632..470eed3c1 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index bc6140de4..ad7c1f19f 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2004.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Next-Ubuntu2004.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 01a635693..605259441 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Products-SLES15SP5.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Products-SLES15SP5.tf
index 028ecab68..7e28193f4 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Products-SLES15SP5.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Products-SLES15SP5.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap154.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap154.tf
index ca28db5ca..651f55fe6 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap154.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap154.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap155.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap155.tf
index c96848f34..1d369f451 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap155.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Leap155.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index d1c4aa473..168be5ba8 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Tumbleweed.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Saltstack-Tumbleweed.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 202ec0d5a..577b46159 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 5181afc2c..0e506e5f3 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux8.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-AlmaLinux8.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index f212a3132..cd06e6f9d 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 854884a70..255db63de 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index e9913817a..6a4a547e8 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index d9defc6cb..e21658c03 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian10.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian10.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian11-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian11-Bundle.tf
index 1e2106ebd..a6ba8b964 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian11-Bundle.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Debian11-Bundle.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 00c62c118..b0916c92c 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap155-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap155-Bundle.tf
index 59c34b51e..b6083d209 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap155-Bundle.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap155-Bundle.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap155.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap155.tf
index c47ce27b6..63c18e5c3 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap155.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Leap155.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index fa6cd03b2..6c676fe31 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 9f4b317b1..0f8037663 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index a6b2a0466..2a22c30bd 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP1.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP1.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP2-Bundle.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP2-Bundle.tf
index eef01b4b8..844b37a52 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP2-Bundle.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP2-Bundle.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
diff --git a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP2.tf b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP2.tf
index 0474a781e..317f57731 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP2.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP2.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 3abc5d9e5..2eef498e2 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index c0b1803b3..bc2bde926 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP3.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP3.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 47de9d7ae..7d7b947a2 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 1b6e146f6..63b5530b6 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP4.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP4.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 0497603a3..29f58f52b 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index a16de69ea..22385adb1 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP5.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLES15SP5.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 860578a77..7c258fe5f 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 4db286b53..bcd6b02c7 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro60.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-SLMicro60.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 632e97c7a..f0bf5c3b9 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index c2aa840f7..4e25d8b94 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu1804.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu1804.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index fae935be4..e6c836353 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index 7d48f1307..b680e6c11 100644
--- a/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2004.tf
+++ b/terracumber_config/tf_files/salt-shaker/Salt-Shaker-Testing-Ubuntu2004.tf
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"
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
index c5717c42c..a1ce2387d 100644
--- 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
@@ -89,6 +89,8 @@ module "base" {
 
   cc_username = var.SCC_USER
   cc_password = var.SCC_PASSWORD
+  use_avahi   = false
+  domain      = "mgr.suse.de"
 
   provider_settings = {
     pool               = "ssd"