diff --git a/tests/files/drupal8/web/sites/default/config/sync/.gitkeep b/tests/files/drupal8/config/sync/.gitkeep
similarity index 100%
rename from tests/files/drupal8/web/sites/default/config/sync/.gitkeep
rename to tests/files/drupal8/config/sync/.gitkeep
diff --git a/tests/files/drupal8/drush/drushrc.php b/tests/files/drupal8/drush/drushrc.php
index 54fd8e0d2c..59c951030c 100644
--- a/tests/files/drupal8/drush/drushrc.php
+++ b/tests/files/drupal8/drush/drushrc.php
@@ -1,17 +1,12 @@
 <?php
 /**
  * @file
- * amazee.io drushrc.php file
+ * Lagoon drushrc.php file
  *
- * This file tells drush about the amazee.io environment
- * It contains some defaults that the amazee.io team suggests, please edit them as required.
+ * This file tells drush about the Lagoon environment
+ * It contains some defaults that the Lagoon team suggests, please edit them as required.
  */
 
-### Base URL so Drush knows on which URL the site runs (needed for cron, etc.)
-if (getenv('AMAZEEIO_BASE_URL')) {
-  $options['uri'] = getenv('AMAZEEIO_BASE_URL');
-}
-
 ### Skip data for some tables during sql dumps and syncs
 # These tables will be syncronized just as structure and not the data inside them, this makes syncing and dumping much faster
 # In case you need these tables, call the 'sql-sync' or 'sql-dump' command with: --no-structure-tables-list
diff --git a/tests/files/drupal8/web/sites/default/all.settings.php b/tests/files/drupal8/web/sites/default/all.settings.php
index 7db86a2d3d..64c43d5b41 100755
--- a/tests/files/drupal8/web/sites/default/all.settings.php
+++ b/tests/files/drupal8/web/sites/default/all.settings.php
@@ -12,4 +12,4 @@
 // the Drupal root, which is protected by amazee.io nginx configs, so it cannot be read
 // via the browser. If your Drupal root is inside a subfolder (like 'web') you can put the config
 // folder outside this subfolder for an advanced security measure: '../config/sync'.
-$config_directories[CONFIG_SYNC_DIRECTORY] = 'sites/default/config/sync';
+$config_directories[CONFIG_SYNC_DIRECTORY] = '../config/sync';
diff --git a/tests/files/drupal8/web/sites/default/development.settings.php b/tests/files/drupal8/web/sites/default/development.settings.php
index a4e4432e98..6a5c56ac54 100755
--- a/tests/files/drupal8/web/sites/default/development.settings.php
+++ b/tests/files/drupal8/web/sites/default/development.settings.php
@@ -24,6 +24,6 @@
 $config['system.performance']['js']['preprocess'] = 0;
 
 // Stage file proxy URL from production URL
-if(getenv('AMAZEEIO_PRODUCTION_URL')){
-  $config['stage_file_proxy.settings']['origin'] = getenv('PRODUCTION_URL');
+if (getenv('LAGOON_PRODUCTION_URL')){
+  $config['stage_file_proxy.settings']['origin'] = getenv('LAGOON_PRODUCTION_URL');
 }
diff --git a/tests/files/drupal8/web/sites/default/settings.php b/tests/files/drupal8/web/sites/default/settings.php
index 97b94e55f3..0bf8bf893c 100755
--- a/tests/files/drupal8/web/sites/default/settings.php
+++ b/tests/files/drupal8/web/sites/default/settings.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * amazee.io Drupal 8 configuration file.
+ * Lagoon Drupal 8 configuration file.
  *
  * You should not edit this file, please use environment specific files!
  * They are loaded in this order:
@@ -25,7 +25,7 @@
  *
  */
 
-### amazee.io Database connection
+### Lagoon Database connection
 if(getenv('LAGOON')){
   $databases['default']['default'] = array(
     'driver' => 'mysql',
@@ -38,7 +38,7 @@
   );
 }
 
-### amazee.io Solr connection
+### Lagoon Solr connection
 // WARNING: you have to create a search_api server having "solr" machine name at
 // /admin/config/search/search-api/add-server to make this work.
 if (getenv('LAGOON')) {
@@ -53,16 +53,37 @@
   $config['search_api.server.solr']['name'] = 'Lagoon Solr - Environment: ' . getenv('LAGOON_PROJECT');
 }
 
-### amazee.io Varnish & Reverse proxy settings
+### Lagoon Redis connection
+if (getenv('LAGOON')){
+  $settings['redis.connection']['interface'] = 'PhpRedis';
+  $settings['redis.connection']['host'] = getenv('REDIS_HOST') ?: 'redis';
+  $settings['redis.connection']['port'] = getenv('REDIS_PORT') ?: '6379';
+
+  // # Do not set the cache during installations of Drupal
+  // if (!drupal_installation_attempted()) {
+  //   $settings['cache']['default'] = 'cache.backend.redis';
+  // }
+}
+
+### Lagoon Varnish & Reverse proxy settings
 if (getenv('LAGOON')) {
   $settings['reverse_proxy'] = TRUE;
+
+  $varnish_hosts = explode(',', getenv('VARNISH_HOSTS') ?: 'varnish');
+  array_walk($varnish_hosts, function(&$value, $key) { $value .= ':6082'; });
+
+  $config['varnish.settings']['varnish_control_terminal'] = implode($varnish_hosts, " ");
+  $config['varnish.settings']['varnish_control_key'] = getenv('VARNISH_SECRET') ?: 'lagoon_default_secret';
+  $config['varnish.settings']['varnish_version'] = 4;
 }
 
 ### Trusted Host Patterns, see https://www.drupal.org/node/2410395 for more information.
 ### If your site runs on multiple domains, you need to add these domains here
-//$settings['trusted_host_patterns'] = array(
-//  '^' . str_replace('.', '\.', getenv('ROUTE_URLS')) . '$',
-//);
+if (getenv('LAGOON_ROUTES')) {
+  $settings['trusted_host_patterns'] = array(
+    '^' . str_replace(['.', 'https://', 'http://', ','], ['\.', '', '', '|'], getenv('LAGOON_ROUTES')) . '$', // escape dots, remove schema, use commas as regex separator
+   );
+}
 
 ### Temp directory
 if (getenv('TMP')) {