diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7cd3f76..9ab0bea 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,6 @@
-image: ${CI_REGISTRY}/leenooks/ci-apt:latest
-
 stages:
 - build
+- deploy
 
 variables:
   VERSION: "0.12"
@@ -11,7 +10,8 @@ before_script:
 - apt-get install -y zip unzip dos2unix libbz2-dev zlib1g-dev libgeoip-dev libncurses5-dev libhunspell-dev libsqlite3-dev libreadline-dev libssl1.0-dev libssh-dev libmicrohttpd-dev libdbd-sqlite3-perl libmosquitto-dev m4 sed
 - pwd
 
-build:
+build:x86_64:
+  image: ${CI_REGISTRY}/leenooks/ci-apt:x86_64
   stage: build
   script:
   - git archive --format=tar HEAD |gzip -9 > ../${CI_PROJECT_NAME}_${VERSION}.orig.tar.gz
@@ -21,6 +21,34 @@ build:
   - mv ../${CI_PROJECT_NAME}*.deb build
   tags:
   - apt
+  - x86_64
+  only:
+  - debian
+  artifacts:
+    paths:
+      - build/*deb
+
+deploy:x86_64:
+  stage: deploy
+  dependancies:
+    - build:x86_64
+  script:
+    - ls -al /build/
+  tags:
+  - reprepro
+
+build:armv7l:
+  image: ${CI_REGISTRY}/leenooks/ci-apt:armv7l
+  stage: build
+  script:
+  - git archive --format=tar HEAD |gzip -9 > ../${CI_PROJECT_NAME}_${VERSION}.orig.tar.gz
+  - dpkg-buildpackage -us -uc
+  - mkdir build
+  - ls -al ../
+  - mv ../${CI_PROJECT_NAME}*.deb build
+  tags:
+  - apt
+  - armv7l
   only:
   - debian
   artifacts: