diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7d6d748..27e1e52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,7 +10,10 @@ dockerhub-push:
   stage: deploy
   script:
     - echo "$DOCKERHUB_PASSWORD" | base64 -d | docker login -u "$DOCKERHUB_USERNAME" --password-stdin
+    - export DOCKER_VERSION=$(docker run --rm "$CI_REGISTRY_IMAGE" docker --version | perl -pe 's/^.*\s(\d+\.\d+\.\d+.+),.*$/\1/')
+    - export BUILDX_VERSION=$(docker run --rm "$CI_REGISTRY_IMAGE" docker buildx version | perl -pe 's/^.*v?(\d+\.\d+\.\d+).*$/$1/')
     - docker tag "$CI_REGISTRY_IMAGE" "$DOCKERHUB_REPO:latest"
+    - docker tag "$CI_REGISTRY_IMAGE" "$DOCKERHUB_REPO:${DOCKER_VERSION}_${BUILDX_VERSION}"
     - docker push "$DOCKERHUB_REPO"
   only:
     - master
diff --git a/Dockerfile b/Dockerfile
index aa1c143..3868fe2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,5 @@
 FROM debian
 
-ENV BUILDX_VERSION=v0.2.2
-
 # Install Docker and qemu
 # TODO Use docker stable once it properly supports buildx
 RUN apt-get update && apt-get install -y \
@@ -19,6 +17,7 @@ RUN apt-get update && apt-get install -y \
 
 # Install buildx plugin
 RUN mkdir -p ~/.docker/cli-plugins && \
-    curl -L -o ~/.docker/cli-plugins/docker-buildx \
-        https://github.com/docker/buildx/releases/download/${BUILDX_VERSION}/buildx-${BUILDX_VERSION}.linux-amd64 && \
+    curl -s https://api.github.com/repos/docker/buildx/releases/latest | \
+        grep "browser_download_url.*linux-arm64" | cut -d : -f 2,3 | tr -d \" | \
+    xargs curl -L -o ~/.docker/cli-plugins/docker-buildx && \
     chmod a+x ~/.docker/cli-plugins/docker-buildx