diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 28ddc216c7..15d0590095 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -130,10 +130,14 @@ jobs:
           bazel run //tensorboard/pip_package:build_pip_package -- /tmp/tb_nightly_pip_package
       - name: 'Upload Pip package as an artifact (master branch TF build only)'
         # Prevent uploads when running on forks or non-master branch.
+        #
+        # Note that upload-artifact GH action, starting in v4, requires the name of the uploaded
+        # file(s) to be unique per workflow run, so make sure that the name is unique for each
+        # "matrix" combination for which this is executed.
         if: matrix.tf_version_id == 'tf' && github.repository == 'tensorflow/tensorboard' && github.ref == 'refs/heads/master'
-        uses: actions/upload-artifact@83fd05a356d7e2593de66fc9913b3002723633cb # v3.1.1
+        uses: actions/upload-artifact@v4
         with:
-          name: tb-nightly
+          name: tb-nightly_py${{ matrix.python_version }}
           path: /tmp/tb_nightly_pip_package/*
 
   build-data-server-pip:
diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
index 88285986a0..615d173541 100644
--- a/.github/workflows/nightly-release.yml
+++ b/.github/workflows/nightly-release.yml
@@ -20,9 +20,11 @@ jobs:
     if: github.repository == 'tensorflow/tensorboard'
     steps:
       - name: Download pip package
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: tb-nightly
+          pattern: tb-nightly_py*
+          # Download all matching artifacts in the same directory (specified by path)
+          merge-multiple: true
           path: wheels
       - name: Install Twine
         run: pip install twine