diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5aa592d2f2976eec09451b297b8d5e091db14ffe..9446e46f16c97834ae76eaeb52eb91bcdf6b6123 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,7 +69,7 @@ macosx_x86_64:
 build_i686_static_linux26:
   stage: build
   tags:
-    - lnf
+    - shared
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:lite
   script:
     - repo init -q --no-clone-bundle -u git@baltig.infn.it:chaos-lnf-control/chaos_repo_bundle.git -b $CI_COMMIT_REF_NAME
@@ -84,7 +84,12 @@ build_i686_static_linux26:
     - if [ $CI_COMMIT_REF_NAME == "master" ];then i686-nptl-linux-gnu-strip `find $INSTALL_DIR/bin/ -type f`;fi
     - i686-nptl-linux-gnu-strip `find $INSTALL_DIR/lib/ -name "*.a" -type f`
     - tar cfz $DISTRIB_NAME.tar.gz -C $INSTALL_DIR/..  $DISTRIB_NAME
-    - scp $DISTRIB_NAME.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/i686/stage_$DISTRIB_NAME.tar.gz
+#    - scp $DISTRIB_NAME.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/i686/stage_$DISTRIB_NAME.tar.gz
+  artifacts:
+    name: "$DISTRIB_NAME.tar.gz"
+    paths:
+      - ./*.tar.gz
+    expire_in: 1 day
 
 
 build_i686_dynamic_linux26:
@@ -112,6 +117,8 @@ build_i686_dynamic_linux26:
     
 ubuntu1604_x86_64:
   stage: build
+  tags:
+    - shared
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:1604
   script:
     - mkdir -p $INSTALL_DIR
@@ -157,6 +164,8 @@ ubuntu1604_x86_64:
 
 ubuntu1404_x86_64:
   stage: build
+  tags:
+    - shared
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:1404
 
   script:
@@ -186,6 +195,8 @@ ubuntu1404_x86_64:
 
 build_arm_linux26:
   stage: build
+  tags:
+    - shared
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:lite
   
   script:
@@ -224,20 +235,20 @@ build_arm_linux26:
 #     - scp chaos-distrib-$CI_COMMIT_REF_NAME-build_arm_linux26/bin/daqLiberaServer michelo@192.168.143.252:/export/chaos-libera/old/daqLiberaServer-test
 #     - ssh root@libera01 "/mnt/chaos/old/daqLiberaServer-test --help"
 
-test_i686_static_linux26:
-  dependencies:
-    - build_i686_static_linux26
-  tags:
-    - lnf
-  stage: test
-  image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:lite
-  allow_failure: true
-  script:
-    - scp chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/i686/stage_chaos-distrib-$CI_COMMIT_REF_NAME-build_i686_static_linux26.tar.gz chaos-distrib-$CI_COMMIT_REF_NAME-build_i686_static_linux26.tar.gz 
-    - tar xfz chaos-distrib-$CI_COMMIT_REF_NAME-build_i686_static_linux26.tar.gz chaos-distrib-$CI_COMMIT_REF_NAME-build_i686_static_linux26/bin/UnitServer
-    - scp chaos-distrib-$CI_COMMIT_REF_NAME-build_i686_static_linux26/bin/UnitServer root@dante073:UnitServer-test
-    - ssh root@dante073 "./UnitServer-test --help"
-    - ssh root@dante073 "rm ./UnitServer-test"
+# test_i686_static_linux26:
+#   dependencies:
+#     - build_i686_static_linux26
+#   tags:
+#     - lnf
+#   stage: test
+#   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:lite
+#   allow_failure: true
+#   script:
+#     - scp chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$CI_COMMIT_REF_NAME/i686/stage_chaos-distrib-$CI_COMMIT_REF_NAME-build_i686_static_linux26.tar.gz chaos-distrib-$CI_COMMIT_REF_NAME-build_i686_static_linux26.tar.gz 
+#     - tar xfz chaos-distrib-$CI_COMMIT_REF_NAME-build_i686_static_linux26.tar.gz chaos-distrib-$CI_COMMIT_REF_NAME-build_i686_static_linux26/bin/UnitServer
+#     - scp chaos-distrib-$CI_COMMIT_REF_NAME-build_i686_static_linux26/bin/UnitServer root@dante073:UnitServer-test
+#     - ssh root@dante073 "./UnitServer-test --help"
+#     - ssh root@dante073 "rm ./UnitServer-test"
   
   
 # test_i686_dynamic_linux26: