diff --git a/.changeset/config.json b/.changeset/config.json
index 640b0249d30..f5fa800e2ae 100644
--- a/.changeset/config.json
+++ b/.changeset/config.json
@@ -12,5 +12,9 @@
     "access": "public",
     "baseBranch": "main",
     "updateInternalDependencies": "patch",
-    "ignore": []
+    "ignore": [],
+    "snapshot": {
+        "useCalculatedVersion": true,
+        "prereleaseTemplate": "{tag}.{datetime}"
+    }
 }
diff --git a/.github/workflows/beta-release.yml b/.github/workflows/beta-release.yml
index 6ea8ed5c8b4..feca7f4d868 100644
--- a/.github/workflows/beta-release.yml
+++ b/.github/workflows/beta-release.yml
@@ -1,6 +1,9 @@
 name: Beta Release
 
 on:
+    pull_request:
+        types: [opened, synchronize]
+
     push:
         branches:
             - main
@@ -13,36 +16,40 @@ jobs:
             - name: Checkout PR branch
               uses: actions/checkout@v4
 
-            - name: Setup Job and Install Dependencies
-              uses: ./.github/actions/setup-job
-
-            - name: Set Git identity
-              run: |
-                  git config --global user.email "support+actions@github.com"
-                  git config --global user.name "github-actions-bot"
-
-            - name: Update package versions for beta release
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-              run: |
-                  yarn changeset pre enter beta
-                  # Apply the changeset with specific beta tag
-                  yarn changeset version
-                  yarn lint:versions --fix
-                  yarn update-version
-
-            - name: Configure NPM for changeset publish
-              env:
-                  NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
-              run: |
-                  echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
-
-            - name: Publish beta release
-              env:
-                  NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+            - name: Test tag format
               run: |
-                  git add .
-                  git commit -am "chore: publish beta version"
-                  yarn prepublishOnly
-                  yarn changeset publish --no-git-tag
-                  git reset --hard HEAD^
+                  echo "Full SHA: $GITHUB_SHA"
+                  echo "Short SHA: ${GITHUB_SHA::8}"
+                  echo "Tag would be: beta-${GITHUB_SHA::8}"
+
+            # - name: Setup Job and Install Dependencies
+            #   uses: ./.github/actions/setup-job
+
+            # - name: Set Git identity
+            #   run: |
+            #       git config --global user.email "support+actions@github.com"
+            #       git config --global user.name "github-actions-bot"
+
+            # - name: Update package versions for beta snapshot release
+            #   env:
+            #       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+            #   run: |
+            #       yarn changeset version --snapshot beta
+            #       yarn lint:versions --fix
+            #       yarn update-version
+
+            # - name: Configure NPM for changeset publish
+            #   env:
+            #       NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+            #   run: |
+            #       echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+
+            # - name: Publish beta snapshot release
+            #   env:
+            #       NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+            #   run: |
+            #       git add .
+            #       git commit -am "chore: publish beta snapshot version"
+            #       yarn prepublishOnly
+            #       yarn changeset publish --no-git-tag --tag beta-${GITHUB_SHA::8}
+            #       git reset --hard HEAD^
diff --git a/package.json b/package.json
index e1165ccd20c..28cd9e92305 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
         "build:ts:watch": "wireit",
         "build:types": "wireit",
         "build:watch": "wireit",
-        "changeset-snapshot-publish": "yarn prepublishOnly && yarn changeset version --snapshot && yarn lint:versions --fix && yarn update-version && yarn changeset publish --no-git-tag --tag snapshot",
+        "changeset-snapshot-publish": "yarn prepublishOnly && yarn changeset version --snapshot snapshot && yarn lint:versions --fix && yarn update-version && yarn changeset publish --no-git-tag --tag snapshot",
         "changeset-publish": "yarn prepublishOnly && yarn changeset version && yarn install && yarn lint:versions --fix && yarn update-version && yarn changeset publish --no-git-tag && yarn push-to-remote && yarn create-git-tag && yarn postpublish",
         "update-version": "node ./tasks/update-version.js",
         "chromatic": "chromatic --build-script-name storybook:build # note that --project-token must be set in your env variables",