diff --git a/roles/install_demo/tasks/azure.yml b/roles/install_demo/tasks/azure.yml
index 2555843..d689ac0 100644
--- a/roles/install_demo/tasks/azure.yml
+++ b/roles/install_demo/tasks/azure.yml
@@ -1,6 +1,6 @@
 ---
 - name: add azure credential
-  tower_credential:
+  awx.awx.tower_credential:
     name: azure_credential
     description: Azure Service Principle
     organization: "Default"
diff --git a/roles/install_demo/tasks/job_template.yml b/roles/install_demo/tasks/job_template.yml
index 69f7e65..040d55d 100644
--- a/roles/install_demo/tasks/job_template.yml
+++ b/roles/install_demo/tasks/job_template.yml
@@ -1,6 +1,6 @@
 ---
 - name: add tower project
-  tower_project:
+  awx.awx.tower_project:
     name: "{{ vars[demo].project.name }}"
     description: "{{ vars[demo].project.description }}"
     organization: "{{ vars[demo].project.organization }}"
@@ -11,8 +11,22 @@
     tower_host: "{{ my_tower_host }}"
     validate_certs: false
 
+- name: show values
+  debug:
+    msg:
+      - "name: {{ vars[demo].name }}"
+      - "description: {{ vars[demo].description }}"
+      - "job_type: {{ vars[demo].job_type }}"
+      - "inventory: {{ vars[demo].inventory }}"
+      - "project: {{ vars[demo].project.name }}"
+      - "playbook: {{ vars[demo].playbook }}"
+      - "fact_caching_enabled: {{ vars[demo].fact_caching_enabled | default('false') }}"
+      - "credential: {{ vars[demo].credential }}"
+      - "survey_enabled: {{ vars[demo].survey_enabled  | default('false')  }}"
+
+
 - name: add single job template without survey
-  tower_job_template:
+  awx.awx.tower_job_template:
     name: "{{ vars[demo].name }}"
     description: "{{ vars[demo].description }}"
     job_type: "{{ vars[demo].job_type }}"
@@ -34,7 +48,7 @@
   retries: 5
 
 - name: add single job template with survey
-  tower_job_template:
+  awx.awx.tower_job_template:
     name: "{{ vars[demo].name }}"
     description: "{{ vars[demo].description }}"
     job_type: "{{ vars[demo].job_type }}"
diff --git a/roles/install_demo/tasks/job_template_loop.yml b/roles/install_demo/tasks/job_template_loop.yml
index 60e3af2..fb2a879 100644
--- a/roles/install_demo/tasks/job_template_loop.yml
+++ b/roles/install_demo/tasks/job_template_loop.yml
@@ -20,7 +20,7 @@
         - workshop_type in item.value.workshop_type
 
     - name: "add job template {{ item.value.name }} without survey job_template_loop.yml"
-      tower_job_template:
+      awx.awx.tower_job_template:
         name: "{{ item.value.name }}"
         description: "{{ item.value.description }}"
         job_type: "{{ item.value.job_type }}"
@@ -42,7 +42,7 @@
       retries: 5
 
     - name: "add job template {{ item.value.name }} with survey"
-      tower_job_template:
+      awx.awx.tower_job_template:
         name: "{{ item.value.name }}"
         description: "{{ item.value.description }}"
         job_type: "{{ item.value.job_type }}"
diff --git a/roles/install_demo/tasks/unsupported_cloud.yml b/roles/install_demo/tasks/unsupported_cloud.yml
index 4c0d578..dccba7d 100644
--- a/roles/install_demo/tasks/unsupported_cloud.yml
+++ b/roles/install_demo/tasks/unsupported_cloud.yml
@@ -3,7 +3,7 @@
     msg: "there is no public cloud credentials for this install, installing dummy creds"
 
 - name: add azure credential
-  tower_credential:
+  awx.awx.tower_credential:
     name: azure_credential
     description: Azure Service Principle
     organization: "Default"
diff --git a/roles/install_demo/tasks/workflow.yml b/roles/install_demo/tasks/workflow.yml
index ebdda33..7e50a83 100644
--- a/roles/install_demo/tasks/workflow.yml
+++ b/roles/install_demo/tasks/workflow.yml
@@ -6,7 +6,7 @@
   loop: "{{ hostvars[inventory_hostname][demo].job_templates|dict2items }}"
 
 - name: "install workflow template {{ hostvars[inventory_hostname][demo].name }}"
-  tower_workflow_template:
+  awx.awx.tower_workflow_template:
     name: "{{ hostvars[inventory_hostname][demo].name }}"
     description: "{{ hostvars[inventory_hostname][demo].description }}"
     organization: "{{ hostvars[inventory_hostname][demo].organization }}"
diff --git a/roles/install_demo/tasks/workflow_loop.yml b/roles/install_demo/tasks/workflow_loop.yml
index 981550a..21e7881 100644
--- a/roles/install_demo/tasks/workflow_loop.yml
+++ b/roles/install_demo/tasks/workflow_loop.yml
@@ -4,7 +4,7 @@
   loop: "{{ item.value.job_templates|dict2items }}"
 
 - name: "INSIDE LOOP - install workflow template {{ item.value.name }}"
-  tower_workflow_template:
+  awx.awx.tower_workflow_template:
     name: "{{ item.value.name }}"
     description: "{{ item.value.description }}"
     organization: "{{ item.value.organization }}"
diff --git a/roles/requirements.yml b/roles/requirements.yml
index 129e516..28e5633 100644
--- a/roles/requirements.yml
+++ b/roles/requirements.yml
@@ -1,6 +1,5 @@
 ---
 - src: dev-sec.ssh-hardening
-- src: mindpointgroup.rhel7-cis
 - src: redhatofficial.rhel8_pci_dss
 - src: linux-system-roles.firewall
 - src: linux-system-roles.timesync