diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d36e51e93..10ba3b076 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -39,6 +39,7 @@ Linux client build:
   stage: build
   except:
     - ryzomcore
+    - mac-ci-build
   tags:
     - Docker
   image: debian:jessie
@@ -88,6 +89,8 @@ Linux client build:
 
 Linux server debian_amd64_strech build:
   stage: build
+  except:
+    - mac-ci-build
   tags:
     - Docker
   image: amd64/debian:9
@@ -169,6 +172,8 @@ Linux server debian_amd64_strech build:
 
 Linux client debian_amd64_strech build:
   stage: build
+  except:
+    - mac-ci-build
   tags:
     - Docker
   image: amd64/debian:9
@@ -229,6 +234,8 @@ Linux client debian_amd64_strech build:
 
 Linux client_static debian_amd64_strech build:
   stage: build
+  except:
+    - mac-ci-build
   tags:
     - Docker
   image: amd64/debian:9
@@ -335,6 +342,8 @@ Linux client_static debian_amd64_strech build:
 # Fedora Client
 Linux client fedora_amd64_27 build:
   stage: build
+  except:
+    - mac-ci-build
   tags:
     - Docker
   image: amd64/fedora:27
@@ -395,6 +404,8 @@ Linux client fedora_amd64_27 build:
 # Ubuntu Client
 Linux client ubuntu_amd64_17_10 build:
   stage: build
+  except:
+    - mac-ci-build
   tags:
     - Docker
   image: amd64/ubuntu:17.10
@@ -450,6 +461,8 @@ Linux client ubuntu_amd64_17_10 build:
 # Archlinux Client
 Linux client archlinux build:
   stage: build
+  except:
+    - mac-ci-build
   tags:
     - Docker
   image: base/archlinux
@@ -544,6 +557,8 @@ Linux client archlinux build:
 
 Windows client build:
   stage: build
+  except:
+    - mac-ci-build
   tags:
     - Docker
   image: amd64/debian:9
@@ -608,6 +623,7 @@ Linux client test:
   stage: test
   except:
     - ryzomcore
+    - mac-ci-build
   tags:
     - Docker
   image: ubuntu:14.04
@@ -619,8 +635,9 @@ Linux client test:
     
 .OSX client test:
   stage: test
-  except:
-    - ryzomcore
+  only:
+    - tags
+    - mac-ci-build
   tags:
     - OSX
   script: