diff --git a/.github/workflows/android-lint.yml b/.github/workflows/android-lint.yml
index 1e62cf5..80fc616 100644
--- a/.github/workflows/android-lint.yml
+++ b/.github/workflows/android-lint.yml
@@ -25,7 +25,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Run Linter
-        run: ./gradlew lintStandardDebug
+        run: ./gradlew lintDebug
 
       - name: Build with Gradle
-        run: ./gradlew assembleStandard
\ No newline at end of file
+        run: ./gradlew assembleDebug
\ No newline at end of file
diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
index 9f2aa88..7d0e974 100644
--- a/.github/workflows/android-release.yml
+++ b/.github/workflows/android-release.yml
@@ -6,7 +6,7 @@ name: Android Release Build
 #
 # See:
 # - https://github.com/usetrmnl/trmnl-android/tree/main/keystore
-# - https://github.com/usetrmnl/trmnl-android/blob/main/app/build.gradle.kts#L44-L55
+# - https://github.com/usetrmnl/trmnl-android/blob/main/app/build.gradle.kts (signing configuration)
 
 
 on:
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 4118780..8e70dca 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -25,7 +25,7 @@ jobs:
         uses: gradle/actions/setup-gradle@v4
 
       - name: Run test and lint
-        run: ./gradlew lintKotlin testStandardDebugUnitTest --parallel --daemon
+        run: ./gradlew lintKotlin testDebugUnitTest --parallel --daemon
 
       - name: Build with Gradle
-        run: ./gradlew assembleStandardDebug --parallel --daemon
+        run: ./gradlew assembleDebug --parallel --daemon
diff --git a/.github/workflows/test-keystore-clean.yml b/.github/workflows/test-keystore-clean.yml
index caee7da..9933c03 100644
--- a/.github/workflows/test-keystore-clean.yml
+++ b/.github/workflows/test-keystore-clean.yml
@@ -83,47 +83,23 @@ jobs:
           # Set up Gradle
           chmod +x gradlew
           
-          # Test the standard release build
-          echo "Building standard release APK with production keystore..."
-          if ./gradlew assembleStandardRelease \
-              -PKEYSTORE_PASSWORD="${{ secrets.KEYSTORE_PASSWORD }}" \
-              -PKEY_ALIAS="${{ secrets.KEY_ALIAS }}" > keystore-test/gradle-build-standard.txt 2>&1; then
-            echo "✅ Android standard release build succeeded with production keystore"
+          # Test the release build with production keystore
+          echo "Building release APK with production keystore..."
+          if ./gradlew assembleRelease > keystore-test/gradle-build-release.txt 2>&1; then
+            echo "✅ Android release build succeeded with production keystore"
             
             # Verify the APK exists
-            if [ -f "app/build/outputs/apk/standard/release/app-standard-release.apk" ]; then
-              echo "✅ Standard release APK generated successfully"
+            if [ -f "app/build/outputs/apk/release/app-release.apk" ]; then
+              echo "✅ Release APK generated successfully"
+              echo "✅ Release build is now properly signed with production keystore"
             else
-              echo "❌ Standard release APK not found"
+              echo "❌ Release APK not found"
               exit 1
             fi
           else
-            echo "❌ Android standard release build failed"
+            echo "❌ Android release build failed"
             echo "Build output:"
-            cat keystore-test/gradle-build-standard.txt
-            exit 1
-          fi
-          
-          # Test the F-Droid release build
-          echo ""
-          echo "Building F-Droid release APK with production keystore..."
-          if ./gradlew assembleFdroidRelease \
-              -PKEYSTORE_PASSWORD="${{ secrets.KEYSTORE_PASSWORD }}" \
-              -PKEY_ALIAS="${{ secrets.KEY_ALIAS }}" > keystore-test/gradle-build-fdroid.txt 2>&1; then
-            echo "✅ Android F-Droid release build succeeded with production keystore"
-            
-            # Verify the APK exists
-            if [ -f "app/build/outputs/apk/fdroid/release/app-fdroid-release.apk" ]; then
-              echo "✅ F-Droid release APK generated successfully"
-              echo "✅ Both standard and F-Droid builds are now properly signed"
-            else
-              echo "❌ F-Droid release APK not found"
-              exit 1
-            fi
-          else
-            echo "❌ Android F-Droid release build failed"
-            echo "Build output:"
-            cat keystore-test/gradle-build-fdroid.txt
+            cat keystore-test/gradle-build-release.txt
             exit 1
           fi