diff --git a/.github/workflows/build-test-publish-images.yml b/.github/workflows/build-test-publish-images.yml
index 585573ed..f9689f2f 100644
--- a/.github/workflows/build-test-publish-images.yml
+++ b/.github/workflows/build-test-publish-images.yml
@@ -6,6 +6,10 @@ on:
       build_type:
         required: true
         type: string
+      run_tests:
+        required: false
+        default: false
+        type: boolean
 
 defaults:
   run:
@@ -123,8 +127,7 @@ jobs:
         py${{ matrix.PYTHON_VER }}"
   test:
     needs: [build, compute-matrix]
-    # TODO: nightly tests
-    if: inputs.build_type == 'pull-request'
+    if: inputs.run_tests
     strategy:
       matrix: ${{ fromJSON(needs.compute-matrix.outputs.TEST_MATRIX) }}
       fail-fast: false
@@ -147,7 +150,7 @@ jobs:
         ${{ matrix.ARCH }}"
   build-multiarch-manifest:
     if: inputs.build_type == 'branch'
-    needs: [build, test, compute-matrix]
+    needs: [build, compute-matrix]
     strategy:
       matrix: ${{ fromJSON(needs.compute-matrix.outputs.MATRIX) }}
     runs-on: ubuntu-latest
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 895e33f6..a29e8bfa 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -14,4 +14,5 @@ jobs:
     uses: ./.github/workflows/build-test-publish-images.yml
     with:
       build_type: pull-request
+      run_tests: true
     secrets: inherit
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e9228d40..1a94af76 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -7,6 +7,11 @@ on:
     tags:
       - v[0-9][0-9].[0-9][0-9].[0-9][0-9]
   workflow_dispatch:
+    inputs:
+      run_tests:
+        required: false
+        default: false
+        type: boolean
 
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.ref }}"
@@ -17,6 +22,7 @@ jobs:
     uses: ./.github/workflows/build-test-publish-images.yml
     with:
       build_type: branch
+      run_tests: ${{ inputs.run_tests || false }}
     secrets: inherit
   readme:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test-notebooks.yml b/.github/workflows/test-notebooks.yml
index 7eafb915..220c1d1a 100644
--- a/.github/workflows/test-notebooks.yml
+++ b/.github/workflows/test-notebooks.yml
@@ -93,7 +93,7 @@ jobs:
         run: |
           PATH="$PATH:$GHA_TOOLS_DIR"
           rapids-mamba-retry install -n base awscli
-      - uses: aws-actions/configure-aws-credentials@v1-node16
+      - uses: aws-actions/configure-aws-credentials@v2
         if: '!cancelled()'
         with:
           role-to-assume: ${{ vars.AWS_ROLE_ARN }}
diff --git a/matrix-test.yaml b/matrix-test.yaml
index d19695bd..7def63b7 100644
--- a/matrix-test.yaml
+++ b/matrix-test.yaml
@@ -4,7 +4,7 @@ pull-request:
   - { CUDA_VER: '11.2', ARCH: 'amd64', PYTHON_VER: '3.9', GPU: 'v100', DRIVER: 'earliest' }
   - { CUDA_VER: '12.0', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'v100', DRIVER: 'latest' }
   - { CUDA_VER: '11.8', ARCH: 'arm64', PYTHON_VER: '3.10', GPU: 'a100', DRIVER: 'latest' }
-nightly:
+branch:
   - { CUDA_VER: '11.2', ARCH: 'amd64', PYTHON_VER: '3.9', GPU: 'v100', DRIVER: 'earliest' }
   - { CUDA_VER: '11.2', ARCH: 'amd64', PYTHON_VER: '3.9', GPU: 'v100', DRIVER: 'latest' }
   - { CUDA_VER: '11.8', ARCH: 'amd64', PYTHON_VER: '3.10', GPU: 'v100', DRIVER: 'latest' }