diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bab42f1..efa0d41 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Set up JDK 11
       uses: actions/setup-java@v3
       with:
-        java-version: '11'
+        java-version: '17'
         distribution: 'temurin'
         cache: gradle
 
@@ -23,3 +23,14 @@ jobs:
       
     - name: Build with Gradle
       run: cd Android/BeePlus && ./gradlew build
+
+    - name: Install Firebase CLI
+      run: npm install -g firebase-tools
+
+    - name: Authenticate with Google Cloud
+      uses: google-github-actions/auth@v2
+      with:
+        credentials_json: ${{ secrets.FIREBASE_SERVICE_ACCOUNT_WATA }}
+
+    - name: Run Firebase command
+      run: firebase appdistribution:distribute Android/BeePlus/app/build/outputs/apk/debug/app-debug.apk --app 1:1027195595844:android:db96d3a226103bb1aca011 --test-devices "model=tokay,version=36,locale=en,orientation=portrait;" --test-case-ids=smoke-test
diff --git a/Android/BeePlus/app/build.gradle b/Android/BeePlus/app/build.gradle
index 65df91e..4ec32f5 100644
--- a/Android/BeePlus/app/build.gradle
+++ b/Android/BeePlus/app/build.gradle
@@ -1,5 +1,5 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.firebase.appdistribution'
+
 
 android {
     compileSdkVersion 33
@@ -15,21 +15,10 @@ android {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-            firebaseAppDistribution {
-                appId="1:461235515410:android:c883034d281eb56a"
-                artifactType="APK"
-                releaseNotes="hi"
-                testers="abarone@google.com"
-                groups="mallard-group"
-            }
+
         }
         debug {
-            firebaseAppDistribution {
-                // This app has AAB uploads enabled
-                appId="1:1095562434941:android:502210c4f11e5466269414"
-                testCases="case1,case2"
-                testDevices="model=MediumPhone.arm,version=34,orientation=portrait,locale=en_US"
-            }
+
         }
     }
     namespace 'dev.firebase.beeplus'
diff --git a/Android/BeePlus/app/src/main/res/layout/activity_main.xml b/Android/BeePlus/app/src/main/res/layout/activity_main.xml
index cf7fe8a..724cfc8 100644
--- a/Android/BeePlus/app/src/main/res/layout/activity_main.xml
+++ b/Android/BeePlus/app/src/main/res/layout/activity_main.xml
@@ -78,6 +78,14 @@
         android:layout_margin="12dp"
         android:orientation="vertical">
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="Welcome to BeePlus"
+            android:textSize="24sp"
+            android:textStyle="bold" />
+
         <TextView
             android:id="@+id/signed_in_user"
             android:layout_width="wrap_content"
diff --git a/Android/BeePlus/build.gradle b/Android/BeePlus/build.gradle
index e7981c4..5f14a2a 100644
--- a/Android/BeePlus/build.gradle
+++ b/Android/BeePlus/build.gradle
@@ -9,7 +9,7 @@ buildscript {
     dependencies {
         classpath 'com.android.tools.build:gradle:8.3.2'
         classpath 'com.google.gms:google-services:4.4.2'
-        classpath 'com.google.firebase:firebase-appdistribution-gradle:5.0.0'
+
 
 
         // NOTE: Do not place your application dependencies here; they belong