diff --git a/build.gradle.kts b/build.gradle.kts
index 3cd06b21ce..d4c6ed7859 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -27,6 +27,7 @@ buildscript {
         classpath(libs.hilt.gradlePlugin)
         val fdroidBuild = (System.getenv("flavor")
             ?: System.getenv("FLAVOR")
+            ?: System.getenv("CUSTOM_FLAVOR")
             ?: gradle.startParameter.taskRequests.toString())
             .lowercase()
             .contains("fdroid")
diff --git a/buildSrc/src/main/kotlin/scripts/infrastructure.gradle.kts b/buildSrc/src/main/kotlin/scripts/infrastructure.gradle.kts
index 2ed2879768..2762c3b0ea 100644
--- a/buildSrc/src/main/kotlin/scripts/infrastructure.gradle.kts
+++ b/buildSrc/src/main/kotlin/scripts/infrastructure.gradle.kts
@@ -35,6 +35,7 @@ tasks.named<Wrapper>("wrapper") {
 tasks.register("runUnitTests") {
     description = "Runs all Unit Tests."
     dependsOn(":app:test${Default.BUILD_VARIANT}UnitTest")
+    // kalium have only 2 build type debug or release
     val buildType =
         if (Default.resolvedBuildType() == Variants_gradle.BuildTypes.DEBUG) Default.resolvedBuildType().capitalized()
         else Variants_gradle.BuildTypes.RELEASE.capitalized()
diff --git a/buildSrc/src/main/kotlin/scripts/variants.gradle.kts b/buildSrc/src/main/kotlin/scripts/variants.gradle.kts
index c9fa038272..f3e5e9314d 100644
--- a/buildSrc/src/main/kotlin/scripts/variants.gradle.kts
+++ b/buildSrc/src/main/kotlin/scripts/variants.gradle.kts
@@ -42,6 +42,7 @@ object BuildTypes {
 object Default {
     fun explicitBuildFlavor(): String? = System.getenv("flavor")
         ?: System.getenv("FLAVOR")
+        ?: System.getenv("CUSTOM_FLAVOR")
 
     fun resolvedBuildFlavor(): String = explicitBuildFlavor() ?: ProductFlavors.Dev.buildName
 
diff --git a/docker-agent/builder.sh b/docker-agent/builder.sh
index 6010b02dcc..3eaa7fc336 100755
--- a/docker-agent/builder.sh
+++ b/docker-agent/builder.sh
@@ -2,14 +2,12 @@
 
 if [ "$RUN_STATIC_CODE_ANALYSIS" = true ]; then
     echo "Running Static Code Analysis"
-    ./gradlew detektAll
    ./gradlew staticCodeAnalysis
 fi
 
 if [ "$RUN_APP_UNIT_TESTS" = true ] ; then
     echo "Running App Unit Tests"
     ./gradlew runUnitTests
-    ./gradlew runUnitTestsFdroid
 fi
 
 if [ "$RUN_APP_ACCEPTANCE_TESTS" = true ] ; then
@@ -32,8 +30,7 @@ fi
 
 if [ "$BUILD_CLIENT" = true ] ; then
     echo "Compiling the client with Flavor:${CUSTOM_FLAVOR} and BuildType:${BUILD_TYPE}"
-    #./gradlew ${buildOption}assemble${FLAVOR_TYPE}${BUILD_TYPE}
-    ./gradlew ${buildOption}assemble${CUSTOM_FLAVOR}
+    ./gradlew ${buildOption}assemble${FLAVOR_TYPE}${BUILD_TYPE}
 else
     echo "Building the client will be skipped"
 fi