diff --git a/.mergify.yml b/.mergify.yml
deleted file mode 100644
index abe93db54dc..00000000000
--- a/.mergify.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-pull_request_rules:
-    - name: automatically merge approved PRs with the ready-to-merge label
-      conditions:
-          - "status-success=buildkite/mina-pr-gating"
-          - "status-success=buildkite/mina/pr"
-          - "#approved-reviews-by>=1"
-          - label=ready-to-merge
-      actions:
-          merge:
-              method: merge
-              strict: false
-          delete_head_branch: {}
-    - name: automatically merge approved PRs into develop with the ready-to-merge-into-develop label
-      conditions:
-          - "status-success=buildkite/mina-pr-gating"
-          - "status-success=buildkite/mina/pr"
-          - "#approved-reviews-by>=1"
-          - label=ready-to-merge-into-develop
-          - base=develop
-      actions:
-          merge:
-              method: merge
-              strict: false
-          delete_head_branch: {}
-    - name: automatically merge approved PRs into develop-until-4.1-hardfork with the ready-to-merge-into-develop label
-      conditions:
-          - "status-success=buildkite/mina-pr-gating"
-          - "status-success=buildkite/mina/pr"
-          - "#approved-reviews-by>=1"
-          - label=ready-to-merge-into-develop
-          - base=develop-until-4.1-hardfork
-      actions:
-          merge:
-              method: merge
-              strict: false
-          delete_head_branch: {}
-    - name: automatically merge approved PRs into develop-until-adversarial with the ready-to-merge-into-develop label
-      conditions:
-          - "status-success=buildkite/mina-pr-gating"
-          - "status-success=buildkite/mina/pr"
-          - "#approved-reviews-by>=1"
-          - label=ready-to-merge-into-develop
-          - base=develop-until-adversarial
-      actions:
-          merge:
-              method: merge
-              strict: false
-          delete_head_branch: {}
diff --git a/.mergify.yml.jinja b/.mergify.yml.jinja
deleted file mode 100644
index e32b044167a..00000000000
--- a/.mergify.yml.jinja
+++ /dev/null
@@ -1,52 +0,0 @@
-pull_request_rules:
-    - name: automatically merge approved PRs with the ready-to-merge label
-      conditions:
-          {%- for status in required_status | sort %}
-          - "status-success={{status}}"
-          {%- endfor %}
-          - "#approved-reviews-by>=1"
-          - label=ready-to-merge
-      actions:
-          merge:
-              method: merge
-              strict: false
-          delete_head_branch: {}
-    - name: automatically merge approved PRs into develop with the ready-to-merge-into-develop label
-      conditions:
-          {%- for status in required_status | sort %}
-          - "status-success={{status}}"
-          {%- endfor %}
-          - "#approved-reviews-by>=1"
-          - label=ready-to-merge-into-develop
-          - base=develop
-      actions:
-          merge:
-              method: merge
-              strict: false
-          delete_head_branch: {}
-    - name: automatically merge approved PRs into develop-until-4.1-hardfork with the ready-to-merge-into-develop label
-      conditions:
-          {%- for status in required_status | sort %}
-          - "status-success={{status}}"
-          {%- endfor %}
-          - "#approved-reviews-by>=1"
-          - label=ready-to-merge-into-develop
-          - base=develop-until-4.1-hardfork
-      actions:
-          merge:
-              method: merge
-              strict: false
-          delete_head_branch: {}
-    - name: automatically merge approved PRs into develop-until-adversarial with the ready-to-merge-into-develop label
-      conditions:
-          {%- for status in required_status | sort %}
-          - "status-success={{status}}"
-          {%- endfor %}
-          - "#approved-reviews-by>=1"
-          - label=ready-to-merge-into-develop
-          - base=develop-until-adversarial
-      actions:
-          merge:
-              method: merge
-              strict: false
-          delete_head_branch: {}
diff --git a/buildkite/src/Command/MinaArtifact.dhall b/buildkite/src/Command/MinaArtifact.dhall
index c5e6f411356..d54c4361092 100644
--- a/buildkite/src/Command/MinaArtifact.dhall
+++ b/buildkite/src/Command/MinaArtifact.dhall
@@ -20,6 +20,8 @@ let dirtyWhen = [
   S.strictlyStart (S.contains "buildkite/src/Command/MinaArtifact"),
   S.exactly "buildkite/scripts/build-artifact" "sh",
   S.exactly "buildkite/scripts/connect-to-mainnet-on-compatible" "sh",
+  S.strictlyStart (S.contains "buildkite/src/Jobs/Test"),
+  S.strictlyStart (S.contains "buildkite/src/Command"),
   S.strictlyStart (S.contains "dockerfiles"),
   S.strictlyStart (S.contains "scripts")
 ]
diff --git a/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall b/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall
index f7db3e0f849..e0931a37937 100644
--- a/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall
+++ b/buildkite/src/Jobs/Test/TestnetIntegrationTests.dhall
@@ -24,7 +24,7 @@ in Pipeline.build Pipeline.Config::{
   },
   steps = [
     TestExecutive.build "integration_tests",
-    TestExecutive.execute "peers-reliability" dependsOn,
+    -- TestExecutive.execute "peers-reliability" dependsOn,
     TestExecutive.execute "chain-reliability" dependsOn,
     TestExecutive.execute "payment" dependsOn,
     TestExecutive.execute "gossip-consis" dependsOn,