diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f98d74874..0b12d848d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -258,8 +258,8 @@ deploy:docker-dev:
   before_script:
   - docker login -u ${CI_REGISTRY_USER} -p ${CI_REGISTRY_PASSWORD} ${CI_REGISTRY}
   script:
-  - docker tag  ${DOCKER_IMAGE}/dev:${DOCKER_TAG} ${DOCKER_IMAGE}/dev:latest
-  - docker push ${DOCKER_IMAGE}/dev:latest
+  - docker tag  ${DOCKER_IMAGE}:${DOCKER_TAG} ${DOCKER_IMAGE}:latest
+  - docker push ${DOCKER_IMAGE}:latest
   tags:
   - docker
   needs:
diff --git a/cmake/toolchains/debian-arm64.cmake b/cmake/toolchains/debian-arm64.cmake
index b8060f693..a55b0829a 100644
--- a/cmake/toolchains/debian-arm64.cmake
+++ b/cmake/toolchains/debian-arm64.cmake
@@ -14,4 +14,3 @@ set(CMAKE_EXE_LINKER_FLAGS " ${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "Buildroot
 set(CMAKE_LIBRARY_PATH "/usr/lib/${TRIPLET};/usr/local/lib/${TRIPLET}")
 
 set(GOARCH "arm64")
-set(GOARM "8")
diff --git a/packaging/docker/Dockerfile.debian-multiarch b/packaging/docker/Dockerfile.debian-multiarch
index 48fd4de8f..3afa5ce7e 100644
--- a/packaging/docker/Dockerfile.debian-multiarch
+++ b/packaging/docker/Dockerfile.debian-multiarch
@@ -25,10 +25,9 @@ ARG DISTRO=debian
 ARG DEBIAN_VERSION=bullseye
 ARG ARCH=armhf
 ARG TRIPLET=arm-linux-gnueabihf
-ARG PLATFORM=linux/arm/v7
 ARG PREFIX=/app
 
-FROM ${DISTRO}:${DEBIAN_VERSION} AS dev
+FROM --platform=${BUILDPLATFORM} ${DISTRO}:${DEBIAN_VERSION} AS dev
 
 ARG DISTRO
 ARG ARCH
@@ -128,7 +127,7 @@ RUN cmake ${CMAKE_OPTS} .. && \
 	make -j$(nproc) doc && \
 	make -j$(nproc) install
 
-FROM --platform=${PLATFORM} ${DISTRO}:${DEBIAN_VERSION} AS app
+FROM --platform=${TARGETPLATFORM} ${DISTRO}:${DEBIAN_VERSION} AS app
 
 ARG DISTRO
 ARG ARCH