diff --git a/ansible/roles/win_domain_controller/tasks/setup.yml b/ansible/roles/win_domain_controller/tasks/setup.yml
index c3797a6..0770c90 100644
--- a/ansible/roles/win_domain_controller/tasks/setup.yml
+++ b/ansible/roles/win_domain_controller/tasks/setup.yml
@@ -30,11 +30,13 @@
       register: dc01_promotion
 
     - name: Setting DNS Servers (Primary DC)
+      vars:
+        dc02_dns: "{{ os_project }}-{{ win_project }}-dc02"
       win_dns_client:
         adapter_names: "*"
-        ipv4_addresses:
+        dns_servers:
           - "127.0.0.1"
-          - "{{ hostvars['eidf075-dev-dc02'].ansible_host }}"
+          - "{{ hostvars[dc02_dns].ansible_host }}"
 
     - name: Rebooting DC01 post promotion to domain controller
       win_reboot:
@@ -46,11 +48,12 @@
   tags: promote_dc02
   block:
     - name: Setting DNS Servers (Secondary DC)
-      tags: promote_dc01
+      vars:
+        dc01_dns: "{{ os_project }}-{{ win_project }}-dc01"
       win_dns_client:
         adapter_names: "*"
-        ipv4_addresses:
-          - "{{ hostvars['eidf075-dev-dc01'].ansible_host }}"
+        dns_servers:
+          - "{{ hostvars[dc01_dns].ansible_host }}"
           - "127.0.0.1"
 
     - name: Promote DC02 to domain controller