diff --git a/config/cis.config-default.inc.php b/config/cis.config-default.inc.php
index 3b89bfa47..b9dfc0459 100644
--- a/config/cis.config-default.inc.php
+++ b/config/cis.config-default.inc.php
@@ -20,7 +20,7 @@ date_default_timezone_set('Europe/Vienna');
 define("DB_SYSTEM","pgsql");
 define("DB_HOST","localhost");
 define("DB_PORT","5432");
-define("DB_NAME","fhctest");
+define("DB_NAME","fhcomplete");
 define("DB_USER","web");
 define("DB_PASSWORD","web");
 define("DB_CONNECT_PERSISTENT",TRUE);
diff --git a/config/system.config-default.inc.php b/config/system.config-default.inc.php
index 20382276b..85e8bd313 100644
--- a/config/system.config-default.inc.php
+++ b/config/system.config-default.inc.php
@@ -11,7 +11,7 @@
 	define("DB_SYSTEM","pgsql");
 	define("DB_HOST","localhost");
 	define("DB_PORT","5432");
-	define("DB_NAME","fhctest");
+	define("DB_NAME","fhcomplete");
 	define("DB_USER","fhcomplete");
 	define("DB_PASSWORD","fhcomplete");
 	define("DB_CONNECT_PERSISTENT",FALSE);
diff --git a/config/vilesci.config-default.inc.php b/config/vilesci.config-default.inc.php
index 48a412148..c7c240589 100644
--- a/config/vilesci.config-default.inc.php
+++ b/config/vilesci.config-default.inc.php
@@ -20,7 +20,7 @@ date_default_timezone_set('Europe/Vienna');
 define("DB_SYSTEM","pgsql");
 define("DB_HOST","localhost");
 define("DB_PORT","5432");
-define("DB_NAME","fhctest");
+define("DB_NAME","fhcomplete");
 define("DB_USER","vilesci");
 define("DB_PASSWORD","vilesci");
 define("DB_CONNECT_PERSISTENT",TRUE);
diff --git a/config/wawi.config-default.inc.php b/config/wawi.config-default.inc.php
index 05d257c2f..bed069e39 100644
--- a/config/wawi.config-default.inc.php
+++ b/config/wawi.config-default.inc.php
@@ -21,8 +21,8 @@ define("DB_SYSTEM","pgsql");
 define("DB_HOST","localhost");
 define("DB_PORT","5432");
 define("DB_NAME","fhcomplete");
-define("DB_USER","user");
-define("DB_PASSWORD","password");
+define("DB_USER","wawi");
+define("DB_PASSWORD","wawi");
 define("DB_CONNECT_PERSISTENT",TRUE);
 define('CONN_CLIENT_ENCODING','UTF-8' );
 	
diff --git a/phpci.yml b/phpci.yml
index 04d408697..b6700a187 100644
--- a/phpci.yml
+++ b/phpci.yml
@@ -22,11 +22,8 @@ setup:
     shell:
         - "rm -f /var/www/html/build" # Remove the previous soft link, if exists, to the build directory
         - "ln -s %BUILD_PATH% /var/www/html/build" # Create a new soft link to the actual build directory
-        # Rename configuration files
-        - "cd %BUILD_PATH% && cp ./config/global.config-default.inc.php ./config/global.config.inc.php"
-        - "cd %BUILD_PATH% && cp ./config/cis.config-default.inc.php ./config/cis.config.inc.php"
-        - "cd %BUILD_PATH% && cp ./config/vilesci.config-default.inc.php ./config/vilesci.config.inc.php"
-        - "cd %BUILD_PATH% && cp ./config/system.config-default.inc.php ./config/system.config.inc.php"
+        # Copies configuration files
+        - "cp /home/phpci/config/* %BUILD_PATH%/config/"
         - "cd %BUILD_PATH% && php index.ci.php DBTools migrate" # Install Database
 test:
     lint: