diff --git a/.github/workflows/release-automated.yml b/.github/workflows/release-automated.yml
index 032d034b..8c0d6709 100644
--- a/.github/workflows/release-automated.yml
+++ b/.github/workflows/release-automated.yml
@@ -20,9 +20,6 @@ jobs:
     if: github.event_name == 'push' && github.ref_type == 'branch'
     runs-on: ubuntu-latest
     timeout-minutes: 10
-    outputs:
-      dart_tag: ${{ steps.dart-release.outputs.new_release_git_tag }}
-      flutter_tag: ${{ steps.flutter-release.outputs.new_release_git_tag }}
     permissions:
       contents: write
       issues: write
@@ -41,24 +38,12 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Run semantic-release for dart package
-        id: dart-release
         run: npx semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
           PKG_NAME: dart
       - name: Run semantic-release for flutter package
-        id: flutter-release
         run: npx semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.RELEASE_GITHUB_TOKEN }}
           PKG_NAME: flutter
-  publish:
-    needs: release
-    if: needs.release.outputs.dart_tag != '' || needs.release.outputs.flutter_tag != ''
-    uses: ./.github/workflows/release-publish.yml
-    permissions:
-      id-token: write
-      contents: write
-    with:
-      dart_tag: ${{ needs.release.outputs.dart_tag }}
-      flutter_tag: ${{ needs.release.outputs.flutter_tag }}
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index c76f54ba..1eb1cd3e 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -4,25 +4,11 @@ on:
     tags:
       - "dart-[0-9]+.[0-9]+.[0-9]+*"
       - "flutter-[0-9]+.[0-9]+.[0-9]+*"
-  workflow_call:
-    inputs:
-      dart_tag:
-        required: false
-        type: string
-        description: 'Dart package version tag (dart-#.#.#)'
-      flutter_tag:
-        required: false
-        type: string
-        description: 'Flutter package version tag (flutter-#.#.#)'
 env:
-  # For tag push: extract from github.ref_name
-  # For workflow_call: use inputs
   package: ${{ startsWith(github.ref_name, 'dart-') && 'dart' || startsWith(github.ref_name, 'flutter-') && 'flutter' || '' }}
-  dart_tag_resolved: ${{ inputs.dart_tag || (startsWith(github.ref_name, 'dart-') && github.ref_name || '') }}
-  flutter_tag_resolved: ${{ inputs.flutter_tag || (startsWith(github.ref_name, 'flutter-') && github.ref_name || '') }}
 jobs:
   pub-publish-dart:
-    if: inputs.dart_tag != '' || startsWith(github.ref_name, 'dart-')
+    if: startsWith(github.ref_name, 'dart-')
     runs-on: ubuntu-latest
     timeout-minutes: 10
     permissions:
@@ -31,7 +17,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ env.dart_tag_resolved }}
+          ref: ${{ github.ref_name }}
       - name: Setup dart
         uses: dart-lang/setup-dart@v1
         with:
@@ -50,7 +36,7 @@ jobs:
         run: dart pub publish --force
 
   pub-publish-flutter:
-    if: inputs.flutter_tag != '' || startsWith(github.ref_name, 'flutter-')
+    if: startsWith(github.ref_name, 'flutter-')
     runs-on: ubuntu-latest
     timeout-minutes: 10
     permissions:
@@ -59,7 +45,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ env.flutter_tag_resolved }}
+          ref: ${{ github.ref_name }}
       - name: Setup dart
         uses: dart-lang/setup-dart@v1
         with:
@@ -86,7 +72,7 @@ jobs:
         run: dart pub publish --force
 
   docs-publish-dart:
-    if: inputs.dart_tag != '' || startsWith(github.ref_name, 'dart-')
+    if: startsWith(github.ref_name, 'dart-')
     needs: pub-publish-dart
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -94,7 +80,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ env.dart_tag_resolved }}
+          ref: ${{ github.ref_name }}
       - name: Setup dart
         uses: dart-lang/setup-dart@v1
       - name: Install dart dependencies
@@ -109,7 +95,7 @@ jobs:
           destination_dir: dart
 
   docs-publish-flutter:
-    if: inputs.flutter_tag != '' || startsWith(github.ref_name, 'flutter-')
+    if: startsWith(github.ref_name, 'flutter-')
     needs: pub-publish-flutter
     runs-on: ubuntu-latest
     timeout-minutes: 15
@@ -117,7 +103,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v4
         with:
-          ref: ${{ env.flutter_tag_resolved }}
+          ref: ${{ github.ref_name }}
       - name: Setup dart
         uses: dart-lang/setup-dart@v1
       - name: Setup flutter