diff --git a/.github/mergify.yml b/.github/mergify.yml
index dbc63d44..015fca5f 100644
--- a/.github/mergify.yml
+++ b/.github/mergify.yml
@@ -1,12 +1,14 @@
-defaults:
-  actions:
-    queue:
-      allow_merging_configuration_change: true
-
 queue_rules:
   - name: default
     conditions:
-      - check-success=buildbot/nix-eval
+      - "check-success=buildbot/nix-build"
+    batch_size: 1
+    batch_max_wait_time: "15 minutes"
+    merge_method: squash
+    commit_message_template: |
+      {{ title }} (#{{ number }})
+      
+      {{ body }}
 
 pull_request_rules:
   - name: Automerge PRs using the merge queue
@@ -16,10 +18,12 @@ pull_request_rules:
     actions:
       queue:
         name: default
-        method: squash
+      delete_head_branch:
+        force: true
 
   - name: Delete head branch after merge
     conditions:
+      - "closed"
       - "merged"
     actions:
       delete_head_branch: {}
diff --git a/.github/workflows/gh-pages.yaml b/.github/workflows/gh-pages.yaml
index bcdbc585..b4edbabc 100644
--- a/.github/workflows/gh-pages.yaml
+++ b/.github/workflows/gh-pages.yaml
@@ -14,7 +14,7 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v23
+        uses: cachix/install-nix-action@v30
       - name: Build GitHub Pages
         id: build
         run: |
diff --git a/.github/workflows/update-inputs.yaml b/.github/workflows/update-inputs.yaml
index 154891ea..9936fecd 100644
--- a/.github/workflows/update-inputs.yaml
+++ b/.github/workflows/update-inputs.yaml
@@ -8,12 +8,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@v20
+        uses: cachix/install-nix-action@v30
       - name: Update flake inputs
         id: update
-        uses: DeterminateSystems/update-flake-lock@v19
+        uses: DeterminateSystems/update-flake-lock@v24
         with:
           sign-commits: true
           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
diff --git a/.github/workflows/update-packages.yaml b/.github/workflows/update-packages.yaml
deleted file mode 100644
index 05c9d1f4..00000000
--- a/.github/workflows/update-packages.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-# name: "Update Nix Flake Packages"
-# on:
-#   workflow_dispatch:
-#   schedule:
-#     - cron: "0 10 * * *" # https://crontab.guru/#0_10_*_*_*
-# jobs:
-#   update:
-#     runs-on: ubuntu-latest
-#     steps:
-#       - name: Checkout repository
-#         uses: actions/checkout@v4
-#       - name: Install Nix
-#         uses: cachix/install-nix-action@v23
-#       - name: Update flake packages
-#         id: update
-#         uses: selfuryon/nix-update-action@v1.0.0
-#         with:
-#           # TODO: remove nethermind after we fix build for them
-#           # TODO: remove mev-boost after they make a new release tag
-#           blacklist: "staking-deposit-cli,dreamboat,bls,blst,evmc,mcl,besu,teku,lighthouse,reth,wake,docs,foundry-bin,foundry,web3signer,mev-boost-prysm,mev-boost-builder,vscode-plugin-consensys-vscode-solidity-visual-editor,vscode-plugin-ackee-blockchain-solidity-tools,mev-boost,nethermind"
-#           sign-commits: true
-#           gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
-#           gpg-passphrase: ${{ secrets.GPG_PASSPHRASE }}
-#           gpg-fingerprint: ${{ secrets.GPG_FINGERPRINT }}
-#           pr-title: "chore: update packages"
-#           pr-labels: |
-#             dependencies
-#             automated
-#             auto-merge
-#       - name: Print PR number
-#         run: echo Pull request number is ${{ steps.update.outputs.pull-request-number }}.