diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e14962c1ed7a47c9cd433178717fc81b9468fbf4..e8c28e2105a96780311bb3125727b3781755b85a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,10 +41,18 @@ build:master:
     - master
   when: manual
 
-build:dev:
+build:dev-amd64:
   stage: deploy
   script:
-    - docker build --pull -t "$CI_REGISTRY_IMAGE:dev" ./context/
-#    - docker push "$CI_REGISTRY_IMAGE:dev"
+    - docker build --build-arg opts="CGO_ENABLED=0 GOARCH=amd64" --pull -t "$CI_REGISTRY_IMAGE:dev-amd64" ./context/
+#    - docker push "$CI_REGISTRY_IMAGE:dev-amd64"
+  except:
+    - master
+
+build:dev-arm7:
+  stage: deploy
+  script:
+    - docker build --build-arg opts="GOARCH=arm GOARM=7" --pull -t "$CI_REGISTRY_IMAGE:dev-arm7" ./context/
+  #    - docker push "$CI_REGISTRY_IMAGE:dev-arm7"
   except:
     - master