diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ca23373f6331acc7ee13fbb14991f8134fa2a4cd..b410033f9d74032b784c0cb0bab6941818a1642d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -461,42 +461,27 @@ newline_at_eof:
     - flake8 --filename *.sh,*.conf,*.md,*.yml --select=W292 --exclude docker-compose/tango-prometheus-exporter,.tox,.egg-info,docker
 python_linting:
   stage: linting
-  before_script:
-    - sudo apt-get update
-    - sudo apt-get install -y git
   script:
     - cd tangostationcontrol
     - tox -e pep8
 bandit:
   stage: static-analysis
-  before_script:
-    - sudo apt-get update
-    - sudo apt-get install -y git
   script:
     - cd tangostationcontrol
     - tox -e bandit
 xenon:
   stage: static-analysis
   allow_failure: true
-  before_script:
-    - sudo apt-get update
-    - sudo apt-get install -y git
   script:
    - cd tangostationcontrol
    - tox -e xenon
 shellcheck:
   stage: static-analysis
-  before_script:
-    - sudo apt-get update
-    - sudo apt-get install -y shellcheck
   script:
 #     TODO(Corne): Ignore shell files in submodules
     - shellcheck **/*.sh
 sphinx-documentation:
   stage: documentation
-  before_script:
-    - sudo apt-get update
-    - sudo apt-get install -y git graphviz
   script:
     - cd tangostationcontrol
     - tox -e docs
@@ -505,9 +490,6 @@ sphinx-documentation:
       - tangostationcontrol/docs/build/
 unit_test:
   stage: unit-tests
-  before_script:
-    - sudo apt-get update
-    - sudo apt-get install -y git
   script:
     - cd tangostationcontrol
     - tox -e cover
@@ -572,8 +554,6 @@ wheel_packaging:
     paths:
       - tangostationcontrol/dist/*.whl
   before_script:
-    - sudo apt-get update
-    - sudo apt-get install -y git
     - pip3 install -r tangostationcontrol/test-requirements.txt
     - pip3 install -r docker-compose/itango/lofar-requirements.txt
   script:
diff --git a/docker-compose/lofar-device-base/Dockerfile b/docker-compose/lofar-device-base/Dockerfile
index f81503c89d51b5198a2f4da368d9dbde1b5daaad..39b9d652f61d4afb3903b0ea98e3df98f51d2b8a 100644
--- a/docker-compose/lofar-device-base/Dockerfile
+++ b/docker-compose/lofar-device-base/Dockerfile
@@ -1,7 +1,7 @@
 ARG SOURCE_IMAGE
 FROM ${SOURCE_IMAGE}
 
-RUN sudo apt-get update && sudo apt-get install -y git g++ gcc python3-dev && sudo apt-get clean
+RUN sudo apt-get update && sudo apt-get install -y git g++ gcc shellcheck graphviz python3-dev && sudo apt-get clean
 
 
 COPY docker-compose/lofar-device-base/lofar-requirements.txt /lofar-requirements.txt