diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2763191e..d718c697 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -230,6 +230,14 @@ if(NOT SUNSHINE_ASSETS_DIR)
 	set(SUNSHINE_ASSETS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
 endif()
 
+if(NOT SUNSHINE_CONFIG_DIR)
+	set(SUNSHINE_CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
+endif()
+
+if(NOT SUNSHINE_DEFAULT_DIR)
+	set(SUNSHINE_CONFIG_DIR "${CMAKE_CURRENT_SOURCE_DIR}/assets")
+endif()
+
 list(APPEND CBS_EXTERNAL_LIBRARIES
 	cbs)
 
@@ -246,6 +254,8 @@ list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
 		${PLATFORM_LIBRARIES})
 
 list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_ASSETS_DIR="${SUNSHINE_ASSETS_DIR}")
+list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_CONFIG_DIR="${SUNSHINE_CONFIG_DIR}")
+list(APPEND SUNSHINE_DEFINITIONS SUNSHINE_DEFAULT_DIR="${SUNSHINE_DEFAULT_DIR}")
 add_executable(sunshine ${SUNSHINE_TARGET_FILES})
 target_link_libraries(sunshine ${SUNSHINE_EXTERNAL_LIBRARIES})
 target_compile_definitions(sunshine PUBLIC ${SUNSHINE_DEFINITIONS})
diff --git a/sunshine/config.cpp b/sunshine/config.cpp
index f8cc735d..b5082f59 100644
--- a/sunshine/config.cpp
+++ b/sunshine/config.cpp
@@ -20,7 +20,7 @@ using namespace std::literals;
 #define PRIVATE_KEY_FILE CA_DIR "/cakey.pem"
 #define CERTIFICATE_FILE CA_DIR "/cacert.pem"
 
-#define APPS_JSON_PATH SUNSHINE_ASSETS_DIR "/" APPS_JSON
+#define APPS_JSON_PATH SUNSHINE_CONFIG_DIR "/" APPS_JSON
 namespace config {
 
 namespace nv {
@@ -223,7 +223,7 @@ sunshine_t sunshine {
   {},                                   // Username
   {},                                   // Password
   {},                                   // Password Salt
-  SUNSHINE_ASSETS_DIR "/sunshine.conf", // config file
+  SUNSHINE_CONFIG_DIR "/sunshine.conf", // config file
   {},                                   // cmd args
   47989,
 };
@@ -573,6 +573,10 @@ int apply_flags(const char *line) {
 }
 
 void apply_config(std::unordered_map<std::string, std::string> &&vars) {
+  if(!fs::exists(stream.file_apps.c_str())) {
+      stream.file_apps = SUNSHINE_DEFAULT_DIR "/" APPS_JSON;
+  }
+
   for(auto &[name, val] : vars) {
     std::cout << "["sv << name << "] -- ["sv << val << ']' << std::endl;
   }
@@ -754,6 +758,10 @@ int parse(int argc, char *argv[]) {
     }
   }
 
+  if(!fs::exists(sunshine.config_file.c_str())) {
+      sunshine.config_file = SUNSHINE_DEFAULT_DIR "/sunshine.conf";
+  }
+
   auto vars = parse_config(read_file(sunshine.config_file.c_str()));
 
   for(auto &[name, value] : cmd_vars) {
diff --git a/sunshine/confighttp.cpp b/sunshine/confighttp.cpp
index b21c7571..a1ef32f5 100644
--- a/sunshine/confighttp.cpp
+++ b/sunshine/confighttp.cpp
@@ -250,7 +250,8 @@ void saveApp(resp_https_t response, req_https_t request) {
       fileTree.erase("apps");
       fileTree.push_back(std::make_pair("apps", newApps));
     }
-    pt::write_json(config::stream.file_apps, fileTree);
+    std::string sunshine_apps_path = SUNSHINE_CONFIG_DIR "/" APPS_JSON;
+    pt::write_json(sunshine_apps_path, fileTree);
   }
   catch(std::exception &e) {
     BOOST_LOG(warning) << "SaveApp: "sv << e.what();
@@ -360,7 +361,8 @@ void saveConfig(resp_https_t response, req_https_t request) {
 
       configStream << kv.first << " = " << value << std::endl;
     }
-    write_file(config::sunshine.config_file.c_str(), configStream.str());
+    std::string sunshine_config_path = SUNSHINE_CONFIG_DIR "/sunshine.conf";
+    write_file(sunshine_config_path.c_str(), configStream.str());
   }
   catch(std::exception &e) {
     BOOST_LOG(warning) << "SaveConfig: "sv << e.what();
@@ -512,4 +514,4 @@ void start() {
 
   tcp.join();
 }
-} // namespace confighttp
\ No newline at end of file
+} // namespace confighttp