diff --git a/ansible/roles/win_domain_controller/tasks/main.yml b/ansible/roles/win_domain_controller/tasks/main.yml
index 49f47c7..7663b70 100644
--- a/ansible/roles/win_domain_controller/tasks/main.yml
+++ b/ansible/roles/win_domain_controller/tasks/main.yml
@@ -1,5 +1,3 @@
 ---
 - import_tasks: features.yml
 - import_tasks: setup.yml
-- import_tasks: users.yml
-#- import_tasks: remote_desktop.yml
diff --git a/ansible/roles/win_domain_controller/tasks/setup.yml b/ansible/roles/win_domain_controller/tasks/setup.yml
index b53b7a4..8f30122 100644
--- a/ansible/roles/win_domain_controller/tasks/setup.yml
+++ b/ansible/roles/win_domain_controller/tasks/setup.yml
@@ -91,6 +91,29 @@
       when: dc02_promotion.reboot_required | default(false) == true
   when: inventory_hostname in groups['meta-name_dc02']
 
+
+- name: Create Required OUs and Users 
+  tags: post_promotion_tasks
+  block:
+    - name: Create various OUs
+      community.windows.win_domain_ou:
+        name: "{{ item }}"
+        path: "DC={{ win_project }},DC=loc"
+        state: present
+        protected: true
+      loop: "{{ OUs }}"
+
+    - name: Create file-transfer user for
+      community.windows.win_domain_user:
+        name: "{{ filetransfer_user }}"
+        firstname: File
+        surname: Transfer
+        password: "{{ transfer_user_password }}"
+        state: present
+        password_never_expires: yes
+  when: inventory_hostname in groups['meta-name_dc01']
+
+
 - name: Group policy script
   tags: gpo_script
   block:
diff --git a/ansible/roles/win_domain_controller/tasks/users.yml b/ansible/roles/win_domain_controller/tasks/users.yml
deleted file mode 100644
index 571acf0..0000000
--- a/ansible/roles/win_domain_controller/tasks/users.yml
+++ /dev/null
@@ -1,21 +0,0 @@
----
-- name: Create Required OUs and Users 
-  tags: post_promotion_tasks
-  block:
-    - name: Create various OUs
-      community.windows.win_domain_ou:
-        name: "{{ item }}"
-        path: "DC={{ win_project }},DC=loc"
-        state: present
-        protected: true
-      loop: "{{ OUs }}"
-
-    - name: Create file-transfer user for
-      community.windows.win_domain_user:
-        name: "{{ filetransfer_user }}"
-        firstname: File
-        surname: Transfer
-        password: "{{ transfer_user_password }}"
-        state: present
-        password_never_expires: yes
-  when: inventory_hostname in groups['meta-name_dc01']