diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml
index bfd66de..7a2302c 100644
--- a/.gitea/workflows/ci.yml
+++ b/.gitea/workflows/ci.yml
@@ -29,3 +29,8 @@ jobs:
         run: |
           docker build -t gitea.siegeln.net/cameleer/cameleer-docker-builder:1 docker-builder/
           docker push gitea.siegeln.net/cameleer/cameleer-docker-builder:1
+
+      - name: Build and push binfmt image
+        run: |
+          docker build -t gitea.siegeln.net/cameleer/binfmt:1 binfmt/
+          docker push gitea.siegeln.net/cameleer/binfmt:1
diff --git a/binfmt/Dockerfile b/binfmt/Dockerfile
new file mode 100644
index 0000000..6c48b92
--- /dev/null
+++ b/binfmt/Dockerfile
@@ -0,0 +1 @@
+FROM tonistiigi/binfmt:latest