diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c22a04598b1d2c90a1b373251b0450a46f87dff4..f12881096ac1c26e62bb8d34584d8cbd4aaa18ee 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,7 @@
 stages:
-    - ubuntu1604_experimental_x86_64
-    - ubuntu1604_experimental_test_x86_64
-    - ubuntu1404_experimental_x86_64
-    - ubuntu1404_experimental_test_x86_64
-    - build_arm_experimental_linux26
+    - build
+    - test
+
 
 
 before_script:
@@ -23,8 +21,9 @@ before_script:
 
 ubuntu1604_experimental_x86_64:
   tags:
+    - shared
     - chaos
-  stage: ubuntu1604_experimental_x86_64
+  stage: build
   image: baltig.infn.it:4567/amichelo/chaos_bundle_compilation:1604
   script:
     - mkdir chaos_bundle
@@ -33,28 +32,30 @@ ubuntu1604_experimental_x86_64:
     - repo sync
     - cmake -DCHAOS_WAN=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR .
     - make  -j 8 install
-    - tar cfz chaos-distrib-$CI_PIPELINE_ID.tar.gz -C $INSTALL_DIR/..  chaos-distrib-$CI_PIPELINE_ID
+    - tar cfz chaos-distrib-$CI_JOB_NAME.tar.gz -C $INSTALL_DIR/..  chaos-distrib-$CI_JOB_NAME
   artifacts:
         paths:
-         - chaos_bundle/chaos-distrib-$CI_PIPELINE_ID.tar.gz
+         - chaos_bundle/chaos-distrib-$CI_JOB_NAME.tar.gz
         expire_in: 1 week
 
 ubuntu1604_experimental_test_x86_64:
   tags:
+    - shared
     - chaos
-  stage: ubuntu1604_experimental_test_x86_64
+  stage: test
   image: baltig.infn.it:4567/amichelo/chaos_bundle_compilation:1604
   script:
     - /tmp/chaos_start.sh
-    - tar xfz chaos-distrib-$CI_PIPELINE_ID.tar.gz
-    - cd chaos-distrib-$CI_PIPELINE_ID
+    - tar xfz chaos-distrib-ubuntu1604_experimental_x86_64.tar.gz
+    - cd chaos-distrib-ubuntu1604_experimental_x86_64
     - source chaos_env.sh
     - ./tools/chaos_test.sh .
 
 ubuntu1404_experimental_x86_64:
   tags:
+    - shared
     - chaos
-  stage: ubuntu1404_experimental_x86_64
+  stage: build
   image: baltig.infn.it:4567/amichelo/chaos_bundle_compilation:1404
   script:
     - mkdir chaos_bundle
@@ -63,21 +64,21 @@ ubuntu1404_experimental_x86_64:
     - repo sync
     - cmake -DCHAOS_WAN=ON -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR .
     - make  -j 4 install
-    - tar cfz chaos-distrib-$CI_PIPELINE_ID.tar.gz -C $INSTALL_DIR/..  chaos-distrib-$CI_PIPELINE_ID
+    - tar cfz chaos-distrib-$CI_JOB_NAME.tar.gz -C $INSTALL_DIR/..  chaos-distrib-$CI_JOB_NAME
   artifacts:
         paths:
-         - chaos_bundle/chaos-distrib-$CI_PIPELINE_ID.tar.gz
+         - chaos_bundle/chaos-distrib-$CI_JOB_NAME.tar.gz
         expire_in: 1 week
 
 
 ubuntu1404_experimental_test_x86_64:
   tags:
+    - shared
     - chaos
-  stage: ubuntu1404_experimental_test_x86_64
+  stage: test
   image: baltig.infn.it:4567/amichelo/chaos_bundle_compilation:1404
   script:
     - /tmp/chaos_start.sh
-    - scp chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/x86_64/chaos-distrib-ubuntu1404_experimental_x86_64.tar.gz .
     - tar xfz chaos-distrib-ubuntu1404_experimental_x86_64.tar.gz
     - cd chaos-distrib-ubuntu1404_experimental_x86_64
     - source chaos_env.sh
@@ -86,8 +87,9 @@ ubuntu1404_experimental_test_x86_64:
 build_arm_experimental_linux26:
   tags:
     - shared
-  stage: build_arm_experimental_linux26
-  image: baltig.infn.it:4567/amichelo/chaos_bundle_compilation:1404 
+    - chaos
+  stage: build
+  image: baltig.infn.it:4567/amichelo/chaos_bundle_compilation:1604 
   script:
     - mkdir chaos_bundle
     - cd chaos_bundle
@@ -96,4 +98,49 @@ build_arm_experimental_linux26:
     - export PATH=/usr/local/chaos/gcc-arm-infn-linux26/bin/:$PATH
     - cmake . -DCHAOS_STATIC=ON -DCHAOS_TARGET=arm-linux-2.6 -DCHAOS_CDS=OFF -DCHAOS_MDS=OFF -DCHAOS_WAN=OFF -DCHAOS_EXAMPLES=OFF -DCHAOS_ENABLE_C11=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
     - make  -j 4 install
+    - tar cfz chaos-distrib-$CI_JOB_NAME.tar.gz -C $INSTALL_DIR/..  chaos-distrib-$CI_JOB_NAME
+  artifacts:
+        paths:
+         - chaos_bundle/chaos-distrib-$CI_JOB_NAME.tar.gz
+        expire_in: 1 week
+
+build_i686_experimental_static_linux26:
+  tags:
+    - shared
+    - chaos
+  stage: build
+  image: baltig.infn.it:4567/amichelo/chaos_bundle_compilation:1604 
+  script:
+    - mkdir chaos_bundle
+    - cd chaos_bundle
+    - repo init -u git@baltig.infn.it:chaos-lnf-control/chaos_repo_bundle.git -b experimental
+    - repo sync
+    - export PATH=/usr/local/chaos/i686-nptl-linux-gnu/bin/:$PATH
+    - cmake . -DCHAOS_STATIC=ON -DCHAOS_TARGET=i686-linux26 -DCHAOS_CDS=OFF -DCHAOS_MDS=OFF -DCHAOS_WAN=OFF -DCHAOS_EXAMPLES=OFF -DCHAOS_ENABLE_C11=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
+    - make  -j 4 install
+    - tar cfz chaos-distrib-$CI_JOB_NAME.tar.gz -C $INSTALL_DIR/..  chaos-distrib-$CI_JOB_NAME
+  artifacts:
+        paths:
+         - chaos_bundle/chaos-distrib-$CI_JOB_NAME.tar.gz
+        expire_in: 1 week
+
+build_i686_experimental_dynamic_linux26:
+  tags:
+    - shared
+    - chaos
+  stage: build
+  image: baltig.infn.it:4567/amichelo/chaos_bundle_compilation:1604 
+  script:
+    - mkdir chaos_bundle
+    - cd chaos_bundle
+    - repo init -u git@baltig.infn.it:chaos-lnf-control/chaos_repo_bundle.git -b experimental
+    - repo sync
+    - export PATH=/usr/local/chaos/i686-nptl-linux-gnu/bin/:$PATH
+    - cmake . -DCHAOS_TARGET=i686-linux26 -DCHAOS_CDS=OFF -DCHAOS_MDS=OFF -DCHAOS_WAN=OFF -DCHAOS_EXAMPLES=OFF -DCHAOS_ENABLE_C11=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR
+    - make  -j 4 install
+    - tar cfz chaos-distrib-$CI_JOB_NAME.tar.gz -C $INSTALL_DIR/..  chaos-distrib-$CI_JOB_NAME
+  artifacts:
+        paths:
+         - chaos_bundle/chaos-distrib-$CI_JOB_NAME.tar.gz
+        expire_in: 1 week