diff --git a/Dockerfile b/Dockerfile
index 9c2b279865fc81ac48b4db3d2d97e99f16e970b2..f32f2c3dab123c962fd56c242b34ef287eca6c76 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,18 +1,20 @@
-ARG BUILDX_VERSION=0.4.2
-ARG DOCKER_VERSION=latest
-
 FROM alpine AS fetcher
 
-RUN apk add curl
-
-ARG BUILDX_VERSION
-RUN curl -L \
-  --output /docker-buildx \
-  "https://github.com/docker/buildx/releases/download/v${BUILDX_VERSION}/buildx-v${BUILDX_VERSION}.linux-amd64"
+RUN \
+  apk add \
+    curl && \
+  LATEST_DOCKERX=$(curl --silent "https://api.github.com/repos/docker/buildx/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/' | cut -c 2-) && \
+  curl \
+    -L \
+    --output /docker-buildx \
+      "https://github.com/docker/buildx/releases/download/v${LATEST_DOCKERX}/buildx-v${LATEST_DOCKERX}.linux-amd64" && \
+  chmod a+x \
+    /docker-buildx
 
-RUN chmod a+x /docker-buildx
+FROM docker:latest
 
-ARG DOCKER_VERSION
-FROM docker:${DOCKER_VERSION}
+LABEL maintainer="Griefed <griefed@griefed.de>"
 
 COPY --from=fetcher /docker-buildx /usr/lib/docker/cli-plugins/docker-buildx
+
+RUN chmod a+x /usr/lib/docker/cli-plugins/docker-buildx
\ No newline at end of file