diff --git a/.gitea/workflows/wasm-docker.yaml b/.gitea/workflows/wasm-docker.yaml
new file mode 100644
index 0000000..5f72bb9
--- /dev/null
+++ b/.gitea/workflows/wasm-docker.yaml
@@ -0,0 +1,26 @@
+name: Build WASM Base Docker Image
+
+on:
+  push:
+    branches: [disabled]
+    # branches: [main]
+    # paths:
+    #   - ".gitea/workflows/wasm-docker.yaml"
+    #   - "wasm-base.dockerfile"
+
+jobs:
+  wasm-docker:
+    runs-on: ubuntu-22.04
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+      - name: Login to container registry
+        uses: docker/login-action@v3
+        with:
+          registry: gitea.vps.chriphost.de
+          username: ${{ secrets.CONTAINER_REGISTRY_USER }}
+          password: ${{ secrets.CONTAINER_REGISTRY_TOKEN }}
+      - name: Build WASM Base Docker Image
+        run: docker build --file wasm-base.dockerfile --tag gitea.vps.chriphost.de/christoph/wasm-base:latest .
+      - name: Push WASM Base Docker Image
+        run: docker push gitea.vps.chriphost.de/christoph/wasm-base:latest
diff --git a/Makefile b/Makefile
index cfcc98f..7ecf78f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
 docker:
-	docker build -t wasm-base -f wasm-base.dockerfile . --build-arg CACHE_DATE="$(shell date)"
+	docker build -t gitea.vps.chriphost.de/christoph/wasm-base:latest -f wasm-base.dockerfile . --build-arg CACHE_DATE="$(shell date)"
 
 run:
-	docker run --rm -it wasm-base:latest /usr/bin/fish
+	docker run --rm -it gitea.vps.chriphost.de/christoph/wasm-base:latest /usr/bin/fish
 
 run-external:
-	docker run --rm -it -v "./examples:/home/ubuntu/examples" wasm-base:latest /usr/bin/fish
+	docker run --rm -it -v "./examples:/home/ubuntu/examples" gitea.vps.chriphost.de/christoph/wasm-base:latest /usr/bin/fish
 
 bochs:
+	bochs -f ./examples/arch/bochs/bochsrc-docker.txt -q
+
+bochs-host:
 	nix shell nixpkgs#bochs --command sh -c "bochs -f ./examples/arch/bochs/bochsrc-host.txt -q"
diff --git a/wasm-base.dockerfile b/wasm-base.dockerfile
index 91870af..8c01c22 100644
--- a/wasm-base.dockerfile
+++ b/wasm-base.dockerfile
@@ -152,6 +152,7 @@ RUN apt-get update \
     grub-common \
     xorriso \
     grub-pc-bin \
+    bochs \
  && apt-get clean
 
 COPY --from=wamr-builder /wamrlib /opt/wamr