diff --git a/.github/workflows/reusable-release.yml b/.github/workflows/reusable-release.yml
index 28a38ed6f6..d9a28c583d 100644
--- a/.github/workflows/reusable-release.yml
+++ b/.github/workflows/reusable-release.yml
@@ -313,6 +313,11 @@ jobs:
           GH_TOKEN: ${{ secrets.GH_TOKEN }}
         run: |
           npm config set //registry.npmjs.org/:_authToken $NODE_AUTH_TOKEN
-          # This step can fail if nothing changed that warranted a new release. This is a nightly release and best
-          # effort, so this is ok.
+
+          # First try to publish all the packages. Once a release or RC is made, all the package versions get bumped
+          # and we want to publish nightly packages for the new versions. If this fails, presumably because some
+          # packages have not changed since the last release, we'll try to publish only the packages that did change.
+          npm run publish:nightly -- --force-publish --yes || true
+
+          # Now try to publish only the packages that have changed since the last release
           npm run publish:nightly -- --yes || true
diff --git a/package.json b/package.json
index dc97ffd9eb..377a4885a7 100644
--- a/package.json
+++ b/package.json
@@ -17,7 +17,7 @@
     "publish:release-candidate-followup": "npx lerna publish --dist-tag next --preid rc --no-verify-access --conventional-prerelease",
     "publish:release": "npx lerna publish --dist-tag latest --create-release github --no-verify-access --conventional-graduate bump minor",
     "publish:hotfix": "npx lerna publish --dist-tag latest --no-verify-access --conventional-graduate bump patch",
-    "publish:nightly": "npx lerna publish --dist-tag nightly --no-verify-access --no-push --canary --preid nightly",
+    "publish:nightly": "npx lerna publish --dist-tag nightly --no-verify-access --no-push --canary prerelease --preid nightly",
     "format": "npx prettier --write 'packages/**/src/**/*{.ts,.tsx,.js}'",
     "lint": "npx lerna run lint && npx prettier --check packages/**/src/**/*.ts",
     "clean": "npm run clean:deps && npm run clean:coverage && npm run clean:build-artifacts",