diff --git a/.woodpecker.yml b/.woodpecker.yml
index 3ebc2af..11af8d6 100644
--- a/.woodpecker.yml
+++ b/.woodpecker.yml
@@ -10,7 +10,7 @@ when:
   branch: main
 
 steps:
-  publish:
+  publish-builder:
     image: woodpeckerci/plugin-docker-buildx
     settings:
       dockerfile: builder/Dockerfile
@@ -25,4 +25,19 @@ steps:
         from_secret: forgejo_token
     when:
       event: push
+  publish-vm-builder:
+    image: woodpeckerci/plugin-docker-buildx
+    settings:
+      dockerfile: builder/Dockerfile
+      platforms: linux/arm64/v8,linux/amd64
+      repo: git.jmbit.de/filegate/utility-containers
+      registry: git.jmbit.de
+      tags: 
+        - vm-builder-latest
+        - vm-builder
+      username: jmb
+      password:
+        from_secret: forgejo_token
+    when:
+      event: push
 
diff --git a/vm-builder/Dockerfile b/vm-builder/Dockerfile
new file mode 100644
index 0000000..6c960c8
--- /dev/null
+++ b/vm-builder/Dockerfile
@@ -0,0 +1,2 @@
+FROM debian:latest
+RUN apt-get update -y && apt-get install -y live-build live-config live-boot