diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a751f54..4ab9386 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -52,24 +52,24 @@ Test:
   stage: test
   script:
     - ansible-playbook --skip-tags no-test -C site.yml --vault-password-file /vaultpw || error="$?"
-    - [ "$error" -eq 4 ] && echo "Some hosts were unreachable; masking error" && unset error
-    - [ -n "$error" ] && echo "Return code $error" && false
+    - if [ "$error" -eq 4 ]; then echo "Some hosts were unreachable; masking error"; unset error; fi
+    - if [ -n "$error" ]; then echo "Return code $error"; false; fi
 
 Play_Against_Pis:
   stage: play
   script:
     - ansible-playbook -l pis site.yml --vault-password-file /vaultpw || error="$?"
-    - [ "$error" -eq 4 ] && echo "Some hosts were unreachable; masking error" && unset error
-    - [ -n "$error" ] && echo "Return code $error" && false
+    - if [ "$error" -eq 4 ]; then echo "Some hosts were unreachable; masking error"; unset error; fi
+    - if [ -n "$error" ]; then echo "Return code $error"; false; fi
 Play_Against_Desktops:
   stage: play
   script:
     - ansible-playbook -l desktop site.yml --vault-password-file /vaultpw || error="$?"
-    - [ "$error" -eq 4 ] && echo "Some hosts were unreachable; masking error" && unset error
-    - [ -n "$error" ] && echo "Return code $error" && false
+    - if [ "$error" -eq 4 ]; then echo "Some hosts were unreachable; masking error"; unset error; fi
+    - if [ -n "$error" ]; then echo "Return code $error"; false; fi
 Play_Against_Production:
   stage: play
   script:
     - ansible-playbook -l prod site.yml --vault-password-file /vaultpw || error="$?"
-    - [ "$error" -eq 4 ] && echo "Some hosts were unreachable; masking error" && unset error
-    - [ -n "$error" ] && echo "Return code $error" && false
+    - if [ "$error" -eq 4 ]; then echo "Some hosts were unreachable; masking error"; unset error; fi
+    - if [ -n "$error" ]; then echo "Return code $error"; false; fi