diff --git a/.github/workflows/cd-firebase.yml b/.github/workflows/cd-firebase.yml
index 485a5af72..be81ce242 100644
--- a/.github/workflows/cd-firebase.yml
+++ b/.github/workflows/cd-firebase.yml
@@ -4,7 +4,6 @@ on:
     branches:
       - main
       - develop
-      - feature/cd-firebase
 
 jobs:
   deploy:
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
index 3ba4a771f..91e10fbd7 100644
--- a/composeApp/build.gradle.kts
+++ b/composeApp/build.gradle.kts
@@ -142,19 +142,13 @@ android {
         getByName("release") {
             isMinifyEnabled = true
             isShrinkResources = true
-            signingConfig = signingConfigs.getByName("release")
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+            signingConfig = signingConfigs.getByName("release")
         }
     }
-//    buildTypes {
-//        getByName("release") {
-//            isMinifyEnabled = false
-//            signingConfig = signingConfigs.getByName("release")
-//        }
-//    }
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
diff --git a/composeApp/proguard-rules.pro b/composeApp/proguard-rules.pro
new file mode 100644
index 000000000..43455e5dd
--- /dev/null
+++ b/composeApp/proguard-rules.pro
@@ -0,0 +1,102 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+########################################
+## Jetpack Compose
+########################################
+# Keep Compose runtime classes (reflection + lambdas)
+-keep class androidx.compose.** { *; }
+-keep class kotlinx.coroutines.android.** { *; }
+
+# Do not strip annotations used by Compose
+-keepattributes *Annotation*
+
+# Avoid warnings from Compose compiler-generated classes
+-dontwarn androidx.compose.**
+
+########################################
+## Kotlin
+########################################
+# Keep Kotlin metadata (used for reflection and serialization)
+-keepclassmembers class kotlin.Metadata { *; }
+-keepattributes InnerClasses,EnclosingMethod,Signature,RuntimeVisibleAnnotations,AnnotationDefault
+
+########################################
+## Kotlinx Serialization
+########################################
+# Keep serializer classes
+-keep class kotlinx.serialization.** { *; }
+-dontwarn kotlinx.serialization.**
+
+########################################
+## Room (uses annotation processing & reflection)
+########################################
+-keep class androidx.room.** { *; }
+-dontwarn androidx.room.**
+-keep class * extends androidx.room.RoomDatabase
+-keep class * extends androidx.room.RoomDatabase { *; }
+-keep class **Database_Impl { *; }
+
+# Keep entities, daos, and generated code
+-keep class * extends androidx.room.RoomDatabase
+-keep @androidx.room.Dao class *
+-keep interface * implements androidx.room.RoomDatabase
+
+########################################
+## Koin (DI - reflection)
+########################################
+-keep class org.koin.** { *; }
+-dontwarn org.koin.**
+
+########################################
+## Ktor (network client)
+########################################
+-dontwarn io.ktor.**
+-keep class io.ktor.** { *; }
+
+########################################
+## Coil (image loading)
+########################################
+-keep class coil.** { *; }
+-dontwarn coil.**
+
+########################################
+## Multiplatform Settings
+########################################
+-dontwarn com.russhwolf.settings.**
+
+########################################
+## FileKit
+########################################
+-dontwarn com.mayakapps.filekit.**
+
+########################################
+## General Rules
+########################################
+# Keep Application class
+-keep class com.cairosquad.evolvefit.** { *; }
+
+# Keep all models in case they're serialized/deserialized via reflection
+-keep class com.cairosquad.evolvefit.model.** { *; }
+
+# Allow shrinking of unused resources
+-dontnote kotlin.**
+-dontwarn kotlin.**
diff --git a/composeApp/src/commonMain/composeResources/drawable/Onboarding.png b/composeApp/src/commonMain/composeResources/drawable/Onboarding.png
deleted file mode 100644
index 7d9e2dfa8..000000000
Binary files a/composeApp/src/commonMain/composeResources/drawable/Onboarding.png and /dev/null differ
diff --git a/composeApp/src/commonMain/composeResources/drawable/Onboarding.webp b/composeApp/src/commonMain/composeResources/drawable/Onboarding.webp
new file mode 100644
index 000000000..b44c7c429
Binary files /dev/null and b/composeApp/src/commonMain/composeResources/drawable/Onboarding.webp differ
diff --git a/composeApp/src/commonMain/composeResources/drawable/im_athelete.png b/composeApp/src/commonMain/composeResources/drawable/im_athelete.png
deleted file mode 100644
index 3140717cd..000000000
Binary files a/composeApp/src/commonMain/composeResources/drawable/im_athelete.png and /dev/null differ
diff --git a/composeApp/src/commonMain/composeResources/drawable/im_athelete.webp b/composeApp/src/commonMain/composeResources/drawable/im_athelete.webp
new file mode 100644
index 000000000..33675bc7a
Binary files /dev/null and b/composeApp/src/commonMain/composeResources/drawable/im_athelete.webp differ
diff --git a/composeApp/src/commonMain/composeResources/drawable/im_welcome_background.jpg b/composeApp/src/commonMain/composeResources/drawable/im_welcome_background.jpg
deleted file mode 100644
index ad8901ebb..000000000
Binary files a/composeApp/src/commonMain/composeResources/drawable/im_welcome_background.jpg and /dev/null differ
diff --git a/composeApp/src/commonMain/composeResources/drawable/im_welcome_background.webp b/composeApp/src/commonMain/composeResources/drawable/im_welcome_background.webp
new file mode 100644
index 000000000..d35626717
Binary files /dev/null and b/composeApp/src/commonMain/composeResources/drawable/im_welcome_background.webp differ
diff --git a/composeApp/src/commonMain/composeResources/drawable/works.jpg b/composeApp/src/commonMain/composeResources/drawable/works.jpg
deleted file mode 100644
index 5041b34ee..000000000
Binary files a/composeApp/src/commonMain/composeResources/drawable/works.jpg and /dev/null differ
diff --git a/composeApp/src/commonMain/composeResources/drawable/works.webp b/composeApp/src/commonMain/composeResources/drawable/works.webp
new file mode 100644
index 000000000..b39577465
Binary files /dev/null and b/composeApp/src/commonMain/composeResources/drawable/works.webp differ