diff --git a/.gitignore b/.gitignore
index daa207c..912a45b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,4 +33,6 @@ overridedb.*
 .idea
 .DS_Store
 .factorypath
-davos.log
\ No newline at end of file
+davos.log
+src/main/resources/application.properties
+src/main/resources/log4j2.xml
diff --git a/build.gradle b/build.gradle
index 7801d2d..829482d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -93,8 +93,11 @@ task updateBuildVersion << {
 
 task copyConfig(type: Copy) {
 	
-	from 'conf/app/application.${env}.properties'
-	from 'conf/app/log4j2.${env}.xml'
+	def location = project.hasProperty('env') ? "$env" : 'local'
 	
-	to 'src/main/resources/'
+	from "conf/${location}"
+	into "src/main/resources/"
 }
+
+build.dependsOn copyConfig
+build.mustRunAfter copyConfig
diff --git a/conf/app/application.local.properties b/conf/local/application.properties
similarity index 100%
rename from conf/app/application.local.properties
rename to conf/local/application.properties
diff --git a/conf/logging/log4j2.local.xml b/conf/local/log4j2.xml
similarity index 100%
rename from conf/logging/log4j2.local.xml
rename to conf/local/log4j2.xml
diff --git a/conf/app/application.release.properties b/conf/release/application.properties
similarity index 100%
rename from conf/app/application.release.properties
rename to conf/release/application.properties
diff --git a/conf/logging/log4j2.release.xml b/conf/release/log4j2.xml
similarity index 100%
rename from conf/logging/log4j2.release.xml
rename to conf/release/log4j2.xml