diff --git a/.gitea/workflows/docker-buildx.yaml b/.gitea/workflows/docker-buildx.yaml
new file mode 100644
index 0000000..5975ad3
--- /dev/null
+++ b/.gitea/workflows/docker-buildx.yaml
@@ -0,0 +1,73 @@
+name: docker-buildx
+run-name: docker-buildx
+env:
+  REPO_NAME: docker-buildx
+  REMOTE_REPO: https://github.com/docker/buildx
+  BUILD_PLATFORM: linux/arm64
+on:
+  push:
+    paths:
+      - ".gitea/workflows/docker-buildx.yaml"
+      - "dockerfiles/docker-buildx.Dockerfile"
+  schedule:
+    - cron: "0 0 1 * *" # monthly
+
+jobs:
+  build:
+    runs-on: runner
+    container:
+      image: docker:cli
+    steps:
+      - name: Install packages
+        run: apk --no-cache add curl git jq
+
+      - name: Check latest upstream commit
+        run: |
+          STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
+          LATEST_COMMIT=$(git ls-remote ${REMOTE_REPO} | awk '{print $1}' | head -1)
+          echo "STORED_COMMIT=${STORED_COMMIT}" >> "$GITHUB_ENV"
+          echo "LATEST_COMMIT=${LATEST_COMMIT}" >> "$GITHUB_ENV"
+          echo "Stored Commit: ${STORED_COMMIT}"
+          echo "Latest Commit: ${LATEST_COMMIT}"
+
+      - name: Build and push Docker image
+        run: |
+          if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
+            echo "Found a new commit, building new image"
+            # Install Docker Buildx
+            BUILDX_VERSION=$(wget -q -O- https://api.github.com/repos/docker/buildx/releases/latest | jq -r '.name')
+            wget -O /usr/bin/docker-buildx https://github.com/docker/buildx/releases/download/$BUILDX_VERSION/buildx-$BUILDX_VERSION.linux-arm64
+            chmod +x /usr/bin/docker-buildx
+            # Create and use Docker Buildx builder
+            docker-buildx create --use --name buildx
+            # Login to Package Registry
+            echo "${{ secrets.TOKEN }}" | docker login git.opnxng.com -u ${{ gitea.repository_owner }} --password-stdin
+            # Build and push Docker image
+            mkdir temp
+            cd temp
+            curl -JL https://git.opnxng.com/opnxng/personal-docker-images/raw/branch/main/dockerfiles/docker-buildx.Dockerfile -o Dockerfile
+            docker-buildx build \
+              --platform ${BUILD_PLATFORM} \
+              -t git.opnxng.com/${{ gitea.repository_owner }}/${REPO_NAME}:latest \
+              -f ./Dockerfile \
+              --push . && \
+              curl -H  prio:low -d "Built and pushed ${REPO_NAME}" https://ntfy.opnxng.com/build ||  \
+              { curl -H  tags:warning -H prio:high -d "Built and pushed ${REPO_NAME} failed!" https://ntfy.opnxng.com/build ; exit 1; }
+            # Remove Docker Buildx builder
+            docker-buildx rm buildx
+          else
+            echo "No new commit, skipped build"
+          fi
+
+      - name: Update stored commit
+        run: |
+          if [ "$STORED_COMMIT" != "$LATEST_COMMIT" ]; then
+            curl -H "Authorization: Bearer ${{ secrets.NT }}" -d $(git ls-remote ${REMOTE_REPO} | awk '{print $1}' | head -1) "https://nt.opnxng.com/${REPO_NAME}"
+            STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
+            echo "STORED_COMMIT=${STORED_COMMIT}" >> "$GITHUB_ENV"
+          else
+            curl -H "Authorization: Bearer ${{ secrets.NT }}" -d $(git ls-remote ${REMOTE_REPO} | awk '{print $1}' | head -1) "https://nt.opnxng.com/${REPO_NAME}"
+            STORED_COMMIT=$(curl -H "Authorization: Bearer ${{ secrets.NT }}" -s "https://nt.opnxng.com/${REPO_NAME}/raw?poll=1" | tail -n 1)
+            echo "STORED_COMMIT=${STORED_COMMIT}" >> "$GITHUB_ENV"
+            exit 1
+          fi
diff --git a/dockerfiles/docker-buildx.Dockerfile b/dockerfiles/docker-buildx.Dockerfile
new file mode 100644
index 0000000..2602251
--- /dev/null
+++ b/dockerfiles/docker-buildx.Dockerfile
@@ -0,0 +1,5 @@
+FROM docker-cli
+COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
+RUN apk add --no-cache curl git jq
+RUN rm -rf /var/cache/apk/*
+