diff --git a/roles/matrix-awx/tasks/delete_awx_templates.yml b/roles/matrix-awx/tasks/delete_awx_templates.yml
index 3aa839cd2..ae6cc8889 100755
--- a/roles/matrix-awx/tasks/delete_awx_templates.yml
+++ b/roles/matrix-awx/tasks/delete_awx_templates.yml
@@ -293,3 +293,16 @@
     tower_oauthtoken: "{{ tower_token.stdout }}"
     validate_certs: yes
   when: matrix_domain is defined
+
+- name: Remove 'Purge Database (Advanced)' job template
+  delegate_to: 127.0.0.1
+  awx.awx.tower_job_template:
+    name: "{{ matrix_domain }} - 2 - Purge Database (Advanced)"
+    job_type: run
+    project: "{{ member_id }} - Matrix Docker Ansible Deploy"
+    playbook: setup.yml
+    state: absent
+    tower_host: "https://{{ tower_host }}"
+    tower_oauthtoken: "{{ tower_token.stdout }}"
+    validate_certs: yes
+  when: matrix_domain is defined
diff --git a/roles/matrix-awx/tasks/delete_subscription_directory.yml b/roles/matrix-awx/tasks/delete_subscription_directory.yml
index 1e0bb095e..373b7424c 100755
--- a/roles/matrix-awx/tasks/delete_subscription_directory.yml
+++ b/roles/matrix-awx/tasks/delete_subscription_directory.yml
@@ -8,8 +8,8 @@
 - name: Save new 'Delete Job Template' survey.json to the AWX tower, template
   delegate_to: 127.0.0.1
   template:
-    src: '{{ role_path }}/templates/delete_job_template.json.j2'
-    dest: '/var/lib/awx/projects/hosting/delete_job_template.json'
+    src: '{{ role_path }}/templates/cleanup_deletion_template.json.j2'
+    dest: '/var/lib/awx/projects/hosting/cleanup_deletion_template.json'
 
 - name: Re-create '00 - Cleanup Deletion Template' job template
   delegate_to: 127.0.0.1
@@ -20,7 +20,7 @@
     inventory: "{{ org_name }} [Admin]"
     project: "Ansible Create Delete Subscription Membership"
     playbook: cleanup_deletion_job_template.yml
-    extra_vars: "{{ lookup('file', '/var/lib/awx/projects/hosting/delete_job_template.json') }}"
+    extra_vars: "{{ lookup('file', '/var/lib/awx/projects/hosting/cleanup_deletion_template.json') }}"
     ask_extra_vars: yes
     state: present
     verbosity: 1