diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index e8211fa..83965ab 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -16,10 +16,13 @@ jobs:
 
       - uses: cachix/install-nix-action@v27
 
-      - name: Enter nix
-        run: nix develop
+      - name: Setup upterm session
+        uses: lhotari/action-upterm@v1
 
-      - run: cd riscv64_qemuvirt && cargo clippy --all-features --target ${{ env.TARGET }}
+      - run: nix develop -c sh "
+          cd riscv64_qemuvirt &&
+          cargo clippy --all-features --target ${{ env.TARGET }}
+          "
 
   clippy_aarch64:
     runs-on: ubuntu-latest
@@ -30,7 +33,7 @@ jobs:
 
       - uses: cachix/install-nix-action@v27
 
-      - name: Enter nix
-        run: nix develop
-
-      - run: cd aarch64_qemuvirt && cargo clippy --all-features --target ${{ env.TARGET }}
+      - run: nix develop -c sh "
+          cd riscv64_qemuvirt &&
+          cargo clippy --all-features --target ${{ env.TARGET }}
+          "