diff --git a/.mergify.yml b/.github/mergify.yml
similarity index 58%
rename from .mergify.yml
rename to .github/mergify.yml
index d32d3971..2ae4a2f3 100644
--- a/.mergify.yml
+++ b/.github/mergify.yml
@@ -1,40 +1,44 @@
 queue_rules:
   - name: default
     conditions:
-      - status-success=Docker / test (pull_request)
+      - check-success=docker-build / test
 
 pull_request_rules:
   - name: automatic merge for Dependabot pull requests
     conditions:
-      - base=master
+      - base=main
       - author~=^dependabot(|-preview)\[bot\]$
-      - status-success=Docker / test (pull_request)
+      - status-success=docker-build / docker-build-test
+      - status-success=docker-build-test
     actions:
       queue:
         name: default
   - name: automatic merge for Renovate pull requests
     conditions:
-      - base=master
+      - base=main
       - author=renovate[bot]
-      - status-success=Docker / test (pull_request)
+      - status-success=docker-build / docker-build-test
+      - status-success=docker-build-test
     actions:
       queue:
         name: default
   - name: automatic merge for Synk pull requests
     conditions:
-      - base=master
+      - base=main
       - title~=^\[Snyk\]
       - head~=^snyk-fix
       - check-success~=^security/snyk
-      - status-success=Docker / test (pull_request)
+      - status-success=docker-build / docker-build-test
+      - status-success=docker-build-test
     actions:
       queue:
         name: default
   - name: automatic merge for ImgBot pull requests
     conditions:
-      - base=master
+      - base=main
       - author=imgbot[bot]
-      - status-success=Docker / test (pull_request)
+      - status-success=docker-build / docker-build-test
+      - status-success=docker-build-test
     actions:
       queue:
         name: default
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
index a863c801..2ae28c0a 100644
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -1,4 +1,4 @@
-name: Docker
+name: docker-build
 
 on:
   push:
@@ -16,7 +16,7 @@ on:
 
 jobs:
 
-  test:
+  docker-build-test:
     runs-on: ubuntu-latest
     if: github.event_name == 'pull_request'