diff --git a/playbooks/ghp/core-infra.yaml b/playbooks/ghp/core-infra.yaml
index 12ad9d7..6187f7f 100644
--- a/playbooks/ghp/core-infra.yaml
+++ b/playbooks/ghp/core-infra.yaml
@@ -3,85 +3,91 @@
   connection: local
   tasks:
   - name: Deploy MetalLB
-    import_role: 
+    import_role:
       name: metallb
     when: metallb_enabled | default(true)
     tags: metallb
-  
+
   - name: Deploy External Ingress Nginx
-    import_role: 
+    import_role:
       name: external-ingress-nginx
     when: external_ingress_nginx_enabled | default(true)
-    tags: 
+    tags:
       - external-ingress-nginx
       - ingress-nginx
 
   - name: Deploy Internal Ingress Nginx
-    import_role: 
+    import_role:
       name: internal-ingress-nginx
     when: internal_ingress_nginx_enabled | default(true)
-    tags: 
+    tags:
       - internal-ingress-nginx
       - ingress-nginx
 
   - name: Deploy Local Ingress Nginx
-    import_role: 
+    import_role:
       name: local-ingress-nginx
     when: local_ingress_nginx_enabled | default(true)
-    tags: 
+    tags:
       - local-ingress-nginx
       - ingress-nginx
 
   - name: Deploy Internal DNS
-    import_role: 
+    import_role:
       name: internal-dns
-    when: internal_dns_enabled | default(true)
-    tags: 
+    when:
+      - internal_dns_enabled | default(true)
+      - domain is defined
+    tags:
       - internal-dns
       - dns
-  
+
   - name: Deploy Local DNS
-    import_role: 
+    import_role:
       name: local-dns
-    when: local_dns_enabled | default(true)
-    tags: 
+    when:
+      - local_dns_enabled | default(true)
+      - local_domain is defined
+    tags:
       - local-dns
       - dns
 
   - name: Deploy Service DNS
-    import_role: 
+    import_role:
       name: service-dns
-    when: service_dns_enabled | default(true)
-    tags: 
+    when:
+      - service_dns_enabled | default(true)
+      - domain is defined
+    tags:
       - service-dns
       - dns
 
   - name: Deploy Cert-manager
-    import_role: 
+    import_role:
       name: cert-manager
     when: cert_manager_enabled | default(true)
     tags: cert-manager
-  
+
   - name: Deploy NFS-client-provisioner
-    import_role: 
+    import_role:
       name: nfs-client-provisioner
     when: nfs_client_provisioner_enabled | default(true)
     tags: nfs-client-provisioner
-  
+
   - name: Deploy CSI Ceph RBD
-    import_role: 
+    import_role:
       name: ceph-csi-rbd
     when: ceph_csi_rbd_enabled | default(false)
     tags: ceph-csi-rbd
 
   - name: Deploy CSI CephFS
-    import_role: 
+    import_role:
       name: ceph-csi-cephfs
     when: ceph_csi_cephfs_enabled | default(false)
     tags: ceph-csi-cephfs
 
   - name: Deploy Metrics-server
-    import_role: 
+    import_role:
       name: metrics-server
     when: metrics_server_enabled | default(true)
     tags: metrics-server