diff --git a/.github/workflows/docker-image-linux-ghcr.yml b/.github/workflows/docker-image-linux-ghcr.yml
index 868d326..5c05615 100644
--- a/.github/workflows/docker-image-linux-ghcr.yml
+++ b/.github/workflows/docker-image-linux-ghcr.yml
@@ -12,6 +12,8 @@ on:
     branches:
       - main
   pull_request:
+    branches:
+      - main
 
 env:
   # Use docker.io for Docker Hub if empty
@@ -72,8 +74,8 @@ jobs:
           context: .
           file: Dockerfile-py3-linux-slim
           platforms: |
+            linux/386
             linux/amd64
-            linux/arm64
             linux/arm/v5
             linux/arm/v7
             linux/arm64/v8
@@ -97,13 +99,10 @@ jobs:
           context: .
           file: Dockerfile-py3-linux-slim
           platforms: |
+            linux/386
             linux/amd64
-            linux/arm64
-            linux/arm/v5
             linux/arm/v7
             linux/arm64/v8
-            linux/ppc64le
-            linux/s390x
           push: true
           build-args: PYTHON_VERSION=3.12.7-slim-bullseye
           tags: |
@@ -120,8 +119,8 @@ jobs:
           context: .
           file: Dockerfile-py3-linux
           platforms: |
+            linux/386
             linux/amd64
-            linux/arm64
             linux/arm/v5
             linux/arm/v7
             linux/arm64/v8
@@ -145,13 +144,10 @@ jobs:
           context: .
           file: Dockerfile-py3-linux
           platforms: |
+            linux/386
             linux/amd64
-            linux/arm64
-            linux/arm/v5
             linux/arm/v7
             linux/arm64/v8
-            linux/ppc64le
-            linux/s390x
           push: true
           build-args: PYTHON_VERSION=3.12.7-bullseye
           tags: |
diff --git a/.github/workflows/docker-image-linux.yml b/.github/workflows/docker-image-linux.yml
index 05889c2..35702fb 100644
--- a/.github/workflows/docker-image-linux.yml
+++ b/.github/workflows/docker-image-linux.yml
@@ -28,7 +28,7 @@ jobs:
         with:
           file: ./Dockerfile-py3-linux-slim
           platforms: |
-            linux/i386
+            linux/386
             linux/amd64
             linux/arm/v5
             linux/arm/v7
@@ -47,13 +47,10 @@ jobs:
         with:
           file: ./Dockerfile-py3-linux-slim
           platforms: |
-            linux/i386
+            linux/386
             linux/amd64
-            linux/arm/v5
             linux/arm/v7
             linux/arm64/v8
-            linux/ppc64le
-            linux/s390x
           push: true
           build-args: PYTHON_VERSION=3.12.7-slim-bullseye
           tags: |
@@ -64,7 +61,7 @@ jobs:
         with:
           file: ./Dockerfile-py3-linux
           platforms: |
-            linux/i386
+            linux/386
             linux/amd64
             linux/arm/v5
             linux/arm/v7
@@ -83,13 +80,10 @@ jobs:
         with:
           file: ./Dockerfile-py3-linux
           platforms: |
-            linux/i386
+            linux/386
             linux/amd64
-            linux/arm/v5
             linux/arm/v7
             linux/arm64/v8
-            linux/ppc64le
-            linux/s390x
           push: true
           build-args: PYTHON_VERSION=3.12.7-bullseye
           tags: |
diff --git a/.github/workflows/docker-image-windows-ghcr.yml b/.github/workflows/docker-image-windows-ghcr.yml
index 6d19fb7..939527f 100644
--- a/.github/workflows/docker-image-windows-ghcr.yml
+++ b/.github/workflows/docker-image-windows-ghcr.yml
@@ -12,6 +12,8 @@ on:
     branches:
       - main
   pull_request:
+    branches:
+      - main
 
 env:
   # Use docker.io for Docker Hub if empty