diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c2a5eb4067dc811ca46649f34168f6354983bddf..e55ca378e413fb0cf93c526aaa1e98b699ba16ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -134,6 +134,30 @@ build_i686_dynamic_linux26:
       - $BUILD_DISTRIBUTION == "i686_dynamic_linux26"
       - $BUILD_DISTRIBUTION == null
 
+build_armhf_dynamic:
+  stage: build
+  retry: 2
+  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
+    - export DISTRIB_NAME=chaos-distrib-$REVNAME-$CI_JOB_NAME
+    - repo sync
+    - ./chaosframework/tools/chaos_git.sh -c $TEST_BRANCH    
+    - cd chaosframework;export CHAOS_LIB_HASH=`git log -n 1 --pretty="%h"`;export CHAOS_LAST_TAG=`git describe --abbrev=0`;cd -;
+    - cmake . -DCHAOS_BUILD_CACHE=OFF -DCHAOS_VERSION_MAJOR="$CI_COMMIT_REF_NAME.$CHAOS_LIB_HASH ($CHAOS_LAST_TAG)" -DCHAOS_VERSION_MINOR="CI_JOB_STAGE.$CI_COMMIT_SHA" -DCMAKE_BUILD_WITH_INSTALL_RPATH=1 -DCHAOS_TARGET=armhf -DCHAOS_BUILD_ID=${CI_PIPELINE_ID} -DCHAOS_CDS=OFF -DCHAOS_MDS=OFF -DCHAOS_AGENT=OFF -DCHAOS_WAN=OFF -DCHAOS_EXAMPLES=OFF -DCHAOS_ENABLE_C11=OFF -DCMAKE_INSTALL_PREFIX=$INSTALL_DIR |& tee $INSTALL_DIR/bundle.configuration.log
+    - if ! make  -j 4 install |& tee $INSTALL_DIR/bundle.compilation.log;then tar cfz compilation.tar.gz $INSTALL_DIR/bundle.compilation.log;exit 1;fi
+    - tar cfz $DISTRIB_NAME.tar.gz -C $INSTALL_DIR/..  /usr/local/chaos chaos-distrib
+  artifacts:
+    name: "$DISTRIB_NAME.tar.gz"
+    paths:
+      - ./*.tar.gz
+    expire_in: 2 day
+    when: always
+  only:
+    variables:
+      - $BUILD_DISTRIBUTION == "armhf_dynamic"
+      - $BUILD_DISTRIBUTION == null
+
 # ubuntu1604_x86_64:
 #   stage: build
 #   retry: 2
@@ -595,6 +619,7 @@ deploy_stage:
     - centos7_x86_64
     - build_i686_dynamic_linux26
     - build_arm_linux26
+    - build_armhf
     - build_i686_static_linux26
   stage: deploy
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:lite
@@ -612,6 +637,7 @@ deploy_stage:
     - scp chaos-distrib-$REVNAME-ubuntu-14.04-x86_64.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/14.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz
     - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/14.04/chaos-distrib.$TAR_NAME_POSTFIX.tar.gz /var/www/html/binary/chaos/$OUTPUT_REV_DIR/$ARCH/ubuntu/14.04/latest.tar.gz"
     - scp chaos-distrib-$REVNAME-build_arm_linux26.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/arm/chaos-distrib-$REVNAME-build_arm_linux26.tar.gz
+    - scp chaos-distrib-$REVNAME-build_armhf.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/arm/chaos-distrib-$REVNAME-build_armhf.tar.gz
     - scp chaos-distrib-$REVNAME-build_i686_dynamic_linux26.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/i686/chaos-distrib-$REVNAME-build_i686_dynamic_linux26.tar.gz
     - scp chaos-distrib-$REVNAME-build_i686_static_linux26.tar.gz  chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/$OUTPUT_REV_DIR/i686/chaos-distrib-$REVNAME-build_i686_static_linux26.tar.gz
         
@@ -670,6 +696,7 @@ deploy_nightly:
     - centos7_x86_64
     - build_i686_dynamic_linux26
     - build_arm_linux26
+    - build_armhf
     - build_i686_static_linux26
   stage: deploy_nightly
   image: baltig.infn.it:4567/chaos-lnf-control/chaos_bundle_compilation:lite
@@ -692,6 +719,7 @@ deploy_nightly:
     - scp chaos-distrib-$REVNAME-ubuntu-14.04-x86_64.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/nightly/$ARCH/ubuntu/14.04/$NIGHTLY_NAME
     - ssh chaosweb@opensource.lnf.infn.it "ln -sf /var/www/html/binary/chaos/nightly/$ARCH/ubuntu/14.04/$NIGHTLY_NAME /var/www/html/binary/chaos/nightly/$ARCH/ubuntu/14.04/latest.tar.gz"
     - scp chaos-distrib-$REVNAME-build_arm_linux26.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/nightly/arm/chaos-distrib-$REVNAME-build_arm_linux26.tar.gz
+    - scp chaos-distrib-$REVNAME-build_armhf.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/nightly/arm/chaos-distrib-$REVNAME-build_armhf.tar.gz
     - scp chaos-distrib-$REVNAME-build_i686_dynamic_linux26.tar.gz chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/nightly/i686/chaos-distrib-$REVNAME-build_i686_dynamic_linux26.tar.gz
     - scp chaos-distrib-$REVNAME-build_i686_static_linux26.tar.gz  chaosweb@opensource.lnf.infn.it:/var/www/html/binary/chaos/nightly/i686/chaos-distrib-$REVNAME-build_i686_static_linux26.tar.gz
   allow_failure: true