diff --git a/.github/actions/app-distribution/action.yml b/.github/actions/app-distribution/action.yml
index eb1870425..dbe1a2b7d 100644
--- a/.github/actions/app-distribution/action.yml
+++ b/.github/actions/app-distribution/action.yml
@@ -31,7 +31,7 @@ runs:
         BRANCH_SHA=${{ github.event.pull_request.head.sha }}
         COMMIT_SHA=${BRANCH_SHA:-$GITHUB_SHA}
         [ ${{ inputs.append-git-sha-to-version-name }} == 'true' ] && VERSION_NAME_SUFFIX=-${COMMIT_SHA::7} || VERSION_NAME_SUFFIX=''
-        ./gradlew app:appDistributionUpload -PversionNameSuffix=$VERSION_NAME_SUFFIX -PversionCode=$GITHUB_RUN_NUMBER -PappDistributionVariants=release -PappDistributionGitTagPrefix=${{ inputs.git-tag-prefix }} -PappDistributionGroup=${{ inputs.group }} -PappDistributionGitTagSha=$COMMIT_SHA --stacktrace
+        ./gradlew app:appDistributionUpload -PapplicationId=com.orange.ods.test.app -PversionNameSuffix=$VERSION_NAME_SUFFIX -PversionCode=$GITHUB_RUN_NUMBER -PappDistributionVariants=release -PappDistributionGitTagPrefix=${{ inputs.git-tag-prefix }} -PappDistributionGroup=${{ inputs.group }} -PappDistributionGitTagSha=$COMMIT_SHA --stacktrace
       env:
         GITHUB_TOKEN: ${{ inputs.github-token }}
         FIREBASE_TOKEN: ${{ inputs.firebase-token }}
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 824f11acd..7420c24cb 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -32,7 +32,7 @@ android {
     compileSdk = Versions.compileSdk
 
     defaultConfig {
-        applicationId = "com.orange.ods.app"
+        applicationId = project.findTypedProperty<String>("applicationId") ?: "com.orange.ods.app"
         minSdk = Versions.minSdk
         targetSdk = Versions.targetSdk
         val versionCodeProperty = project.findTypedProperty<String>("versionCode")
@@ -74,9 +74,6 @@ android {
                 signingConfig = this@android.signingConfigs.getByName(signingConfigName)
             }
         }
-        debug {
-            applicationIdSuffix = ".debug"
-        }
     }
 
     firebaseAppDistribution {
diff --git a/app/src/debug/google-services.json b/app/src/debug/google-services.json
deleted file mode 100644
index 29cbe0b36..000000000
--- a/app/src/debug/google-services.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "project_info": {
-    "project_number": "212698857200",
-    "project_id": "orange-design-system-6f3f1",
-    "storage_bucket": "orange-design-system-6f3f1.appspot.com"
-  },
-  "client": [
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:212698857200:android:3c1bbef73f8089dd5ecc35",
-        "android_client_info": {
-          "package_name": "com.orange.ods.app.debug"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "212698857200-mvqaopuseqhqeaglk7jm0g8qg0dcvsab.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAIY6bMaglXBkcA72v_vja3yI6-7uaR-8U"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "212698857200-mvqaopuseqhqeaglk7jm0g8qg0dcvsab.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    },
-    {
-      "client_info": {
-        "mobilesdk_app_id": "1:212698857200:android:84f9ae5c588f21f25ecc35",
-        "android_client_info": {
-          "package_name": "com.orange.ods.app.debug"
-        }
-      },
-      "oauth_client": [
-        {
-          "client_id": "212698857200-mvqaopuseqhqeaglk7jm0g8qg0dcvsab.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
-      "api_key": [
-        {
-          "current_key": "AIzaSyAIY6bMaglXBkcA72v_vja3yI6-7uaR-8U"
-        }
-      ],
-      "services": {
-        "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "212698857200-mvqaopuseqhqeaglk7jm0g8qg0dcvsab.apps.googleusercontent.com",
-              "client_type": 3
-            }
-          ]
-        }
-      }
-    }
-  ],
-  "configuration_version": "1"
-}
\ No newline at end of file
diff --git a/app/src/google-services.json b/app/src/google-services.json
index d1d0cef61..dffac0317 100644
--- a/app/src/google-services.json
+++ b/app/src/google-services.json
@@ -62,6 +62,64 @@
           ]
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:212698857200:android:67d1403d02a72f4d5ecc35",
+        "android_client_info": {
+          "package_name": "com.orange.ods.test.app"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "212698857200-mvqaopuseqhqeaglk7jm0g8qg0dcvsab.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAIY6bMaglXBkcA72v_vja3yI6-7uaR-8U"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "212698857200-mvqaopuseqhqeaglk7jm0g8qg0dcvsab.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:212698857200:android:92978ae61c91c8b85ecc35",
+        "android_client_info": {
+          "package_name": "com.orange.ods.test.flutterapp"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "212698857200-mvqaopuseqhqeaglk7jm0g8qg0dcvsab.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAIY6bMaglXBkcA72v_vja3yI6-7uaR-8U"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "212698857200-mvqaopuseqhqeaglk7jm0g8qg0dcvsab.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
     }
   ],
   "configuration_version": "1"