diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b12d848d..cedf5f5c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -258,8 +258,11 @@ deploy:docker-dev:
   before_script:
   - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
   script:
-  - docker tag  ${DOCKER_IMAGE}:${DOCKER_TAG} ${DOCKER_IMAGE}:latest
-  - docker push ${DOCKER_IMAGE}:latest
+  - docker manifest create ${DOCKER_IMAGE}:${DOCKER_TAG}
+                           ${DOCKER_IMAGE}:${DOCKER_TAG}-x86_64
+                           ${DOCKER_IMAGE}:${DOCKER_TAG}-arm64
+                           ${DOCKER_IMAGE}:${DOCKER_TAG}-armhf
+  - docker manifest push   ${DOCKER_IMAGE}:latest
   tags:
   - docker
   needs: