diff --git a/Dockerfile b/Dockerfile
index ab5a41f183..9cf5fe9e3e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM registry.cmd.navi-tech.in/medici/android-base:v83c41e64acda81bc0c46b88d6fe7cedfe948bc12
+FROM registry.cmd.navi-tech.in/sa/android/base:v513d9a1f4fa15fdec940b33914ec6e139252c3f5
 
 ENV WORK_DIR="/android/navi/" \
     ANDROID_APK_DIR="android/app/build/outputs/apk" \
@@ -71,12 +71,10 @@ RUN --mount=type=secret,id=RELEASE_STORE_PASSWORD \
         -PNAVIPAY_CONVERSATION_ID_GENERATOR_SALT=$(cat /run/secrets/NAVIPAY_CONVERSATION_ID_GENERATOR_SALT) \
         -POAUTH_WEB_CLIENT_ID=$(cat /run/secrets/OAUTH_WEB_CLIENT_ID)
 
-RUN --mount=type=secret,id=FLAVOR \
-    --mount=type=secret,id=NEXUS_URL \
+RUN --mount=type=secret,id=NEXUS_URL \
     --mount=type=secret,id=NEXUS_USERNAME \
     --mount=type=secret,id=NEXUS_PASSWORD \
     cd $WORK_DIR/android && ./gradlew --no-configuration-cache publish \
-        -PFLAVOR=$(cat /run/secrets/FLAVOR) \
         -PNEXUS_URL=$(cat /run/secrets/NEXUS_URL) \
         -PNEXUS_USERNAME=$(cat /run/secrets/NEXUS_USERNAME) \
         -PNEXUS_PASSWORD=$(cat /run/secrets/NEXUS_PASSWORD)
diff --git a/android/app/build.gradle b/android/app/build.gradle
index 633c82335d..8955975469 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -228,8 +228,7 @@ publishing {
     repositories {
         if (project.hasProperty('NEXUS_URL')
                 && project.hasProperty('NEXUS_USERNAME')
-                && project.hasProperty('NEXUS_PASSWORD')
-        ) {
+                && project.hasProperty('NEXUS_PASSWORD')) {
             maven {
                 url = "$NEXUS_URL"
                 credentials {
@@ -240,14 +239,12 @@ publishing {
         }
     }
     publications {
-        if (project.hasProperty('FLAVOR')) {
-            maven(MavenPublication) {
-                artifactId = "$FLAVOR"
-                groupId = "com.naviapp"
-                version = "navi_v$VERSION_NAME"
+        maven(MavenPublication) {
+            version = "$VERSION_NAME"
+            artifactId = "super-app"
+            groupId = "com.navi.android"
 
-                artifact("build/outputs/bundle/prodRelease/app-prod-release.aab")
-            }
+            artifact("build/outputs/bundle/prodRelease/app-prod-release.aab")
         }
     }
 }