diff --git a/.github/workflows/beta.yml b/.github/workflows/beta.yml
index 1af6bfa70..c72088dd5 100644
--- a/.github/workflows/beta.yml
+++ b/.github/workflows/beta.yml
@@ -151,6 +151,16 @@ jobs:
           KEYSTORE_ALIAS: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS }}
           KEYSTORE_ALIAS_PASSWORD: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS_PASSWORD }}
         run: ./gradlew appDistributionUploadFullRelease
+        
+      - name: Create a Sentry.io release
+        uses: tclindner/sentry-releases-action@v1.2.0
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+        with:
+          tagName: ${{ env.VERSION }}
+          environment: Beta
 
   play_publish:
     name: Play Publish
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 4a67579bb..5a1923fba 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -151,6 +151,15 @@ jobs:
           KEYSTORE_ALIAS: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS }}
           KEYSTORE_ALIAS_PASSWORD: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS_PASSWORD }}
         run: ./gradlew appDistributionUploadFullRelease
+      - name: Create a Sentry.io release
+        uses: tclindner/sentry-releases-action@v1.2.0
+        env:
+          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
+          SENTRY_ORG: ${{ secrets.SENTRY_ORG }}
+          SENTRY_PROJECT: ${{ secrets.SENTRY_PROJECT }}
+        with:
+          tagName: ${{ env.VERSION }}
+          environment: Production
 
   play_publish:
     name: Play Publish
@@ -217,7 +226,7 @@ jobs:
 
       - name: Deploy to Playstore Beta
         env:
-          KEYSTORE_PASSWORD: ${{ secrets.ORIGINAL_KEYSTORE_FILE_PASSWORD }}
-          KEYSTORE_ALIAS: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS }}
-          KEYSTORE_ALIAS_PASSWORD: ${{ secrets.ORIGINAL_KEYSTORE_ALIAS_PASSWORD }}
+          KEYSTORE_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_FILE_PASSWORD }}
+          KEYSTORE_ALIAS: ${{ secrets.UPLOAD_KEYSTORE_ALIAS }}
+          KEYSTORE_ALIAS_PASSWORD: ${{ secrets.UPLOAD_KEYSTORE_ALIAS_PASSWORD }}
         run: ./gradlew publishFullReleaseBundle
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 34d2f79fb..d50add94e 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -29,10 +29,8 @@ android {
         minSdkVersion(Config.Android.minSdk)
         targetSdkVersion(Config.Android.targetSdk)
 
-        val ver = System.getenv("VERSION") ?: "LOCAL"
-        val vCode = System.getenv("VERSION_CODE")?.toIntOrNull() ?: 1
-        versionCode = vCode
-        versionName = "$ver-$vCode"
+        versionName = System.getenv("VERSION") ?: "LOCAL"
+        versionCode = System.getenv("VERSION_CODE")?.toIntOrNull() ?: 1
     }
 
     buildFeatures {