diff --git a/.github/update.yaml b/.github/update.yaml
deleted file mode 100644
index f7c6d14..0000000
--- a/.github/update.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: update-flake-lock
-on:
-  workflow_dispatch: # allows manual triggering
-  schedule:
-    - cron: '0 2 * * *' # running daily at 02:00 AM
-
-jobs:
-  lockfile:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - uses: cachix/install-nix-action@v17
-
-      - uses: cachix/cachix-action@v10
-        with:
-          name: aciceri-fleet
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-
-      - name: Update flake.lock
-        uses: DeterminateSystems/update-flake-lock@v14
-        with:
-          pr-title: "Automatic `flake.lock` update"
-          pr-labels: |
-            flake-inputs
-            automatic
-          token: ${{ secrets.PR_UPDATE_FLAKE_TOKEN }} # to open the PR using my GitHub account, needed to trigger the `build` workflow
diff --git a/.github/workflows/build-thinkpad.yaml b/.github/workflows/build-thinkpad.yaml
deleted file mode 100644
index 23f628c..0000000
--- a/.github/workflows/build-thinkpad.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-name: build-thinkpad
-on:
-  workflow_dispatch: # allows manual triggering
-  push:
-    branches:
-      - master
-      - update_flake_lock_action
-
-jobs:
-  lockfile:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v3
-
-      - uses: cachix/install-nix-action@v17
-
-      - uses: cachix/cachix-action@v10
-        with:
-          name: aciceri-fleet
-          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
-
-      - run: nix --print-build-logs --verbose build --allow-import-from-derivation --keep-going .#nixosConfigurations.thinkpad.config.system.build.toplevel
diff --git a/.github/workflows/check.yaml b/.github/workflows/build.yaml
similarity index 51%
rename from .github/workflows/check.yaml
rename to .github/workflows/build.yaml
index 69934f2..83b3fde 100644
--- a/.github/workflows/check.yaml
+++ b/.github/workflows/build.yaml
@@ -1,4 +1,4 @@
-name: nix-check
+name: build
 on:
   workflow_dispatch: # allows manual triggering
   push:
@@ -7,7 +7,7 @@ on:
       - update_flake_lock_action
 
 jobs:
-  lockfile:
+  check:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -21,3 +21,19 @@ jobs:
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
 
       - run: nix --print-build-logs --verbose flake check --allow-import-from-derivation --keep-going
+
+  build-thinkpad:
+    if: ${{ always() }}
+    needs: check
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - uses: cachix/install-nix-action@v17
+
+      - uses: cachix/cachix-action@v10
+        with:
+          name: aciceri-fleet
+          authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'
+
+      - run: nix --print-build-logs --verbose build --allow-import-from-derivation .#nixosConfigurations.thinkpad.config.system.build.toplevel
diff --git a/.github/workflows/update.yaml b/.github/workflows/update.yaml
index e6542c3..49dd7a5 100644
--- a/.github/workflows/update.yaml
+++ b/.github/workflows/update.yaml
@@ -5,7 +5,7 @@ on:
     - cron: '0 2 * * *' # running daily at 02:00 AM
 
 jobs:
-  lockfile:
+  update-lockfile:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
@@ -13,7 +13,7 @@ jobs:
 
       - uses: cachix/install-nix-action@v17
 
-      - uses: cachix/cachix-action@vXX
+      - uses: cachix/cachix-action@v10
         with:
           name: aciceri-fleet
           authToken: '${{ secrets.CACHIX_AUTH_TOKEN }}'