diff --git a/Makefile b/Makefile
index 361821d..a8c528d 100644
--- a/Makefile
+++ b/Makefile
@@ -9,4 +9,5 @@ docker:
 	docker build -t ${BUILD} .
 	docker tag ${BUILD} ${LATEST}
 	docker push ${BUILD}
-	docker push ${LATEST}
\ No newline at end of file
+	docker push ${LATEST}
+
diff --git a/src/main/java/dev/salmonllama/fsbot/Main.java b/src/main/java/dev/salmonllama/fsbot/Main.java
index bd798e6..6a97a75 100644
--- a/src/main/java/dev/salmonllama/fsbot/Main.java
+++ b/src/main/java/dev/salmonllama/fsbot/Main.java
@@ -17,14 +17,14 @@ import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+
 @SpringBootApplication
 public class Main {
 
     private final static Logger logger = LoggerFactory.getLogger(Main.class);
 
     public static void main(String[] args) {
-        String configLocation = Constants.BOT_FOLDER.concat(Constants.CONFIG_NAME);
-        BotConfig.initConfig(configLocation, false);
+        BotConfig.initConfig(Constants.BOT_FOLDER, false);
 
         FSDB.init();
 
diff --git a/src/main/java/dev/salmonllama/fsbot/config/BotConfig.java b/src/main/java/dev/salmonllama/fsbot/config/BotConfig.java
index 5424747..da38080 100644
--- a/src/main/java/dev/salmonllama/fsbot/config/BotConfig.java
+++ b/src/main/java/dev/salmonllama/fsbot/config/BotConfig.java
@@ -8,8 +8,11 @@ package dev.salmonllama.fsbot.config;
 
 import com.kaaz.configuration.ConfigurationBuilder;
 import com.kaaz.configuration.ConfigurationOption;
+import dev.salmonllama.fsbot.utilities.Constants;
 
 import java.io.File;
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
 public class BotConfig {
     @ConfigurationOption
@@ -78,9 +81,9 @@ public class BotConfig {
     @ConfigurationOption
     public static String HOME_SERVER = "Home server here";
 
-    public static void initConfig(String filePath, boolean cleanfile) {
+    public static void initConfig(Path filePath, boolean cleanfile) {
         try {
-            new ConfigurationBuilder(BotConfig.class, new File(filePath)).build(cleanfile);
+            new ConfigurationBuilder(BotConfig.class, Paths.get(filePath.toString(), Constants.CONFIG_NAME) .toFile()).build(cleanfile);
         } catch (Exception e) {
             e.printStackTrace();
             System.exit(1);
diff --git a/src/main/java/dev/salmonllama/fsbot/database/DatabaseProvider.java b/src/main/java/dev/salmonllama/fsbot/database/DatabaseProvider.java
index d5fe031..a210b94 100644
--- a/src/main/java/dev/salmonllama/fsbot/database/DatabaseProvider.java
+++ b/src/main/java/dev/salmonllama/fsbot/database/DatabaseProvider.java
@@ -20,7 +20,7 @@ public class DatabaseProvider {
 
     public DatabaseProvider(String dbName) {
         DB_NAME = dbName;
-        DB_ADDR = "jdbc:sqlite:".concat(Constants.BOT_FOLDER).concat(BotConfig.DB_ADDR);
+        DB_ADDR = "jdbc:sqlite:".concat(Constants.BOT_FOLDER.toString()).concat(BotConfig.DB_ADDR);
     }
 
     private Connection createConnection() {
diff --git a/src/main/java/dev/salmonllama/fsbot/utilities/Constants.java b/src/main/java/dev/salmonllama/fsbot/utilities/Constants.java
index 0e46308..a4a8996 100644
--- a/src/main/java/dev/salmonllama/fsbot/utilities/Constants.java
+++ b/src/main/java/dev/salmonllama/fsbot/utilities/Constants.java
@@ -5,11 +5,14 @@
 
 package dev.salmonllama.fsbot.utilities;
 
-public class Constants {
-    public static final String BOT_FOLDER = System.getenv("HOME").concat("/.fsbot/");
+import java.nio.file.Path;
+import java.nio.file.Paths;
 
+public class Constants {
     public static final String CONFIG_NAME = "bot.config";
 
+    public static final Path BOT_FOLDER = Paths.get(System.getProperty("user.home"), ".fsbot");
+
     public static final String DB_NAME = "fsbot";
 
     public static final String OUTFIT_TABLE = "outfits";