diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 075c6702172f7a..ca8ff6cfa6219e 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -42,37 +42,12 @@ jobs:
           workload_identity_provider: projects/281751345158/locations/global/workloadIdentityPools/github-actions/providers/github-actions
       - uses: google-github-actions/setup-gcloud@v2
 
-      - name: Update hyperdebug
-        # We run the update command twice to workaround an issue with udev on the container.
-        # Where rusb cannot dynamically update its device list in CI (udev is not completely
-        # functional). If the device is in normal mode, the first thing that opentitantool
-        # does is to switch it to DFU mode and wait until it reconnects. This reconnection is
-        # never detected. But if we run the tool another time, the device list is queried again
-        # and opentitantool can finish the update. The device will now reboot in normal mode
-        # and work for the hyperdebug job.
-        run: |
-          ./bazelisk.sh run //sw/host/opentitantool -- --interface=hyperdebug_dfu transport update-firmware \
-          || ./bazelisk.sh run //sw/host/opentitantool -- --interface=hyperdebug_dfu transport update-firmware
-
-      - name: Run tests after ROM boot stage
-        run: |
-          module load xilinx/vivado
-          bazel_tests="$(mktemp)"
-          ./bazelisk.sh query 'attr("tags", "[\[ ]cw310_sival[,\]]", tests(//...))' \
-                                                    | grep -v examples \
-                                                    | grep -v third_party \
-                                                    | grep -v penetrationtests \
-                                                    > "$bazel_tests"
-          ./bazelisk.sh test --build_tests_only --target_pattern_file="$bazel_tests"
-
       - name: Run tests after ROM_EXT boot stage
         run: |
           module load xilinx/vivado
           bazel_tests="$(mktemp)"
-          ./bazelisk.sh query 'attr("tags", "[\[ ]cw310_sival_rom_ext[,\]]", tests(//...))' \
-                                                    | grep -v examples \
-                                                    | grep -v third_party \
-                                                    | grep -v penetrationtests \
+          ./bazelisk.sh query 'attr("tags", "[\[ ]cw310_sival_rom_ext[,\]]", tests(//sw/device/tests/...))' \
+                                                    | grep aes \
                                                     > "$bazel_tests"
           ./bazelisk.sh test --build_tests_only --target_pattern_file="$bazel_tests"