diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e7c54b267f026e01a18a831b91004881d946807..526c533e8280eeab7b488373695410b00446298a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,7 +105,7 @@ build_cluster_cicd:
     - openstack stack list
     - bash -x ./CICD/heat/heatcicdwrapper.sh create_or_update $STACKNAME
   after_script:
-    - sleep 30 # artifically wait a bit to give the nodes time to boot
+    - sleep 20 # artifically wait a bit to give the nodes time to boot
 #  only:
 #    changes: #https://docs.gitlab.com/ee/ci/yaml/#onlychangesexceptchanges
 #    - "heat/*HOT*.yaml"
diff --git a/roles/config_repos/tasks/main.yml b/roles/config_repos/tasks/main.yml
index 02bc89770d1639870f12678aa05b218318dcb01a..ec161e8105397098a5d20f881a82f33e995f4ba7 100644
--- a/roles/config_repos/tasks/main.yml
+++ b/roles/config_repos/tasks/main.yml
@@ -6,7 +6,7 @@
     line: "118.138.244.7 consistency0"
     owner: root
     group: root
-
+  when: ansible_os_family == 'RedHat'
 
 #- name: remove default repos
 #  file:
@@ -39,10 +39,12 @@
   - monashhpc_base.repo
   - monashhpc_others.repo
   - epel.repo
+  when: ansible_os_family == 'RedHat'
 
 - name: get enabled repos
 #shell: yum repolist | grep -v "repo id" | grep -v "Loaded plugins" | head -n -1 | cut -f 1 -d '/' | sed -s 's/\!//'
   shell: yum repolist all | grep enabled | cut -f 1 -d '/' | sed -s 's/\!//'
+  when: ansible_os_family == 'RedHat'
   register: repolist
   check_mode: no
   changed_when: False
@@ -55,6 +57,7 @@
   become: true
   become_user: root
   ignore_errors: true
+  when: ansible_os_family == 'RedHat'
 
 
 #- name: Enable epel