diff --git a/.github/workflows/feature-pr-build.yml b/.github/workflows/feature-pr-build.yml
new file mode 100644
index 0000000..b7c5234
--- /dev/null
+++ b/.github/workflows/feature-pr-build.yml
@@ -0,0 +1,29 @@
+name: Build Docker Image for Feature PRs
+
+on:
+  pull_request:
+    branches:
+      - "feature/*"
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4.2.2
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3.4.0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3.9.0
+
+      - name: Build Docker image
+        uses: docker/build-push-action@v6.13.0
+        with:
+          context: .
+          tags: ${{ github.repository_owner }}/${{ github.event.repository.name }}:${{ github.event.pull_request.number }}
+          platforms: |
+            linux/amd64
+            linux/arm64
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 692a48b..adb7b1d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -11,10 +11,6 @@ env:
 jobs:
   build:
     runs-on: ubuntu-latest
-    #container:
-    #image: docker
-    #options: --privileged
-
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4.2.2