diff --git a/codeception.yml b/codeception.yml
index 832956818..3296dc183 100644
--- a/codeception.yml
+++ b/codeception.yml
@@ -29,7 +29,7 @@ modules:
 coverage:
     enabled: true
     remote: true
-    c3_url: 'http://zed.de.spryker.dev'
+    c3_url: 'http://zed.de.project.local'
     whitelist: { include: ['src/*.php'] }
 
 extensions:
diff --git a/config/Shared/config_default-development_DE.php b/config/Shared/config_default-development_DE.php
index 5d2eabffa..62574c62d 100644
--- a/config/Shared/config_default-development_DE.php
+++ b/config/Shared/config_default-development_DE.php
@@ -6,6 +6,7 @@
 use Spryker\Shared\Propel\PropelConstants;
 use Spryker\Shared\Session\SessionConstants;
 
+
 $config[PropelConstants::ZED_DB_USERNAME] = 'development';
 $config[PropelConstants::ZED_DB_PASSWORD] = 'mate20mg';
 $config[PropelConstants::ZED_DB_DATABASE] = 'DE_development_zed';
@@ -13,7 +14,7 @@
 $config[PropelConstants::ZED_DB_ENGINE] = $config[PropelConstants::ZED_DB_ENGINE_PGSQL];
 $config[PropelConstants::ZED_DB_PORT] = 5432;
 
-$yvesHost = 'www.de.spryker.dev';
+$yvesHost = 'www.de.project.local';
 $config[ApplicationConstants::HOST_YVES] = 'http://' . $yvesHost;
 $config[ApplicationConstants::HOST_STATIC_ASSETS] = $config[ApplicationConstants::HOST_STATIC_MEDIA] = $yvesHost;
 $config[SessionConstants::YVES_SESSION_COOKIE_DOMAIN] = $yvesHost;
@@ -21,7 +22,7 @@
 $config[ApplicationConstants::HOST_SSL_YVES] = 'https://' . $yvesHost;
 $config[ApplicationConstants::HOST_SSL_STATIC_ASSETS] = $config[ApplicationConstants::HOST_SSL_STATIC_MEDIA] = $yvesHost;
 
-$zedHost = 'zed.de.spryker.dev';
+$zedHost = 'zed.de.project.local';
 $config[ApplicationConstants::HOST_ZED_GUI]
     = 'http://' . $zedHost;
 $config[ApplicationConstants::HOST_ZED_API] = $zedHost;
@@ -32,8 +33,8 @@
 $config[SessionConstants::ZED_SESSION_COOKIE_NAME] = $zedHost;
 $config[SessionConstants::ZED_SESSION_COOKIE_SECURE] = false;
 
-$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.de.spryker.dev';
-$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.de.spryker.dev';
+$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.project.local';
+$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.project.local';
 
 $config[ApplicationConstants::JENKINS_BASE_URL] = 'http://localhost:10007/';
 $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':1080';
diff --git a/config/Shared/config_default-development_US.php b/config/Shared/config_default-development_US.php
index 9e3108d46..d4c200c49 100644
--- a/config/Shared/config_default-development_US.php
+++ b/config/Shared/config_default-development_US.php
@@ -3,14 +3,14 @@
 use Spryker\Shared\Application\ApplicationConstants;
 use Spryker\Shared\Mail\MailConstants;
 
-$yvesHost = 'www.com.spryker.dev';
+$yvesHost = 'www.com.project.local';
 $config[ApplicationConstants::HOST_YVES] = 'http://' . $yvesHost;
 $config[ApplicationConstants::HOST_STATIC_ASSETS] = $config[ApplicationConstants::HOST_STATIC_MEDIA] = $yvesHost;
 
 $config[ApplicationConstants::HOST_SSL_YVES] = 'https://' . $yvesHost;
 $config[ApplicationConstants::HOST_SSL_STATIC_ASSETS] = $config[ApplicationConstants::HOST_SSL_STATIC_MEDIA] = $yvesHost;
 
-$zedHost = 'zed.com.spryker.dev';
+$zedHost = 'zed.com.project.local';
 $config[ApplicationConstants::HOST_ZED_GUI]
     = $config[ApplicationConstants::HOST_ZED_API]
     = 'http://' . $zedHost;
@@ -20,17 +20,17 @@
 
 $config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost];
 
-$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.com.spryker.dev';
-$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.com.spryker.dev';
+$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTP] = 'http://static.project.local';
+$config[ApplicationConstants::CLOUD_CDN_STATIC_MEDIA_HTTPS] = 'https://static.project.local';
 
 $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':1080';
 
 /* RabbitMQ */
 $config[ApplicationConstants::ZED_RABBITMQ_HOST] = 'localhost';
 $config[ApplicationConstants::ZED_RABBITMQ_PORT] = '5672';
-$config[ApplicationConstants::ZED_RABBITMQ_USERNAME] = 'DE_development';
+$config[ApplicationConstants::ZED_RABBITMQ_USERNAME] = 'US_development';
 $config[ApplicationConstants::ZED_RABBITMQ_PASSWORD] = 'mate20mg';
-$config[ApplicationConstants::ZED_RABBITMQ_VHOST] = '/DE_development_zed';
+$config[ApplicationConstants::ZED_RABBITMQ_VHOST] = '/US_development_zed';
 
 /* Elasticsearch */
 $config[ApplicationConstants::ELASTICA_PARAMETER__INDEX_NAME] = 'us_search';
diff --git a/config/Shared/config_default-test.ci.php b/config/Shared/config_default-devtest.ci.php
similarity index 100%
rename from config/Shared/config_default-test.ci.php
rename to config/Shared/config_default-devtest.ci.php
diff --git a/config/Shared/config_default-devtest.php b/config/Shared/config_default-devtest.php
new file mode 100644
index 000000000..58b42f3aa
--- /dev/null
+++ b/config/Shared/config_default-devtest.php
@@ -0,0 +1,44 @@
+<?php
+
+/**
+ * This is the global runtime configuration for Yves and Generated_Yves_Zed in a development environment.
+ */
+
+use Spryker\Shared\Application\ApplicationConstants;
+use Spryker\Shared\Payone\PayoneConstants;
+use Spryker\Shared\Session\SessionConstants;
+use Spryker\Shared\Search\SearchConstants;
+use Spryker\Shared\Storage\StorageConstants;
+
+$config[SessionConstants::YVES_SESSION_SAVE_HANDLER] = SessionConstants::SESSION_HANDLER_REDIS;
+$config[SessionConstants::ZED_SESSION_SAVE_HANDLER] = SessionConstants::SESSION_HANDLER_FILE;
+
+$config[StorageConstants::STORAGE_REDIS_PROTOCOL] = 'tcp';
+$config[StorageConstants::STORAGE_REDIS_HOST] = '127.0.0.1';
+$config[StorageConstants::STORAGE_REDIS_PORT] = '10009';
+$config[StorageConstants::STORAGE_REDIS_PASSWORD] = '';
+$config[StorageConstants::STORAGE_REDIS_DATABASE] = 3;
+
+$config[SessionConstants::YVES_SESSION_REDIS_PROTOCOL] = $config[StorageConstants::STORAGE_REDIS_PROTOCOL];
+$config[SessionConstants::YVES_SESSION_REDIS_HOST] = $config[StorageConstants::STORAGE_REDIS_HOST];
+$config[SessionConstants::YVES_SESSION_REDIS_PORT] = $config[StorageConstants::STORAGE_REDIS_PORT];
+$config[SessionConstants::YVES_SESSION_REDIS_PASSWORD] = $config[StorageConstants::STORAGE_REDIS_PASSWORD];
+$config[SessionConstants::YVES_SESSION_REDIS_DATABASE] = 4;
+
+$config[SessionConstants::ZED_SESSION_REDIS_PROTOCOL] = $config[SessionConstants::YVES_SESSION_REDIS_PROTOCOL];
+$config[SessionConstants::ZED_SESSION_REDIS_HOST] = $config[SessionConstants::YVES_SESSION_REDIS_HOST];
+$config[SessionConstants::ZED_SESSION_REDIS_PORT] = $config[SessionConstants::YVES_SESSION_REDIS_PORT];
+$config[SessionConstants::ZED_SESSION_REDIS_PASSWORD] = $config[SessionConstants::YVES_SESSION_REDIS_PASSWORD];
+
+$config[SessionConstants::SESSION_IS_TEST] = false;
+
+$config[PayoneConstants::PAYONE] = [
+    PayoneConstants::PAYONE_MODE => '',
+];
+
+$config[ApplicationConstants::JENKINS_BASE_URL] = 'http://' . $config[ApplicationConstants::HOST_ZED_GUI] . ':10007/jenkins';
+$config[ApplicationConstants::JENKINS_DIRECTORY] = '/data/shop/development/shared/data/common/jenkins';
+
+$config[ApplicationConstants::APPLICATION_SPRYKER_ROOT] = APPLICATION_ROOT_DIR . '/vendor/spryker/spryker/Bundles';
+
+$config[SearchConstants::SEARCH_INDEX_NAME_SUFFIX] = '_devtest';
diff --git a/config/Shared/config_default-test.php b/config/Shared/config_default-devtest_DE.php
similarity index 96%
rename from config/Shared/config_default-test.php
rename to config/Shared/config_default-devtest_DE.php
index 905b27403..05397f0f0 100644
--- a/config/Shared/config_default-test.php
+++ b/config/Shared/config_default-devtest_DE.php
@@ -11,8 +11,8 @@
 use Spryker\Shared\Session\SessionConstants;
 use Spryker\Shared\Storage\StorageConstants;
 
-$zedHost = 'zed.de.spryker.test';
-$yvesHost = 'www.de.spryker.test';
+$zedHost = 'zed-test.de.project.local';
+$yvesHost = 'www-test.de.project.local';
 
 $config[PropelConstants::ZED_DB_ENGINE] = $config[PropelConstants::ZED_DB_ENGINE_PGSQL];
 $config[PropelConstants::ZED_DB_USERNAME] = 'development';
@@ -45,6 +45,8 @@
 $config[SessionConstants::ZED_SESSION_REDIS_PORT] = $config[SessionConstants::YVES_SESSION_REDIS_PORT];
 $config[SessionConstants::ZED_SESSION_REDIS_PASSWORD] = $config[SessionConstants::YVES_SESSION_REDIS_PASSWORD];
 
+$config[ApplicationConstants::YVES_TRUSTED_HOSTS] = [$yvesHost, $zedHost];
+
 $config[SessionConstants::SESSION_IS_TEST] = (bool)getenv("SESSION_IS_TEST");
 
 $config[PayoneConstants::PAYONE] = [
@@ -79,3 +81,6 @@
 $config[ApplicationConstants::HOST_SSL_YVES] = 'https://' . $yvesHost;
 $config[ApplicationConstants::HOST_SSL_STATIC_ASSETS] = $config[ApplicationConstants::HOST_SSL_STATIC_MEDIA] = $yvesHost;
 $config[SessionConstants::ZED_SESSION_COOKIE_SECURE] = false;
+
+
+
diff --git a/deploy/setup/functions.sh b/deploy/setup/functions.sh
index d7da9c669..70db2dfab 100644
--- a/deploy/setup/functions.sh
+++ b/deploy/setup/functions.sh
@@ -131,7 +131,7 @@ function installDemoshop {
     configureCodeception
 
     successText "Setup successful"
-    infoText "\nYves URL: http://www.de.spryker.dev/\nZed URL: http://zed.de.spryker.dev/\n"
+    infoText "\nYves URL: http://www.de.project.local/\nZed URL: http://zed.de.project.local/\n"
 }
 
 function installZed {
diff --git a/setup b/setup
index dab5a56c2..2b6ad720b 100755
--- a/setup
+++ b/setup
@@ -5,6 +5,8 @@ set -o pipefail
 . deploy/setup/params.sh
 . deploy/setup/functions.sh
 
+export APPLICATION_ENV='development'
+
 warningText "This script should be used only in development and NEVER IN PRODUCTION"
 
 if [ $# -eq 0 ]; then
diff --git a/setup_test b/setup_test
index cdf8d6299..4af9fe634 100755
--- a/setup_test
+++ b/setup_test
@@ -6,7 +6,7 @@ set -o pipefail
 
 ELASTIC_SEARCH_INDEX='de_search_test'
 
-export APPLICATION_ENV='test'
+export APPLICATION_ENV='devtest'
 
 . deploy/setup/functions.sh