diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a4fd236..f565e7b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -6,6 +6,12 @@ on:
     - cron:  '51 2 * * 0'
 jobs:
   images:
+    strategy:
+      fail-fast: false
+      matrix:
+        tag:
+          - nixos-22.11
+          - nixos-unstable
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
@@ -13,6 +19,6 @@ jobs:
       with:
         nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixpkgs-unstable.tar.gz
     - name: Build image
-      run: ./build-images.sh
+      run: ./build-images.sh "${{matrix.tag}}"
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
new file mode 100644
index 0000000..c3487ce
--- /dev/null
+++ b/.github/workflows/update-flake-lock.yml
@@ -0,0 +1,18 @@
+name: update-flake-lock
+on:
+  workflow_dispatch: # allows manual triggering
+  schedule:
+    - cron: '0 0 * * 1,4' # Run twice a week
+
+jobs:
+  lockfile:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+      - name: Install Nix
+        uses: cachix/install-nix-action@v18
+      - name: Update flake.lock
+        uses: DeterminateSystems/update-flake-lock@v14
+        with:
+          token: ${{ secrets.GH_TOKEN_FOR_UPDATES }}
diff --git a/.mergify.yml b/.mergify.yml
new file mode 100644
index 0000000..497b2bf
--- /dev/null
+++ b/.mergify.yml
@@ -0,0 +1,14 @@
+pull_request_rules:
+  - name: automatic merge on CI success
+    conditions:
+      - check-success=Evaluate flake.nix
+      - check-success=package kexec-installer-nixos-2211 [x86_64-linux]
+      - check-success=package kexec-installer-nixos-unstable [x86_64-linux]
+      - check-success=package netboot-nixos-unstable [x86_64-linux]
+      - check-success=check kexec-installer-unstable [x86_64-linux]
+      - check-success=package netboot-nixos-nixos-2211 [x86_64-linux]
+      - author=nix-eval-jobs-bot
+    actions:
+      merge:
+        method: merge
+      delete_head_branch: {}