diff --git a/build.gradle.kts b/build.gradle.kts
index d97506f..09ee113 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,6 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
-val containerAlwaysOn: Boolean by project
+val containerAlwaysOn: String by project
+val disableLint: String by project
 
 plugins {
     jacoco
@@ -10,7 +11,7 @@ plugins {
     id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
     id("org.owasp.dependencycheck") version "6.1.1"
     id("fr.coppernic.versioning") version "3.2.1"
-    id("com.avast.gradle.docker-compose") version "0.14.0"
+    id("com.avast.gradle.docker-compose") version "0.14.4"
     id("org.sonarqube") version "+"
 }
 
@@ -43,7 +44,9 @@ tasks.test {
     useJUnit()
     useJUnitPlatform()
     systemProperty("junit.jupiter.execution.parallel.enabled", true)
-    finalizedBy(tasks.ktlintCheck)
+    if (disableLint.toBoolean() == false) {
+        finalizedBy(tasks.ktlintCheck)
+    }
 }
 
 tasks.jacocoTestReport {
@@ -87,7 +90,7 @@ apply(plugin = "docker-compose")
 dockerCompose {
     projectName = "postgres-json"
     useComposeFiles = listOf("docker-compose.yml")
-    stopContainers = if (project.hasProperty("containerAlwaysOn")) containerAlwaysOn else false
+    stopContainers = !containerAlwaysOn.toBoolean()
     isRequiredBy(project.tasks.test)
 }
 
diff --git a/gradle.properties b/gradle.properties
index d1c3969..00a8cd7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,4 +6,6 @@ systemProp.sonar.projectName=PostgresJson
 systemProp.sonar.organization=flecomte
 systemProp.sonar.java.coveragePlugin=jacoco
 systemProp.sonar.coverage.jacoco.xmlReportPaths=build/reports/jacoco/test/jacocoTestReport.xml
-org.gradle.jvmargs=-Xmx4096M
\ No newline at end of file
+org.gradle.jvmargs=-Xmx4096M
+containerAlwaysOn=false
+disableLint=false
\ No newline at end of file