diff --git a/.github/workflows/sentry-ref.yml b/.github/workflows/sentry-ref.yml
deleted file mode 100644
index ab1af593696..00000000000
--- a/.github/workflows/sentry-ref.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Sentry Ref
-
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  release:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - name: Create Sentry release
-        uses: getsentry/action-release@v1
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-        with:
-          environment: production
-          version: ${{ github.ref }}
diff --git a/.github/workflows/sentry-sha.yml b/.github/workflows/sentry.yml
similarity index 60%
rename from .github/workflows/sentry-sha.yml
rename to .github/workflows/sentry.yml
index 41d884c2496..a6b3c5f3116 100644
--- a/.github/workflows/sentry-sha.yml
+++ b/.github/workflows/sentry.yml
@@ -1,25 +1,36 @@
-name: Sentry
-on:
-  push:
-    branches-ignore:
-      - "translations_**"
-      - "dependabot/**"
-jobs:
-
-  sentry:
-    name: Sentry
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-          fetch-tags: true
-      - name: Create Sentry release
-        uses: getsentry/action-release@v1
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
-          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
-        with:
-          environment: production
-          version: ${{ github.sha }}
+name: Sentry
+on:
+  push:
+    branches-ignore:
+      - "translations_**"
+      - "dependabot/**"
+    tags:
+      - 'v*'
+jobs:
+
+  sentry:
+    name: Sentry
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          fetch-tags: true
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          java-version: 21
+          distribution: 'temurin'
+          cache: gradle
+      - name: Get version from Gradle
+        id: get_version
+        run: echo "RELEASE_VERSION=$(./gradlew version -q)" >> $GITHUB_ENV
+      - name: Create Sentry release
+        uses: getsentry/action-release@v1
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+        with:
+          environment: production
+          version: ${{ env.RELEASE_VERSION }}