diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a87fcae0a..bf206df21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ stages:
   
 linux-stable:
   tags:
-    - debian
+    - docker
     - linux
     
   image: gcc
@@ -37,8 +37,8 @@ linux-stable:
       - build/artifacts/
 darwin:
   tags:
-    - xcode_7-2
-    - osx_10-11
+    - macos
+    - macos_10_12
   stage: build
   script: 
     - cores_to_use=$((`nproc`-2)); if (( $cores_to_use < 1 )); then cores_to_use=1; fi