diff --git a/ansible/roles/create_config/tasks/main.yaml b/ansible/roles/create_config/tasks/main.yaml
index 89476c6..f7b0090 100644
--- a/ansible/roles/create_config/tasks/main.yaml
+++ b/ansible/roles/create_config/tasks/main.yaml
@@ -119,7 +119,7 @@
   set_fact:
     tenant_config_updated: >-
       {% if (scheduler_config is changed and
-             scheduler_config.diff and
+             scheduler_config.diff|default(None) and
              'main.yaml' in scheduler_config.diff[-1][1]) %}True
       {% endif %}
 
diff --git a/ansible/roles/deploy_pg/tasks/main.yaml b/ansible/roles/deploy_pg/tasks/main.yaml
index c7c1c50..dc44567 100644
--- a/ansible/roles/deploy_pg/tasks/main.yaml
+++ b/ansible/roles/deploy_pg/tasks/main.yaml
@@ -123,5 +123,3 @@
           pgo-backrest: 'false'
           pgo-version: 3.5.2
         usersecretname: "{{ pg_cluster_name }}-zuul-secret"
-
-- pause:
diff --git a/ansible/zuul.yaml b/ansible/zuul.yaml
index 6d505f8..0ee5eb1 100644
--- a/ansible/zuul.yaml
+++ b/ansible/zuul.yaml
@@ -7,13 +7,13 @@
       command: env
     - import_role:
         name: get_status
+    - import_role:
+        name: create_config
     - import_role:
         name: deploy_pg
       when: (pg_cr_lookup|length==0)
     - import_role:
         name: deploy_zk
       when: (zk_cr_lookup|length==0)
-    - import_role:
-        name: create_config
     - import_role:
         name: deploy