diff --git a/playbooks/provisioning/openstack/post-provision-openstack.yml b/playbooks/provisioning/openstack/post-provision-openstack.yml
index c7df74a87..f683b77be 100644
--- a/playbooks/provisioning/openstack/post-provision-openstack.yml
+++ b/playbooks/provisioning/openstack/post-provision-openstack.yml
@@ -52,9 +52,8 @@
   become: true
   pre_tasks:
     - include: pre_tasks.yml
-    - name: "Generate dns-server views"
-      include: openstack_dns_views.yml
   roles:
+    - role: dns-views
     - role: infra-ansible/roles/dns-server
 
 - name: Build and process DNS Records
@@ -63,9 +62,8 @@
   become: False
   pre_tasks:
     - include: pre_tasks.yml
-    - name: "Generate dns records"
-      include: openstack_dns_records.yml
   roles:
+    - role: dns-records
     - role: infra-ansible/roles/dns
 
 - name: Switch the stack subnet to the configured private DNS server
diff --git a/playbooks/provisioning/openstack/openstack_dns_records.yml b/roles/dns-records/tasks/main.yml
similarity index 100%
rename from playbooks/provisioning/openstack/openstack_dns_records.yml
rename to roles/dns-records/tasks/main.yml
diff --git a/playbooks/provisioning/openstack/openstack_dns_views.yml b/roles/dns-views/tasks/main.yml
similarity index 100%
rename from playbooks/provisioning/openstack/openstack_dns_views.yml
rename to roles/dns-views/tasks/main.yml