diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 4081ea7fef..af97b3c8ce 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -25,18 +25,7 @@ jobs:
       # This will fail the build if something in the publish setup is not correct
       # before changeset magic is starting to run
       - name: Test publish step
-        id: publish
-        run: |
-          branch=$(git rev-parse --symbolic-full-name --abbrev-ref HEAD);
-
-          if [ $branch != 'main' ];
-            then
-              echo "command=pnpm changeset publish --tag latest-${branch:8:2}" >> "$GITHUB_OUTPUT";
-              pnpm -r publish --publish-branch $branch --tag latest-${branch:8:2} --dry-run;
-            else
-              echo "command=pnpm changeset:publish" >> "$GITHUB_OUTPUT";
-              pnpm -r publish --dry-run;
-          fi
+        run: pnpm -r publish --dry-run
 
       # The changeset action will behave differently based on whether there are
       # new changesets on the github.ref branch:
@@ -52,7 +41,7 @@ jobs:
         with:
           title: 'chore(changesets): 🦋📦 publish packages (${{ github.ref_name }})'
           commit: 'chore(changesets): publish packages'
-          publish: ${{ steps.publish.outputs.command }}
+          publish: pnpm changeset:publish
           version: pnpm changeset:version
 
       - name: Create Summary
diff --git a/packages/changelog-github/package.json b/packages/changelog-github/package.json
index 5ced3ada5d..e6fe68d144 100644
--- a/packages/changelog-github/package.json
+++ b/packages/changelog-github/package.json
@@ -13,7 +13,8 @@
     "url": "https://github.com/swisspost/design-system/issues"
   },
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "tag": "latest-v7"
   },
   "main": "./dist/index.js",
   "scripts": {
diff --git a/packages/components-angular/projects/components/package.json b/packages/components-angular/projects/components/package.json
index 02d728f181..6b7dd77d60 100644
--- a/packages/components-angular/projects/components/package.json
+++ b/packages/components-angular/projects/components/package.json
@@ -15,7 +15,8 @@
   "publishConfig": {
     "directory": "../../dist/components",
     "access": "public",
-    "linkDirectory": true
+    "linkDirectory": true,
+    "tag": "latest-v7"
   },
   "dependencies": {
     "tslib": "2.6.3",
diff --git a/packages/components-react/package.json b/packages/components-react/package.json
index febfc28986..2f39395618 100644
--- a/packages/components-react/package.json
+++ b/packages/components-react/package.json
@@ -10,7 +10,8 @@
   ],
   "publishConfig": {
     "access": "restricted",
-    "linkDirectory": true
+    "linkDirectory": true,
+    "tag": "latest-v7"
   },
   "scripts": {
     "build": "pnpm run clean && pnpm run compile",
diff --git a/packages/components/package.json b/packages/components/package.json
index fb2634163a..90001fd604 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -20,7 +20,8 @@
   ],
   "publishConfig": {
     "access": "public",
-    "linkDirectory": true
+    "linkDirectory": true,
+    "tag": "latest-v7"
   },
   "scripts": {
     "dev": "stencil build --dev --port 9200 --serve --watch --docs --docs-readme",
diff --git a/packages/icons/package.json b/packages/icons/package.json
index e471cab8ba..35f91e186a 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -14,7 +14,8 @@
   },
   "publishConfig": {
     "access": "public",
-    "linkDirectory": true
+    "linkDirectory": true,
+    "tag": "latest-v7"
   },
   "files": [
     "public"
diff --git a/packages/internet-header/package.json b/packages/internet-header/package.json
index ea119798e8..6cb1db391c 100644
--- a/packages/internet-header/package.json
+++ b/packages/internet-header/package.json
@@ -20,7 +20,8 @@
   "collection:main": "dist/collection/index.js",
   "unpkg": "dist/swisspost-internet-header/swisspost-internet-header.esm.js",
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "tag": "latest-v7"
   },
   "files": [
     "dist/",
diff --git a/packages/intranet-header-workspace/projects/intranet-header/package.json b/packages/intranet-header-workspace/projects/intranet-header/package.json
index 24206d6bbf..177d09fa15 100644
--- a/packages/intranet-header-workspace/projects/intranet-header/package.json
+++ b/packages/intranet-header-workspace/projects/intranet-header/package.json
@@ -15,7 +15,8 @@
   "publishConfig": {
     "directory": "../../dist/intranet-header",
     "access": "public",
-    "linkDirectory": true
+    "linkDirectory": true,
+    "tag": "latest-v7"
   },
   "dependencies": {
     "@swisspost/design-system-styles": "workspace:7.4.2",
diff --git a/packages/migrations/package.json b/packages/migrations/package.json
index df43df0ae9..0b93e0fe0f 100644
--- a/packages/migrations/package.json
+++ b/packages/migrations/package.json
@@ -12,7 +12,8 @@
     "dist/"
   ],
   "publishConfig": {
-    "access": "public"
+    "access": "public",
+    "tag": "latest-v7"
   },
   "scripts": {
     "copy-files": "copyfiles -f LICENSE README.md package.json CONTRIBUTING.md CHANGELOG.md src/migrations.json dist",
diff --git a/packages/styles-primeng-workspace/projects/styles-primeng/package.json b/packages/styles-primeng-workspace/projects/styles-primeng/package.json
index 67dfe25ca5..35ca1cf82f 100644
--- a/packages/styles-primeng-workspace/projects/styles-primeng/package.json
+++ b/packages/styles-primeng-workspace/projects/styles-primeng/package.json
@@ -15,7 +15,8 @@
   "publishConfig": {
     "directory": "../../dist/styles-primeng",
     "access": "public",
-    "linkDirectory": true
+    "linkDirectory": true,
+    "tag": "latest-v7"
   },
   "peerDependencies": {
     "@angular/common": "^17.0.0",
diff --git a/packages/styles/package.json b/packages/styles/package.json
index d5b947bada..79e11de963 100644
--- a/packages/styles/package.json
+++ b/packages/styles/package.json
@@ -15,7 +15,8 @@
   "publishConfig": {
     "directory": "./dist",
     "access": "public",
-    "linkDirectory": true
+    "linkDirectory": true,
+    "tag": "latest-v7"
   },
   "scripts": {
     "start": "gulp watch",
diff --git a/packages/tokens/package.json b/packages/tokens/package.json
index a496e4f781..fc856501d5 100644
--- a/packages/tokens/package.json
+++ b/packages/tokens/package.json
@@ -28,7 +28,8 @@
   "publishConfig": {
     "directory": "./dist",
     "access": "restricted",
-    "linkDirectory": true
+    "linkDirectory": true,
+    "tag": "latest-v7"
   },
   "devDependencies": {
     "@tokens-studio/sd-transforms": "0.16.1",