diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4584b43f..05290ae1f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -44,6 +44,12 @@ prepare:raspbian:docker-dev:
     DOCKER_FILE: packaging/docker/Dockerfile.dev-raspbian
     DOCKER_IMAGE_DEV: villas/node-dev-raspbian
 
+prepare:debian-armhf:docker-dev:
+  extends: prepare:fedora:docker-dev
+  variables:
+    DOCKER_FILE: packaging/docker/Dockerfile.dev-debian-armhf
+    DOCKER_IMAGE_DEV: villas/node-dev-debian-armhf
+
 prepare:ubuntu:docker-dev:
   extends: prepare:fedora:docker-dev
   variables:
@@ -84,6 +90,11 @@ build:raspbian:armv6l:
     DOCKER_IMAGE_DEV: villas/node-dev-raspbian
     CMAKE_OPTS: -DWITH_NODE_INFINIBAND=OFF
 
+build:debian-cross:armv7l:
+  extends: build:fedora:x86_64
+  variables:
+    DOCKER_IMAGE_DEV: villas/node-dev-debian-armhf
+
 build:docs:
   stage: build
   artifacts: