diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 471b4e8752ca1790fd8debfc38cea58508f27dd4..06be81eb583f201e58977748ff2c6ac5235bb589 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,7 @@ ubuntu_boost_system:
     tags:
         - centos7
 
-    image: martinbeseda/dockertest:latest
+    image: martinbeseda/ubuntu-ci:latest
 
     before_script:
         - rm -rf external_dependencies/boost/*
@@ -91,9 +91,10 @@ ubuntu_boost_system:
 # compiled locally as submodules and
 # linked statically
 ubuntu_boost_local_static_deps:
+    tags:
+        - centos7
 
-#    image: martinbeseda/ubuntu-ci:latest
-    image: gcc:latest
+    image: martinbeseda/ubuntu-ci:latest
 
     before_script:
         - export TERM=xterm