diff --git a/application/config/config.php b/application/config/config.php
index aec765397..66d9bd4c6 100644
--- a/application/config/config.php
+++ b/application/config/config.php
@@ -358,7 +358,7 @@ $config['cache_query_string'] = FALSE;
 | https://codeigniter.com/user_guide/libraries/encryption.html
 |
 */
-$config['encryption_key'] = isset($_SERVER['ENCRYPTION_KEY']) ? $_SERVER['ENCRYPTION_KEY'] : '';
+$config['encryption_key'] = getenv('ENCRYPTION_KEY') ? getenv('ENCRYPTION_KEY') : '';
 
 /*
 |--------------------------------------------------------------------------
diff --git a/application/config/database.php b/application/config/database.php
index 5f0d883ff..9c07fa186 100644
--- a/application/config/database.php
+++ b/application/config/database.php
@@ -75,10 +75,10 @@ $query_builder = TRUE;
 
 $db['default'] = array(
 	'dsn'	=> '',
-	'hostname' => isset($_SERVER['DB_HOSTNAME']) ? $_SERVER['DB_HOSTNAME'] : '',
-	'username' => isset($_SERVER['DB_USERNAME']) ? $_SERVER['DB_USERNAME'] : '',
-	'password' => isset($_SERVER['DB_PASSWORD']) ? $_SERVER['DB_PASSWORD'] : '',
-	'database' => isset($_SERVER['DB_DATABASE']) ? $_SERVER['DB_DATABASE'] : '',
+	'hostname' => getenv('DB_HOSTNAME') ? getenv('DB_HOSTNAME') : '',
+	'username' => getenv('DB_USERNAME') ? getenv('DB_USERNAME') : '',
+	'password' => getenv('DB_PASSWORD') ? getenv('DB_PASSWORD') : '',
+	'database' => getenv('DB_DATABASE') ? getenv('DB_DATABASE') : '',
 	'dbdriver' => 'mysqli',
 	'dbprefix' => 'ospos_',
 	'pconnect' => FALSE,