diff --git a/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml b/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
index addd74d..a346860 100644
--- a/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
+++ b/tcp_tests/templates/cookied-cicd-k8s-genie/cookiecutter-context-k8s-genie.yaml
@@ -128,7 +128,6 @@
   kubernetes_externaldns_enabled: 'False'
   kubernetes_keepalived_vip_interface: ens4
   kubernetes_network_calico_enabled: 'True'
-  kubernetes_virtlet_enabled: 'False'
   local_repositories: 'False'
   maas_deploy_address: 10.167.5.15
   maas_deploy_range_end: 10.167.5.199
diff --git a/tcp_tests/templates/shared-salt.yaml b/tcp_tests/templates/shared-salt.yaml
index b63b82d..25bcbc4 100644
--- a/tcp_tests/templates/shared-salt.yaml
+++ b/tcp_tests/templates/shared-salt.yaml
@@ -645,8 +645,8 @@
 - description: Configure salt-minion on {{ ssh['node_name'] }}
   cmd: |
     [ ! -d /etc/salt/minion.d ] && mkdir -p /etc/salt/minion.d;
-    cat << "EOF" > /etc/salt/minion.d/minion.conf
-    id: {{ ssh['node_name'] }}
+    cat << EOF > /etc/salt/minion.d/minion.conf
+    id: $(hostname -s).{{ DOMAIN_NAME }}
     master: {{ config.salt.salt_master_host }}
     EOF