diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9eb53ea82bae755ad23a03385aaf44e1a98ebf1e..58594d746ecfd61e4e9b307b97040c1c5e5ff617 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: lycantropos/cmake
+image: lightspot21/acubesat-ci
 
 variables:
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
@@ -14,13 +14,13 @@ stages:
   - test
   - deploy
 
-before_script:
-  - apt-get update -qq && apt-get -qq -y install python3-pip && python3 -m pip install --upgrade pip
-  - python3 -V
-  - python3 -m pip --version
-  - g++ --version
-  - cat /etc/*-release
-  - python3 -m pip install gcovr
+#before_script:
+#  - apt-get update -qq && apt-get -qq -y install python3-pip && python3 -m pip install --upgrade pip
+#  - python3 -V
+#  - python3 -m pip --version
+#  - g++ --version
+#  - cat /etc/*-release
+#  - python3 -m pip install gcovr
 
 build:
   stage: build
@@ -29,10 +29,10 @@ build:
     GCC_COLORS: "error=31;1:warning=35;1:note=36;1:range1=32:range2=34:locus=39;1:quote=39;1:fixit-insert=32:fixit-delete=31:diff-filename=39;1:diff-hunk=32:diff-delete=31:diff-insert=32:type-diff=32;1"
     CLICOLOR_FORCE: 1 # Necessary for cmake to output colours
   script:
-    - cmake . -DCMAKE_CXX_FLAGS="-Werror -fdiagnostics-color=always"
-    - make -j4
-    - make clean
-    - cmake . -DCMAKE_CXX_FLAGS="-Wall -Wextra -fdiagnostics-color=always" # Build again, but with more warnings
+#    - cmake . -DCMAKE_CXX_FLAGS="-Werror -fdiagnostics-color=always"
+#    - make -j4
+#    - make clean
+    - cmake . -DCMAKE_CXX_FLAGS="-Wall -Wextra -Werror -fdiagnostics-color=always" # Build again, but with more warnings
     - make -j4
 
 tests:
@@ -54,8 +54,8 @@ tests:
 cppcheck:
   stage: build
   before_script:
-    - echo deb http://deb.debian.org/debian testing main > /etc/apt/sources.list
-    - apt-get update -qq && apt-get -t testing install -y cppcheck
+#    - echo deb http://deb.debian.org/debian testing main > /etc/apt/sources.list
+#    - apt-get update -qq && apt-get -t testing install -y cppcheck
     - cppcheck --version
   script:
     - ci/cppcheck.sh
@@ -64,8 +64,8 @@ cppcheck-misra:
   stage: build
   before_script:
   # install cppcheck from the testing repos in order to get the latest version
-    - echo deb http://deb.debian.org/debian testing main > /etc/apt/sources.list
-    - apt-get update -qq && apt-get -t testing install -y cppcheck && apt-get -t testing install -y python3
+#    - echo deb http://deb.debian.org/debian testing main > /etc/apt/sources.list
+#    - apt-get update -qq && apt-get -t testing install -y cppcheck && apt-get -t testing install -y python3
     - cppcheck --version
   script:
     - ci/cppcheck-misra.sh
@@ -73,25 +73,25 @@ cppcheck-misra:
 vera:
   stage: build
   before_script:
-    - apt-get update -qq && apt-get install -y -qq vera++
+#    - apt-get update -qq && apt-get install -y -qq vera++
     - vera++ --version
     - cp ci/vera.profile /usr/lib/vera++/profiles/custom
   script:
     - ci/vera.sh
 
-clang-tidy:
-  stage: build
-  variables:
-    GIT_SUBMODULE_STRATEGY: normal
-    TERM: xterm-color
-  before_script:
+#clang-tidy:
+#  stage: build
+#  variables:
+#    GIT_SUBMODULE_STRATEGY: normal
+#    TERM: xterm-color
+#  before_script:
     # Installing the `sid` repository to get the latest version of clang
-    - echo deb http://deb.debian.org/debian sid main > /etc/apt/sources.list
-    - apt-get update -qq && apt-get -t sid install -y -qq clang-tidy-7
-    - clang-tidy-7 --version
-  script:
+#    - echo deb http://deb.debian.org/debian sid main > /etc/apt/sources.list
+#    - apt-get update -qq && apt-get -t sid install -y -qq clang-tidy-7
+#    - clang-tidy-7 --version
+#  script:
     # Running with `script` to give clang a tty so that it outputs colours
-    - script -c "bash -x ci/clang-tidy.sh"
+#    - script -c "bash -x ci/clang-tidy.sh"
 
 pages:
   stage: deploy
@@ -103,7 +103,7 @@ pages:
   variables:
     GIT_SUBMODULE_STRATEGY: normal
   script:
-    - apt-get install -qq -y doxygen graphviz lcov
+#    - apt-get install -qq -y doxygen graphviz lcov
   after_script:
     - ./ci/pages_deploy.sh
     - echo -e "\e[1;36mPublic directory contents\e[0m" && ls -l public/coverage  # Print directory contents for debugging