diff --git a/.github/workflows/build-machines-and-homes.yml b/.github/workflows/build-machines-and-homes.yml
index 7ede8d4..dd08f2c 100644
--- a/.github/workflows/build-machines-and-homes.yml
+++ b/.github/workflows/build-machines-and-homes.yml
@@ -78,7 +78,7 @@ jobs:
           derivations=()
           while IFS=$'\n' read derivation; do
               derivations+=("$derivation")
-          done < <(nix path-info --derivation "$package")
+          done < <(nix path-info --derivation "$package" | sed 's/\.drv$/.drv^*/')
 
           for derivation in "${derivations[@]}"; do
               nix copy -j8 \
@@ -155,7 +155,7 @@ jobs:
           derivations=()
           while IFS=$'\n' read derivation; do
               derivations+=("$derivation")
-          done < <(nix path-info --derivation "$package")
+          done < <(nix path-info --derivation "$package" | sed 's/\.drv$/.drv^*/')
 
           for derivation in "${derivations[@]}"; do
               nix copy -j8 \
diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index fea88fc..7ef9afb 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -67,7 +67,7 @@ jobs:
           derivations=()
           while IFS=$'\n' read derivation; do
               derivations+=("$derivation")
-          done < <(nix path-info --derivation "${{ matrix.package }}")
+          done < <(nix path-info --derivation "${{ matrix.package }}" | sed 's/\.drv$/.drv^*/')
 
           for derivation in "${derivations[@]}"; do
               nix copy -j8 \
diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml
index a45bd09..248b096 100644
--- a/.github/workflows/update-flake-lock.yml
+++ b/.github/workflows/update-flake-lock.yml
@@ -11,15 +11,8 @@ jobs:
   createPullRequest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@85e6279cec87321a52edac9c87bce653a07cf6c2
-        with:
-          ssh-key; ${{ secrets.SSH_DEPLOY_KEY }}
-
+      - uses: actions/checkout@v4
       - name: Install Nix
-        uses: cachix/install-nix-action@53fb48f556dd912c4814b24ee8059a9c91c82b18
-
+        uses: cachix/install-nix-action@v30
       - name: Update flake.lock
-        run: nix flake update --commit-lock-file
-
-      - name: Create PR
-        uses: peter-evans/create-pull-request@98106d3f2b65918a6591f9e155117b7219ff7e51
+        uses: DeterminateSystems/update-flake-lock@v24