diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a5cbde699077703b1dd04abfec6f7950f9028fe7..6e252aae0aa34778bbf3ae938969a7d3dd1fe97f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -42,30 +42,6 @@ stages:
     - . bootstrap/etc/lofar20rc.sh || true
 ##    Allow docker image script to execute
 #    - chmod u+x $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh
-.base_docker_store_images:
-  extends: .base_docker_images
-  script:
-#    Do not remove 'bash' or statement will be ignored by primitive docker shell
-    - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh
-docker_store_images_master_tag:
-  extends: .base_docker_store_images
-  only:
-    refs:
-      - tags
-      - master
-docker_store_images_changes:
-  extends: .base_docker_store_images
-  rules:
-#   https://stackoverflow.com/questions/68955071/how-to-disable-detached-pipelines-in-gitlab
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: never
-    - if: '$CI_COMMIT_TAG != null'
-      when: never
-    - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
-      when: never
-    - changes:
-      - docker-compose/.env
-      when: always
 docker_build_image_all:
   extends: .base_docker_images
   only:
@@ -105,7 +81,6 @@ docker_build_image_all:
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh archiver-timescale latest
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh hdbppts-cm latest
     - bash $CI_PROJECT_DIR/sbin/tag_and_push_docker_image.sh hdbppts-es latest
-
 docker_build_image_elk:
   extends: .base_docker_images
   rules:
diff --git a/docker-compose/lofar-device-base/Dockerfile b/docker-compose/lofar-device-base/Dockerfile
index 7a4e16b8b4ba855b8a843313ff6258bf2f8c91db..f81503c89d51b5198a2f4da368d9dbde1b5daaad 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++ python3-dev && sudo apt-get clean
+RUN sudo apt-get update && sudo apt-get install -y git g++ gcc python3-dev && sudo apt-get clean
 
 
 COPY docker-compose/lofar-device-base/lofar-requirements.txt /lofar-requirements.txt