diff --git a/Changes b/Changes
index fab3cfb..7629563 100644
--- a/Changes
+++ b/Changes
@@ -14,6 +14,7 @@
 - Fixed invalid signature of the uber jar.
 - Updated configurations of the lite version to use the 
   data folder (#598)
+- Setup logs files to be generated inside the data folder (#598)
 
 # version 0.73
 
diff --git a/src/main/resources/log4j2-debug.properties b/src/main/resources/log4j2-debug.properties
index 817e355..8b59e69 100644
--- a/src/main/resources/log4j2-debug.properties
+++ b/src/main/resources/log4j2-debug.properties
@@ -6,7 +6,7 @@
 
 appender.debugFile.type = File
 appender.debugFile.name = DEBUGLOG
-appender.debugFile.fileName=./logs/debug.log
+appender.debugFile.fileName=./data/logs/debug.log
 appender.debugFile.layout.type=PatternLayout
 appender.debugFile.layout.pattern= %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n
 
diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties
index 618c58f..dabe381 100644
--- a/src/main/resources/log4j2.properties
+++ b/src/main/resources/log4j2.properties
@@ -7,13 +7,13 @@
 
 appender.file.type = File
 appender.file.name = MAINLOG
-appender.file.fileName=./logs/kustvakt.log
+appender.file.fileName=./data/logs/kustvakt.log
 appender.file.layout.type=PatternLayout
 appender.file.layout.pattern= %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n
 
 #appender.ldapFile.type = File
 #appender.ldapFile.name = LDAP_LOG
-#appender.ldapFile.fileName=./logs/ldap.log
+#appender.ldapFile.fileName=./data/logs/ldap.log
 #appender.ldapFile.layout.type=PatternLayout
 #appender.ldapFile.layout.pattern= %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n
 
diff --git a/src/test/resources/log4j2-test.properties b/src/test/resources/log4j2-test.properties
index 50d78e7..f9b8a98 100644
--- a/src/test/resources/log4j2-test.properties
+++ b/src/test/resources/log4j2-test.properties
@@ -6,13 +6,13 @@
 
 #appender.file.type = File
 #appender.file.name = ERRORLOG
-#appender.file.fileName=./logs/errors.log
+#appender.file.fileName=./data/logs/errors.log
 #appender.file.layout.type=PatternLayout
 #appender.file.layout.pattern= %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n
 
 appender.ldapFile.type = File
 appender.ldapFile.name = LDAP_LOG
-appender.ldapFile.fileName=./logs/ldap.log
+appender.ldapFile.fileName=./data/logs/ldap.log
 appender.ldapFile.layout.type=PatternLayout
 appender.ldapFile.layout.pattern= %d{yyyy-MM-dd, HH:mm:ss} %C{6} - %M%n %-5p: %m%n