diff --git a/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-create.yaml.j2 b/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-create.yaml.j2
index 64c737f..54455e3 100644
--- a/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-create.yaml.j2
+++ b/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-create.yaml.j2
@@ -15,6 +15,9 @@ os:
 {% endfor %}
 install:
   mode: create
+{% if settings['harvester_network_config']['cluster'][0]['role'] != 'default' %}
+  role: {{ settings['harvester_network_config']['cluster'][0]['role'] }}
+{% endif %}
   networks:
     harvester-mgmt:
       interfaces:
diff --git a/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-join.yaml.j2 b/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-join.yaml.j2
index b285eb7..135a654 100644
--- a/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-join.yaml.j2
+++ b/vagrant-pxe-airgap-harvester/ansible/roles/harvester/templates/config-join.yaml.j2
@@ -15,8 +15,8 @@ os:
 {% endfor %}
 install:
   mode: join
-{% if settings['harvester_network_config']['cluster'][node_number |int]['etcd_only'] %}
-  role: etcd
+{% if settings['harvester_network_config']['cluster'][node_number |int]['role'] != 'default' %}
+  role: {{ settings['harvester_network_config']['cluster'][node_number |int]['role'] }}
 {% endif %}
   networks:
     harvester-mgmt:
diff --git a/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-create.yaml.j2 b/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-create.yaml.j2
index 488637c..7c59226 100644
--- a/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-create.yaml.j2
+++ b/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-create.yaml.j2
@@ -19,7 +19,9 @@ os:
 {% endfor %}
 install:
   mode: create
+{% if settings['harvester_network_config']['cluster'][0]['role'] != 'default' %}
   role: {{ settings['harvester_network_config']['cluster'][0]['role'] }}
+{% endif %}
   management_interface:
     interfaces:
     - name: {{ settings['harvester_network_config']['cluster'][0]['mgmt_interface'] }}  # The management interface name
diff --git a/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-join.yaml.j2 b/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-join.yaml.j2
index 5384439..dddc300 100644
--- a/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-join.yaml.j2
+++ b/vagrant-pxe-harvester/ansible/roles/harvester/templates/config-join.yaml.j2
@@ -20,7 +20,9 @@ os:
 {% endfor %}
 install:
   mode: join
+{% if settings['harvester_network_config']['cluster'][node_number |int]['role'] != 'default' %}
   role: {{ settings['harvester_network_config']['cluster'][node_number |int]['role'] }}
+{% endif %}
   management_interface:
     interfaces:
     - name: {{ settings['harvester_network_config']['cluster'][node_number | int]['mgmt_interface'] }}  # The management interface name