diff --git a/roles/extras-common/defaults/main.yml b/roles/extras-common/defaults/main.yml
index 0b9a01c53..5b5ef96a3 100644
--- a/roles/extras-common/defaults/main.yml
+++ b/roles/extras-common/defaults/main.yml
@@ -81,6 +81,7 @@ additional_insecure_registry: false
 deployed_server: false
 overcloud_templates_path: /usr/share/openstack-tripleo-heat-templates
 enable_tls_everywhere: false
+undercloud_enable_novajoin: true
 undercloud_generate_service_certificate: true
 undercloud_network_cidr: 192.168.24.0/24
 undercloud_undercloud_nameservers:
diff --git a/roles/freeipa-setup/defaults/main.yml b/roles/freeipa-setup/defaults/main.yml
index dc634280f..4d45762e3 100644
--- a/roles/freeipa-setup/defaults/main.yml
+++ b/roles/freeipa-setup/defaults/main.yml
@@ -8,5 +8,4 @@ supplemental_user: "stack"
 freeipa_subcas: []
 prepare_ipa: true
 # location which the novajoin-ipa-setup will store the FreeIPA token
-undercloud_enable_novajoin: true
 freeipa_otp_key: /tmp/ipa-otp.txt
diff --git a/roles/overcloud-deploy/defaults/main.yml b/roles/overcloud-deploy/defaults/main.yml
index c5ea98860..2f47f20dc 100644
--- a/roles/overcloud-deploy/defaults/main.yml
+++ b/roles/overcloud-deploy/defaults/main.yml
@@ -91,7 +91,6 @@ use_resource_registry_nic_configs: false
 
 ssl_args: ""
 tls_everywhere_args: ""
-undercloud_enable_novajoin: true
 validation_args: "--validation-warnings-fatal"
 
 enable_swap: false
diff --git a/roles/undercloud-deploy/defaults/main.yml b/roles/undercloud-deploy/defaults/main.yml
index 4a3079f97..f0e3de96a 100644
--- a/roles/undercloud-deploy/defaults/main.yml
+++ b/roles/undercloud-deploy/defaults/main.yml
@@ -37,7 +37,6 @@ undercloud_ironic_ipxe_port: 3816
 
 undercloud_conf_extra: ""
 
-undercloud_enable_novajoin: true
 prepare_ipa: true
 
 # location which the novajoin-ipa-setup will store the FreeIPA token