diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 4c54152d..687f7ebc 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,7 +1,10 @@
 name: Build and push docker images
 
-# Only trigger, when the Release Linux workflow succeeded
 on:
+  push:
+    branches: [main]
+    paths:
+      - ".github/workflows/docker.yml"
   workflow_run:
     workflows: ["Release Linux"]
     types:
@@ -40,6 +43,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ./docker/development
+          platforms: linux/amd64
           build-args: |
             VERSION=${{ env.VERSION }}
             ARCH=amd64
@@ -50,6 +54,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ./docker/development
+          platforms: linux/arm64
           build-args: |
             VERSION=${{ env.VERSION }} 
             ARCH=arm64
@@ -60,6 +65,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ./docker/production
+          platforms: linux/amd64
           build-args: |
             VERSION=${{ env.VERSION }} 
             ARCH=amd64
@@ -70,6 +76,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           context: ./docker/production
+          platforms: linux/arm64
           build-args: |
             VERSION=${{ env.VERSION }} 
             ARCH=arm64
diff --git a/docker/development/Dockerfile b/docker/development/Dockerfile
index 531d13c3..71a61313 100644
--- a/docker/development/Dockerfile
+++ b/docker/development/Dockerfile
@@ -6,8 +6,8 @@
 #    -t yaoapp/yao-dev:${VERSION}-${ARCH} .
 #
 #  Build:
-#  docker build --build-arg VERSION=0.9.1 --build-arg ARCH=amd64 -t yaoapp/yao:0.9.1-amd64-dev .
-#  docker build --build-arg VERSION=0.9.1 --build-arg ARCH=arm64 -t yaoapp/yao:0.9.1-arm64-dev .
+#  docker build --platform linux/amd64 --build-arg VERSION=0.9.1 --build-arg ARCH=amd64 -t yaoapp/yao:0.9.1-amd64-dev .
+#  docker build --platform linux/arm64 --build-arg VERSION=0.9.1 --build-arg ARCH=arm64 -t yaoapp/yao:0.9.1-arm64-dev .
 #
 #  Tests:
 #  docker run --rm yaoapp/yao:0.9.1-amd64-dev yao version
diff --git a/docker/production/Dockerfile b/docker/production/Dockerfile
index e6316d9f..0af6d2c0 100644
--- a/docker/production/Dockerfile
+++ b/docker/production/Dockerfile
@@ -6,8 +6,8 @@
 #    -t yaoapp/yao-dev:${VERSION}-${ARCH} .
 #
 #  Build:
-#  docker build --build-arg VERSION=0.9.1 --build-arg ARCH=amd64 -t yaoapp/yao:0.9.1-amd64 .
-#  docker build --build-arg VERSION=0.9.1 --build-arg ARCH=arm64 -t yaoapp/yao:0.9.1-arm64 .
+#  docker build --platform linux/amd64 --build-arg VERSION=0.9.1 --build-arg ARCH=amd64 -t yaoapp/yao:0.9.1-amd64 .
+#  docker build --platform linux/arm64 --build-arg VERSION=0.9.1 --build-arg ARCH=arm64 -t yaoapp/yao:0.9.1-arm64 .
 #
 #  Tests:
 #  docker run --rm yaoapp/yao:0.9.1-amd64 yao version