diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 56114baf5..18a424902 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,4 +1,4 @@
-name: Build
+name: Build Authenticator
 
 on:
   push:
@@ -31,7 +31,7 @@ env:
 
 jobs:
   build:
-    name: Build
+    name: Build Authenticator
     runs-on: ubuntu-24.04
 
     steps:
@@ -80,11 +80,11 @@ jobs:
       - name: Check
         run: bundle exec fastlane check
 
-      - name: Build
-        run: bundle exec fastlane buildDebug
+      - name: Build Authenticator
+        run: bundle exec fastlane buildAuthenticatorDebug
 
   publish_playstore:
-    name: Publish Play Store artifacts
+    name: Publish Authenticator Play Store artifacts
     needs:
       - build
     runs-on: ubuntu-24.04
@@ -152,7 +152,8 @@ jobs:
       - name: Verify Play Store credentials
         if: ${{ inputs.publish-to-play-store }}
         run: |
-          bundle exec fastlane run validate_play_store_json_key
+          bundle exec fastlane run validate_play_store_json_key \
+          json_key:${{ github.workspace }}/secrets/authenticator_play_store-creds.json }}
 
       - name: Validate Gradle wrapper
         uses: gradle/actions/wrapper-validation@0bdd871935719febd78681f197cd39af5b6e16a6 # v4.2.2
@@ -186,7 +187,7 @@ jobs:
         run: |
           DEFAULT_VERSION_CODE=$GITHUB_RUN_NUMBER
           VERSION_CODE="${{ inputs.version-code || '$DEFAULT_VERSION_CODE' }}"
-          bundle exec fastlane setBuildVersionInfo \
+          bundle exec fastlane setAuthenticatorBuildVersionInfo \
           versionCode:$VERSION_CODE \
           versionName:${{ inputs.version-name || '' }}
 
@@ -200,7 +201,7 @@ jobs:
       - name: Generate release Play Store bundle
         if: ${{ matrix.variant == 'aab' }}
         run: |
-          bundle exec fastlane bundleRelease \
+          bundle exec fastlane bundleAuthenticatorRelease \
           storeFile:${{ github.workspace }}/keystores/authenticator_aab-keystore.jks \
           storePassword:'${{ secrets.AAB_KEYSTORE_STORE_PASSWORD }}' \
           keyAlias:authenticatorupload \
@@ -209,7 +210,7 @@ jobs:
       - name: Generate release Play Store APK
         if: ${{ matrix.variant == 'apk' }}
         run: |
-          bundle exec fastlane buildRelease \
+          bundle exec fastlane buildAuthenticatorRelease \
           storeFile:${{ github.workspace }}/keystores/authenticator_apk-keystore.jks \
           storePassword:'${{ secrets.APK_KEYSTORE_STORE_PASSWORD }}' \
           keyAlias:bitwardenauthenticator \
@@ -268,7 +269,7 @@ jobs:
         env:
           FIREBASE_CREDS_PATH: ${{ github.workspace }}/secrets/authenticator_play_firebase-creds.json
         run: |
-          bundle exec fastlane distributeReleaseBundleToFirebase \
+          bundle exec fastlane distributeAuthenticatorReleaseBundleToFirebase \
           serviceCredentialsFile:${{ env.FIREBASE_CREDS_PATH }}
 
       # Only publish bundles to Play Store when `publish-to-play-store` is true while building
@@ -278,5 +279,5 @@ jobs:
         env:
           PLAY_STORE_CREDS_FILE: ${{ github.workspace }}/secrets/authenticator_play_store-creds.json
         run: |
-          bundle exec fastlane publishReleaseToGooglePlayStore \
+          bundle exec fastlane publishAuthenticatorReleaseToGooglePlayStore \
           serviceCredentialsFile:${{ env.PLAY_STORE_CREDS_FILE }} \
diff --git a/.github/workflows/crowdin-pull.yml b/.github/workflows/crowdin-pull.yml
index fd91164b7..bd9051754 100644
--- a/.github/workflows/crowdin-pull.yml
+++ b/.github/workflows/crowdin-pull.yml
@@ -1,4 +1,4 @@
-name: Crowdin Sync
+name: Crowdin Sync - Authenticator
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/crowdin-push.yml b/.github/workflows/crowdin-push.yml
index 6595297e4..dc4159a69 100644
--- a/.github/workflows/crowdin-push.yml
+++ b/.github/workflows/crowdin-push.yml
@@ -1,4 +1,4 @@
-name: Crowdin Push
+name: Crowdin Push - Authenticator
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/scan.yml b/.github/workflows/scan.yml
index 17d410cf5..b9d73dcc3 100644
--- a/.github/workflows/scan.yml
+++ b/.github/workflows/scan.yml
@@ -1,4 +1,4 @@
-name: Scan
+name: Scan Authenticator
 
 on:
   workflow_dispatch:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 64098e6f6..6672891fc 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,4 +1,4 @@
-name: Test
+name: Test Authenticator
 
 on:
   push:
diff --git a/fastlane/Appfile b/fastlane/Appfile
index d1edd14ab..e69de29bb 100644
--- a/fastlane/Appfile
+++ b/fastlane/Appfile
@@ -1,2 +0,0 @@
-json_key_file("secrets/authenticator_play_store-creds.json")
-package_name("com.bitwarden.authenticator")
diff --git a/fastlane/Fastfile b/fastlane/Fastfile
index 8c8035366..630d397cb 100644
--- a/fastlane/Fastfile
+++ b/fastlane/Fastfile
@@ -19,7 +19,7 @@ platform :android do
 
   desc "Runs tests"
   lane :check do
-    gradle(tasks: ["testDebug", "lintDebug", "detekt","koverXmlReportDebug"])
+    gradle(tasks: ["authenticator:testDebug", "authenticator:lintDebug", "authenticator:detekt","authenticator:koverXmlReportDebug"])
   end
 
   desc "Apply build version information"
@@ -133,6 +133,7 @@ platform :android do
   desc "Publish release to Google Play Store"
   lane :publishReleaseToGooglePlayStore do |options|
     upload_to_play_store(
+      package_name: "com.bitwarden.authenticator",
       json_key: options[:serviceCredentialsFile],
       track: "internal",
       aab: "authenticator/build/outputs/bundle/release/com.bitwarden.authenticator-release.aab",