diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
index 13e350ea..44538cb0 100644
--- a/.github/workflows/android-build.yml
+++ b/.github/workflows/android-build.yml
@@ -10,7 +10,6 @@ on:
 env:
   ACTIONS_RUNNER_DEBUG: true
   ACTIONS_STEP_DEBUG: true
-  APP_NAME: "shockwallet"
 
 jobs:
   build:
@@ -35,11 +34,19 @@ jobs:
 
       - name: Set up environment for test
         if: github.ref == 'refs/heads/test'
-        run: cp .env.development.example .env
+        run: |
+          cp .env.development.example .env
+          source .env
+          echo "VITE_APP_NAME=$VITE_APP_NAME" >> $GITHUB_ENV
+          echo "VITE_ANDROID_APPLICATION_ID=$VITE_ANDROID_APPLICATION_ID" >> $GITHUB_ENV
 
       - name: Set up environment for main
         if: github.ref == 'refs/heads/main'
-        run: cp .env.production.example .env
+        run: |
+          cp .env.production.example .env
+          source .env
+          echo "VITE_APP_NAME=$VITE_APP_NAME" >> $GITHUB_ENV
+          echo "VITE_ANDROID_APPLICATION_ID=$VITE_ANDROID_APPLICATION_ID" >> $GITHUB_ENV
 
       - name: Set VERSION and VERSION_CODE
         run: |
@@ -84,7 +91,7 @@ jobs:
       - name: Build with Gradle
         run: |
           cd android
-          ./gradlew assembleRelease
+          ./gradlew assembleRelease -PversionCode=${{ env.VERSION_CODE }} -PversionName=${{ env.VERSION }} -PappName="${{ env.VITE_APP_NAME }}" -PapplicationId="${{ env.VITE_ANDROID_APPLICATION_ID }}"
 
       - name: Set up Android SDK
         uses: android-actions/setup-android@v3
@@ -133,12 +140,12 @@ jobs:
 
       - name: Sign APK
         run: |
-          $ANDROID_SDK_ROOT/build-tools/33.0.0/apksigner sign --ks my-release-key.keystore --ks-pass pass:${{ secrets.ANDROID_KEYSTORE_PASSWORD }} --key-pass pass:${{ secrets.ANDROID_KEY_PASSWORD }} --out android/app/build/outputs/apk/release/${{ env.APP_NAME }}-${{ env.VERSION }}.apk android/app/build/outputs/apk/release/app-release-unsigned.apk
+          $ANDROID_SDK_ROOT/build-tools/33.0.0/apksigner sign --ks my-release-key.keystore --ks-pass pass:${{ secrets.ANDROID_KEYSTORE_PASSWORD }} --key-pass pass:${{ secrets.ANDROID_KEY_PASSWORD }} --out android/app/build/outputs/apk/release/${{ env.VITE_APP_NAME }}-${{ env.VERSION }}.apk android/app/build/outputs/apk/release/app-release-unsigned.apk
         shell: bash
 
       - name: Verify APK
         run: |
-          $ANDROID_SDK_ROOT/build-tools/33.0.0/apksigner verify android/app/build/outputs/apk/release/${{ env.APP_NAME }}-${{ env.VERSION }}.apk
+          $ANDROID_SDK_ROOT/build-tools/33.0.0/apksigner verify android/app/build/outputs/apk/release/${{ env.VITE_APP_NAME }}-${{ env.VERSION }}.apk
         shell: bash
 
       - name: Upload APK to GitHub Release
@@ -148,8 +155,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ github.event.release.upload_url }}
-          asset_path: android/app/build/outputs/apk/release/${{ env.APP_NAME }}-${{ env.VERSION }}.apk
-          asset_name: ${{ env.APP_NAME }}-${{ env.VERSION }}.apk
+          asset_path: android/app/build/outputs/apk/release/${{ env.VITE_APP_NAME }}-${{ env.VERSION }}.apk
+          asset_name: ${{ env.VITE_APP_NAME }}-${{ env.VERSION }}.apk
           asset_content_type: application/vnd.android.package-archive
 
       - name: Upload APK as artifact
@@ -157,4 +164,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: app-release
-          path: android/app/build/outputs/apk/release/${{ env.APP_NAME }}-${{ env.VERSION }}.apk
+          path: android/app/build/outputs/apk/release/${{ env.VITE_APP_NAME }}-${{ env.VERSION }}.apk
diff --git a/android/app/build.gradle b/android/app/build.gradle
index ec417898..54d22afb 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,21 +1,19 @@
 apply plugin: 'com.android.application'
 
 android {
-    namespace "app.shockwallet.test"
+    namespace "${applicationId}"
     compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
-        applicationId "app.shockwallet.test"
+        applicationId "${applicationId}"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 1
-        versionName "1.0"
+        versionCode project.hasProperty('versionCode') ? project.property('versionCode') as int : 1
+        versionName project.hasProperty('versionName') ? project.property('versionName') : "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
-             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
-             // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
             ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
         }
-        resValue "string", "app_name", "gradle default"  // This will be replaced by the preBuild script
+        resValue "string", "app_name", project.hasProperty('appName') ? project.property('appName') : "Default App Name"
     }
     buildTypes {
         release {
diff --git a/preBuild/AndroidManifest.copy.xml b/preBuild/AndroidManifest.copy.xml
deleted file mode 100644
index 0db5c09d..00000000
--- a/preBuild/AndroidManifest.copy.xml
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application
-        android:allowBackup="true"
-        android:requestLegacyExternalStorage="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="${appName}"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity
-            android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|smallestScreenSize|screenLayout|uiMode"
-            android:name=".MainActivity"
-            android:theme="@style/AppTheme.NoActionBarLaunch"
-            android:launchMode="singleTask"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="bitcoin"/>
-            </intent-filter>
-
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="lightning"/>
-            </intent-filter>
-
-            <intent-filter android:autoVerify="true">
-                <action android:name="android.intent.action.VIEW" />
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="https" android:host="${appUrl}" />
-            </intent-filter>
-        </activity>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="${applicationId}.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths" />
-        </provider>
-    </application>
-
-    <!-- Permissions -->
-
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.CAMERA" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_CLIPBOARD"/>
-</manifest>
diff --git a/preBuild/preBuild.ts b/preBuild/preBuild.ts
index b12e6803..81bffdf7 100644
--- a/preBuild/preBuild.ts
+++ b/preBuild/preBuild.ts
@@ -40,25 +40,16 @@ function updateBuildGradle(version, versionCode, applicationId, appName) {
     `applicationId "${applicationId}"`
   );
   
-  buildGradle = buildGradle.replace(
-    /versionCode \d+/,
-    `versionCode ${versionCode}`
-  );
-  
-  buildGradle = buildGradle.replace(
-    /versionName "[^"]+"/,
-    `versionName "${version}"`
-  );
-  
   buildGradle = buildGradle.replace(
     /namespace "[^"]+"/,
     `namespace "${applicationId}"`
   );
   
-  buildGradle = buildGradle.replace(
-    /resValue "string", "app_name", "[^"]+"/,
-    `resValue "string", "app_name", "${appName}"`
-  );
+  // Remove this replacement as we'll use project properties instead
+  // buildGradle = buildGradle.replace(
+  //   /resValue "string", "app_name", "[^"]+"/,
+  //   `resValue "string", "app_name", "${appName}"`
+  // );
   
   fs.writeFileSync(buildGradlePath, buildGradle);
 }
@@ -67,6 +58,18 @@ const version = process.env.VERSION || '0.0.0';
 const versionCode = process.env.VERSION_CODE || '1';
 const applicationId = process.env.VITE_ANDROID_APPLICATION_ID || 'app.shockwallet.test';
 const appName = process.env.VITE_APP_NAME || 'missing env';
+
+console.log('Pre-build variables:');
+console.log(`Version: ${version}`);
+console.log(`Version Code: ${versionCode}`);
+console.log(`Application ID: ${applicationId}`);
+console.log(`App Name: ${appName}`);
+
 updateBuildGradle(version, versionCode, applicationId, appName);
 
+// Pass version information and app name to Gradle
+process.env.ORG_GRADLE_PROJECT_versionCode = versionCode;
+process.env.ORG_GRADLE_PROJECT_versionName = version;
+process.env.ORG_GRADLE_PROJECT_appName = appName;
+
 console.log('Pre-build script completed');
\ No newline at end of file