diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a711d6568b97a4ecf0d2b82ba8eebf737fe76513..24420a8b0ca9a6ba42e250509625b61b9d34d901 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -139,7 +139,7 @@ ansible_create_cluster_stage:
     - export ANSIBLE_HOST_KEY_CHECKING=False
     - export ANSIBLE_CONFIG=`pwd`/ansible.cfg
     - ansible -i inventory.yml -m ping 'all'
-    - ansible-playbook -i inventory.yml upgrade_and_reboot.yml
+    - ansible-playbook -i inventory.yml upgrade_and_reboot.yml || true
     - ansible-playbook -i inventory.yml master_playbook.yml
     - sleep 15
     - echo uglyuglyfix
diff --git a/CICD/upgrade_and_reboot.yml b/CICD/upgrade_and_reboot.yml
index 182e604eaf1476e5bae2f346161c4ac0d7e0c837..55990af54e899cacf844411b2a0711262fcd601d 100644
--- a/CICD/upgrade_and_reboot.yml
+++ b/CICD/upgrade_and_reboot.yml
@@ -1,5 +1,8 @@
-- hosts: 'all'
+- hosts: 'all:!BastionNodes'
+  tasks:
+    - { apt: { update_cache: yes, upgrade: dist }, register: upgrade, become: true }
+    - { reboot: {}, when: upgrade.changed, become: true }
+- hosts: 'BastionNodes'
   tasks:
     - { apt: { update_cache: yes, upgrade: dist }, register: upgrade, become: true }
     - { reboot: {}, when: upgrade.changed, become: true }
-      #- { reboot: {}, become: true }