diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ecdd93a2872ba4bdb5334d872501beadaf92597c..6e0b5da3edb49b32ddec4825371e8b990a830082 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -85,6 +85,8 @@ before_script:
 build_i686_static_linux26:
   stage: build
   retry: 2
+  tags:  
+    - shared
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:cross
   script:
     - repo init -q --no-clone-bundle -u git@baltig.infn.it:chaos-lnf-control/chaos_repo_bundle.git -b $CI_COMMIT_REF_NAME
@@ -118,6 +120,8 @@ build_i686_static_linux26:
 
 build_i686_dynamic_linux26:
   stage: build
+  tags:  
+    - shared
   retry: 2
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:cross
   script:
@@ -151,6 +155,8 @@ build_i686_dynamic_linux26:
 
 build_armhf_dynamic:
   stage: build
+  tags:  
+    - shared
   retry: 2
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:cross
   script:
@@ -182,6 +188,8 @@ build_armhf_dynamic:
 
 build_armhf_static:
   stage: build
+  tags:  
+    - shared
   retry: 2
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:cross
   script:
@@ -243,6 +251,8 @@ build_armhf_static:
 
 ubuntu1804_x86_64:
   stage: build
+  tags:  
+    - shared
   retry: 2
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:1804
   script:
@@ -282,6 +292,8 @@ ubuntu1804_x86_64:
 
 ubuntu1804_profile_x86_64:
   stage: build
+  tags:  
+    - shared
   retry: 2
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:1804
   script:
@@ -436,6 +448,8 @@ centos7_x86_64:
 
 build_arm_linux26:
   stage: build
+  tags:  
+    - shared
   retry: 2
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:cross