diff --git a/application/docker/.placeholder b/application/docker/.placeholder
deleted file mode 100644
index e69de29bb..000000000
diff --git a/install/includes/core_class.php b/install/includes/core_class.php
index 6b67f6f18..f0d29a738 100644
--- a/install/includes/core_class.php
+++ b/install/includes/core_class.php
@@ -112,8 +112,8 @@ class Core
 		$template_path 	= 'config/database.php';
 		$output_path 	= $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/config/database.php';
 		if (isset($_ENV['CI_ENV'])) {
-			$template_path  = $_ENV['CI_ENV'].'/database.php';
-			$output_path 	= $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/'.$_ENV['CI_ENV'].'/database.php';
+			$template_path  = 'config/'.$_ENV['CI_ENV'].'/database.php';
+			$output_path 	= $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/config/'.$_ENV['CI_ENV'].'/database.php';
 		}
 
 		// Open the file
@@ -154,8 +154,8 @@ class Core
 		$template_path 	= 'config/config.php';
 		$output_path 	= $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/config/config.php';
 		if (isset($_ENV['CI_ENV'])) {
-			$template_path  = $_ENV['CI_ENV'].'/config.php';
-			$output_path 	= $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/'.$_ENV['CI_ENV'].'/config.php';
+			$template_path  = 'config/'.$_ENV['CI_ENV'].'/config.php';
+			$output_path 	= $_SERVER['DOCUMENT_ROOT'] . '/' . $data['directory'] . '/application/config/'.$_ENV['CI_ENV'].'/config.php';
 		}
 
 		// Open the file
diff --git a/install/index.php b/install/index.php
index bf57aeebf..f7bfe4830 100644
--- a/install/index.php
+++ b/install/index.php
@@ -25,7 +25,7 @@ if (file_exists('config_unattended.php')) {
 // Config Paths
 $db_config_path = '../application/config/';
 if (isset($_ENV['CI_ENV'])) {
-	$db_config_path ='../application/'.$_ENV['CI_ENV'].'/';
+	$db_config_path ='../application/config/'.$_ENV['CI_ENV'].'/';
 }
 $db_file_path = $db_config_path . "database.php";