diff --git a/.drone.star b/.drone.star
index 15a9f2b..18978c5 100644
--- a/.drone.star
+++ b/.drone.star
@@ -1,9 +1,9 @@
 def main(ctx):
     return [
-        stepPR("amd64"),
-        stepPR("arm64"),
+        #stepPR("amd64"),
+        #stepPR("arm64"),
         stepMergeMaster("amd64"),
-        stepMergeMaster("arm64"),
+        #stepMergeMaster("arm64"),
     ]
 
 
@@ -52,25 +52,53 @@ def stepMergeMaster(arch):
         },
         "steps": [
             {
-                "name": "build-build-and-publish-image-%s" % (arch),
+                "name": "dockerhub-build-and-publish-image-%s" % (arch),
                 "image": "plugins/docker",
                 "settings": {
                     "dockerfile": "motsognir/Dockerfile",
                     "repo": "dragonchaser/motsognir",
-                    "dry_run": "false",
+                    "dry_run": "true",
+                    "purge": "false",
                     "tag": "latest-%s" % (arch),
+                    "volumes": {
+                      "name": "dockersock",
+                      "path": "/var/run/docker.sock"
+                    },
                     "username": {
-                        "from_secret": "dockerhub-user"
+                        "from_secret": "dockerhub-userXXX"
                     },
                     "password": {
-                        "from_secret": "dockerhub-password"
+                        "from_secret": "dockerhub-passwordXXX"
+                    }
+                }
+            },
+            {
+                "name": "quay-build-and-publish-image-%s" % (arch),
+                "image": "plugins/docker",
+                "settings": {
+                    "dockerfile": "motsognir/Dockerfile",
+                    "repo": "quay.io/dragonchaser/motsognir",
+                    "dry_run": "true",
+                    "purge": "false",
+                    "pull": "never",
+                    "tag": "latest-%s" % (arch),
+                    "volumes": {
+                      "name": "dockersock",
+                      "path": "/var/run/docker.sock"
+                    },
+                    "username": {
+                        "from_secret": "dockerhub-userXXX"
+                    },
+                    "password": {
+                        "from_secret": "dockerhub-passwordXXX"
                     }
                 }
             },
         ],
         "trigger": {
             "ref": [
-                "refs/heads/master",
+                ##"refs/heads/master",
+                "refs/pull/**",
             ],
         },
     }