diff --git a/docker-images/controller-ci/provision.yml b/docker-images/controller-ci/provision.yml
index 124efe6..128f955 100644
--- a/docker-images/controller-ci/provision.yml
+++ b/docker-images/controller-ci/provision.yml
@@ -24,4 +24,4 @@
         upgrade_galaxy:
           enabled: false
   roles:
-    - ce_provision
+    - debian/ce_provision
diff --git a/docker-images/controller/provision.yml b/docker-images/controller/provision.yml
index 08922cc..97edb4e 100644
--- a/docker-images/controller/provision.yml
+++ b/docker-images/controller/provision.yml
@@ -40,5 +40,5 @@
         upgrade_galaxy:
           enabled: false
   roles:
-    - ce_provision
-    - ce_deploy
+    - debian/ce_provision
+    - debian/ce_deploy
diff --git a/templates/blank/ce-dev/ansible/provision.yml.j2 b/templates/blank/ce-dev/ansible/provision.yml.j2
index 0e19d73..1b9e962 100644
--- a/templates/blank/ce-dev/ansible/provision.yml.j2
+++ b/templates/blank/ce-dev/ansible/provision.yml.j2
@@ -15,11 +15,11 @@
     - apt_unattended_upgrades:
         enable: false
   tasks:
-    - apt:
+    - ansible.builtin.apt:
         update_cache: true
-    - import_role:
+    - ansible.builtin.import_role:
         name: _meta/common_base
-    - import_role:
-        name: lhci
-    - import_role:
-        name: frontail
+    - ansible.builtin.import_role:
+        name: debian/lhci
+    - ansible.builtin.import_role:
+        name: debian/frontail
diff --git a/templates/create.yml b/templates/create.yml
index e6dafa0..3521039 100644
--- a/templates/create.yml
+++ b/templates/create.yml
@@ -3,26 +3,26 @@
 
   tasks:
     - name: Create target directory.
-      synchronize:
+      ansible.posix.synchronize:
         src: "{{ project_type }}/"
         dest: "/home/ce-dev/.ce-dev-cache/{{ project_name }}"
     - name: Init git repo.
-      command: git init
+      ansible.builtin.command: git init
       args:
         chdir: "/home/ce-dev/.ce-dev-cache/{{ project_name }}"
     - name: Generate docker compose template.
-      template:
+      ansible.builtin.template:
         src: "{{ project_type }}/ce-dev/ce-dev.compose.yml.j2"
         dest: "/home/ce-dev/.ce-dev-cache/{{ project_name }}/ce-dev/ce-dev.compose.yml"
     - name: Generate docker compose prebuilt template.
-      template:
+      ansible.builtin.template:
         src: "{{ project_type }}/ce-dev/ce-dev.compose.prebuilt.yml.j2"
         dest: "/home/ce-dev/.ce-dev-cache/{{ project_name }}/ce-dev/ce-dev.compose.prebuilt.yml"
     - name: Generate provision playbook.
-      template:
+      ansible.builtin.template:
         src: "{{ project_type }}/ce-dev/ansible/provision.yml.j2"
         dest: "/home/ce-dev/.ce-dev-cache/{{ project_name }}/ce-dev/ansible/provision.yml"
     - name: Generate deploy playbook.
-      template:
+      ansible.builtin.template:
         src: "{{ project_type }}/ce-dev/ansible/deploy.yml.j2"
         dest: "/home/ce-dev/.ce-dev-cache/{{ project_name }}/ce-dev/ansible/deploy.yml"
diff --git a/templates/drupal10/ce-dev/ansible/provision.yml.j2 b/templates/drupal10/ce-dev/ansible/provision.yml.j2
index 25dd455..086eaae 100644
--- a/templates/drupal10/ce-dev/ansible/provision.yml.j2
+++ b/templates/drupal10/ce-dev/ansible/provision.yml.j2
@@ -56,19 +56,19 @@
         enable: false
 {% endraw %}
   tasks:
-    - apt:
+    - ansible.builtin.apt:
         update_cache: true
-    - import_role:
+    - ansible.builtin.import_role:
         name: _meta/common_base
-    - import_role:
-        name: mysql_client
-    - import_role:
-        name: php-cli
-    - import_role:
-        name: php-fpm
-    - import_role:
-        name: nginx
-    - import_role:
-        name: lhci
-    - import_role:
-        name: frontail
+    - ansible.builtin.import_role:
+        name: debian/mysql_client
+    - ansible.builtin.import_role:
+        name: debian/php-cli
+    - ansible.builtin.import_role:
+        name: debian/php-fpm
+    - ansible.builtin.import_role:
+        name: debian/nginx
+    - ansible.builtin.import_role:
+        name: debian/lhci
+    - ansible.builtin.import_role:
+        name: debian/frontail
diff --git a/templates/drupal8/ce-dev/ansible/provision.yml.j2 b/templates/drupal8/ce-dev/ansible/provision.yml.j2
index 8bff54e..2d152bd 100644
--- a/templates/drupal8/ce-dev/ansible/provision.yml.j2
+++ b/templates/drupal8/ce-dev/ansible/provision.yml.j2
@@ -57,19 +57,19 @@
         state: absent
         purge: true
   tasks:
-    - apt:
+    - ansible.builtin.apt:
         update_cache: true
-    - import_role:
+    - ansible.builtin.import_role:
         name: _meta/common_base
-    - import_role:
-        name: mysql_client
-    - import_role:
-        name: php-cli
-    - import_role:
-        name: php-fpm
-    - import_role:
-        name: nginx
-    - import_role:
-        name: lhci
-    - import_role:
-        name: frontail
+    - ansible.builtin.import_role:
+        name: debian/mysql_client
+    - ansible.builtin.import_role:
+        name: debian/php-cli
+    - ansible.builtin.import_role:
+        name: debian/php-fpm
+    - ansible.builtin.import_role:
+        name: debian/nginx
+    - ansible.builtin.import_role:
+        name: debian/lhci
+    - ansible.builtin.import_role:
+        name: debian/frontail
diff --git a/templates/drupal9/ce-dev/ansible/provision.yml.j2 b/templates/drupal9/ce-dev/ansible/provision.yml.j2
index 2e99b23..11dd802 100644
--- a/templates/drupal9/ce-dev/ansible/provision.yml.j2
+++ b/templates/drupal9/ce-dev/ansible/provision.yml.j2
@@ -56,19 +56,19 @@
         enable: false
 {% endraw %}
   tasks:
-    - apt:
+    - ansible.builtin.apt:
         update_cache: true
-    - import_role:
+    - ansible.builtin.import_role:
         name: _meta/common_base
-    - import_role:
-        name: mysql_client
-    - import_role:
-        name: php-cli
-    - import_role:
-        name: php-fpm
-    - import_role:
-        name: nginx
-    - import_role:
-        name: lhci
-    - import_role:
-        name: frontail
+    - ansible.builtin.import_role:
+        name: debian/mysql_client
+    - ansible.builtin.import_role:
+        name: debian/php-cli
+    - ansible.builtin.import_role:
+        name: debian/php-fpm
+    - ansible.builtin.import_role:
+        name: debian/nginx
+    - ansible.builtin.import_role:
+        name: debian/lhci
+    - ansible.builtin.import_role:
+        name: debian/frontail
diff --git a/templates/localgov/ce-dev/ansible/provision.yml.j2 b/templates/localgov/ce-dev/ansible/provision.yml.j2
index f171a78..d30e1de 100644
--- a/templates/localgov/ce-dev/ansible/provision.yml.j2
+++ b/templates/localgov/ce-dev/ansible/provision.yml.j2
@@ -50,19 +50,19 @@
         enable: false
 {% endraw %}
   tasks:
-    - apt:
+    - ansible.builtin.apt:
         update_cache: true
-    - import_role:
+    - ansible.builtin.import_role:
         name: _meta/common_base
-    - import_role:
-        name: mysql_client
-    - import_role:
-        name: php-cli
-    - import_role:
-        name: php-fpm
-    - import_role:
-        name: nginx
-    - import_role:
-        name: lhci
-    - import_role:
-        name: frontail
+    - ansible.builtin.import_role:
+        name: debian/mysql_client
+    - ansible.builtin.import_role:
+        name: debian/php-cli
+    - ansible.builtin.import_role:
+        name: debian/php-fpm
+    - ansible.builtin.import_role:
+        name: debian/nginx
+    - ansible.builtin.import_role:
+        name: debian/lhci
+    - ansible.builtin.import_role:
+        name: debian/frontail