diff --git a/build-scripts/drupal7/000-default.conf b/build-scripts/drupal7/000-default.conf
index 344b11dd523e565b6136bda059c32109f943602b..2f50054ee262fc198af7a484ff2e080d7b8bea3f 100644
--- a/build-scripts/drupal7/000-default.conf
+++ b/build-scripts/drupal7/000-default.conf
@@ -1,8 +1,8 @@
 <VirtualHost *:80>
       DocumentRoot /var/www/drupal7
       ServerAdmin webmaster@localhost
-      ServerName docker
-      Redirect permanent / https://docker/
+      ServerName localhost
+      Redirect permanent / https://localhost/
         <Directory />
             Options FollowSymLinks
             AllowOverride None
@@ -17,7 +17,7 @@
    <VirtualHost *:443>
       ServerAdmin webmaster@localhost
       DocumentRoot /var/www/drupal7
-      ServerName docker
+      ServerName localhost
       <Directory />
           Options FollowSymLinks
           AllowOverride None
diff --git a/build-scripts/drupal7/Dockerfile b/build-scripts/drupal7/Dockerfile
index dbae2f6bb2ecdd56e4c26b1a5651bc9636f5f219..9a80a26b88f0cc3fff70d40fef773fd929a7cdd6 100644
--- a/build-scripts/drupal7/Dockerfile
+++ b/build-scripts/drupal7/Dockerfile
@@ -107,8 +107,8 @@ RUN useradd -d /home/vagrant -ms /bin/bash -g root -G sudo -p vagrant vagrant
 # Replace the default site configuration with our own.
 COPY 000-default.conf /etc/apache2/sites-available/000-default.conf
 RUN a2enmod proxy_fcgi setenvif
-RUN a2enconf php5.6-fpm
-RUN service php5.6-fpm restart
+RUN a2enconf php7.1-fpm
+RUN service php7.1-fpm restart
 
 ## Make sure we are running php5.6
 RUN update-alternatives --set php /usr/bin/php7.1
@@ -119,7 +119,7 @@ RUN service apache2 restart
 RUN php -v
 
 ## Install Drupal.
-RUN drush dl -v -d drupal-7.61 --destination="/var/www" --drupal-project-rename="drupal7"
+RUN drush dl -v -d drupal-7.63 --destination="/var/www" --drupal-project-rename="drupal7"
 
 RUN	chown -R www-data:www-data /var/www/
 
@@ -140,36 +140,36 @@ RUN cd /var/www/drupal7 && \
     ln -s . fdsu4
 
 ## Create site folders for drupal multi-site
-RUN mkdir /var/www/drupal7/sites/docker.fdsu1
-RUN mkdir /var/www/drupal7/sites/docker.fdsu2
-RUN mkdir /var/www/drupal7/sites/docker.fdsu3
-RUN mkdir /var/www/drupal7/sites/docker.fdsu4
+RUN mkdir /var/www/drupal7/sites/localhost.fdsu1
+RUN mkdir /var/www/drupal7/sites/localhost.fdsu2
+RUN mkdir /var/www/drupal7/sites/localhost.fdsu3
+RUN mkdir /var/www/drupal7/sites/localhost.fdsu4
 
 ## Add module and file folders as well as copy the settings.php over for each site
-RUN mkdir /var/www/drupal7/sites/docker.fdsu1/files
-RUN mkdir /var/www/drupal7/sites/docker.fdsu1/modules
+RUN mkdir /var/www/drupal7/sites/localhost.fdsu1/files
+RUN mkdir /var/www/drupal7/sites/localhost.fdsu1/modules
 ## Create settings.php file
-COPY settings.conf /var/www/drupal7/sites/docker.fdsu1/settings.php
-RUN mkdir /var/www/drupal7/sites/docker.fdsu2/files
-RUN mkdir /var/www/drupal7/sites/docker.fdsu2/modules
+COPY settings.conf /var/www/drupal7/sites/localhost.fdsu1/settings.php
+RUN mkdir /var/www/drupal7/sites/localhost.fdsu2/files
+RUN mkdir /var/www/drupal7/sites/localhost.fdsu2/modules
 ## Create settings.php file
-COPY settings.conf /var/www/drupal7/sites/docker.fdsu2/settings.php
-RUN mkdir /var/www/drupal7/sites/docker.fdsu3/files
-RUN mkdir /var/www/drupal7/sites/docker.fdsu3/modules
+COPY settings.conf /var/www/drupal7/sites/localhost.fdsu2/settings.php
+RUN mkdir /var/www/drupal7/sites/localhost.fdsu3/files
+RUN mkdir /var/www/drupal7/sites/localhost.fdsu3/modules
 ## Create settings.php file
 COPY settings.conf /var/www/drupal7/sites/d7.fdsu3/settings.php
-RUN mkdir /var/www/drupal7/sites/docker.fdsu4/files
-RUN mkdir /var/www/drupal7/sites/docker.fdsu4/modules
+RUN mkdir /var/www/drupal7/sites/localhost.fdsu4/files
+RUN mkdir /var/www/drupal7/sites/localhost.fdsu4/modules
 ## Create settings.php file
-COPY settings.conf /var/www/drupal7/sites/docker.fdsu1/settings.php
-COPY settings.conf /var/www/drupal7/sites/docker.fdsu2/settings.php
-RUN cd /var/www/drupal7/sites/docker.fdsu2 && \
+COPY settings.conf /var/www/drupal7/sites/localhost.fdsu1/settings.php
+COPY settings.conf /var/www/drupal7/sites/localhost.fdsu2/settings.php
+RUN cd /var/www/drupal7/sites/localhost.fdsu2 && \
     sed -i 's/fdsu1/fdsu2/g' settings.php
-COPY settings.conf /var/www/drupal7/sites/docker.fdsu3/settings.php
-RUN cd /var/www/drupal7/sites/docker.fdsu3 && \
+COPY settings.conf /var/www/drupal7/sites/localhost.fdsu3/settings.php
+RUN cd /var/www/drupal7/sites/localhost.fdsu3 && \
     sed -i 's/fdsu1/fdsu3/g' settings.php
-COPY settings.conf /var/www/drupal7/sites/docker.fdsu4/settings.php
-RUN cd /var/www/drupal7/sites/docker.fdsu4 && \
+COPY settings.conf /var/www/drupal7/sites/localhost.fdsu4/settings.php
+RUN cd /var/www/drupal7/sites/localhost.fdsu4 && \
     sed -i 's/fdsu1/fdsu4/g' settings.php
 
 ## Get the base profile from git
@@ -181,7 +181,7 @@ RUN ls /var/www/drupal7/profiles/uw_base_profile
 RUN /var/www/drupal7/profiles/uw_base_profile/rebuild.sh
 
 ## Add the Servername to the apache2 conf file.
-## RUN echo "ServerName docker" >> /etc/apache2/apache2.conf
+## RUN echo "ServerName localhost" >> /etc/apache2/apache2.conf
 
 # Copy our custom entrypoint and make it executable.
 COPY docker-entrypoint-d7.sh /usr/local/bin/
diff --git a/build-scripts/drupal7/settings.conf b/build-scripts/drupal7/settings.conf
index b482f18560d59174bf3d6299da88dce981df21a1..b536bf588ad24b071d2158000d53875a9a8fa0a8 100644
--- a/build-scripts/drupal7/settings.conf
+++ b/build-scripts/drupal7/settings.conf
@@ -1,7 +1,7 @@
 <?php
 
 // Server domain name.
-$UWhost = 'docker:4443';
+$UWhost = 'localhost:4443';
 // Path to site root.
 $UWpref = 'fdsu1';
 // Name of site database.
@@ -17,8 +17,8 @@ require_once(DRUPAL_ROOT . '/profiles/uw_base_profile/drupal-settings.php');
 
 // File system.
 $conf['file_default_scheme'] = 'public';
-$conf['file_private_path'] = '/var/www/drupal7/sites/docker.fdsu1/files/private/';
-$conf['file_public_path'] = '/var/www/drupal7/sites/docker.fdsu1/files';
-$conf['file_temporary_path'] = '/var/www/drupal7/sites/docker.fdsu1/files/temp/';
+$conf['file_private_path'] = '/var/www/drupal7/sites/localhost.fdsu1/files/private/';
+$conf['file_public_path'] = '/var/www/drupal7/sites/localhost.fdsu1/files';
+$conf['file_temporary_path'] = '/var/www/drupal7/sites/localhost.fdsu1/files/temp/';
 unset ($conf['file_chmod_directory']);
 unset ($conf['file_chmod_file']);
\ No newline at end of file
diff --git a/build-scripts/drupal8/000-default.conf b/build-scripts/drupal8/000-default.conf
index 3fda60a644384568c80dc1e61155543d09a89b6e..63af20429f89dafc7bdee6e1513cb5ce0d7ab750 100644
--- a/build-scripts/drupal8/000-default.conf
+++ b/build-scripts/drupal8/000-default.conf
@@ -1,8 +1,8 @@
 <VirtualHost *:80>
       DocumentRoot /var/www/drupal8
       ServerAdmin webmaster@localhost
-      ServerName docker
-      Redirect permanent / https://docker/
+      ServerName localhost
+      Redirect permanent / https://localhost/
         <Directory />
             Options FollowSymLinks
             AllowOverride None
@@ -17,7 +17,7 @@
    <VirtualHost *:443>
       ServerAdmin webmaster@localhost
       DocumentRoot /var/www/drupal8
-      ServerName docker
+      ServerName localhost
       <Directory />
           Options FollowSymLinks
           AllowOverride None
diff --git a/build-scripts/drupal8/Dockerfile b/build-scripts/drupal8/Dockerfile
index 385bd233b115f457e6f30b82c3cb73adbfd486f6..82218ffa160bb87799714a139384dcb2b6109a70 100644
--- a/build-scripts/drupal8/Dockerfile
+++ b/build-scripts/drupal8/Dockerfile
@@ -128,7 +128,7 @@ ENV APACHE_PID_FILE /var/run/apache2.pid
 
 
 # Clone Drupal
-RUN drush dl -v -d drupal-8.6.1 --destination="/var/www" --drupal-project-rename="drupal8"
+RUN drush dl -v -d drupal-8.6.7 --destination="/var/www" --drupal-project-rename="drupal8"
 RUN echo "Cloned Drupal 8...."
 
 # Clone our WCMS profile
@@ -150,47 +150,47 @@ RUN cd /var/www/drupal8 && \
 ## Copy the sites.php file to the Drupal 8 sites folder.
 COPY sites.php /var/www/drupal8/sites 
 
-RUN mkdir /var/www/drupal8/sites/docker.fdsu1 
-RUN mkdir /var/www/drupal8/sites/docker.fdsu1/files 
-RUN mkdir /var/www/drupal8/sites/docker.fdsu1/files/temp
-RUN mkdir /var/www/drupal8/sites/docker.fdsu1/modules
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu1 
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu1/files 
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu1/files/temp
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu1/modules
 ## Create settings.php file
-COPY settings.conf /var/www/drupal8/sites/docker.fdsu1/settings.php
-RUN mkdir /var/www/drupal8/sites/docker.fdsu2 
-RUN mkdir /var/www/drupal8/sites/docker.fdsu2/files
-RUN mkdir /var/www/drupal8/sites/docker.fdsu2/files/temp
-RUN mkdir /var/www/drupal8/sites/docker.fdsu2/modules
+COPY settings.conf /var/www/drupal8/sites/localhost.fdsu1/settings.php
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu2 
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu2/files
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu2/files/temp
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu2/modules
 ## Create settings.php file
-COPY settings.conf /var/www/drupal8/sites/docker.fdsu2/settings.php
+COPY settings.conf /var/www/drupal8/sites/localhost.fdsu2/settings.php
 ## Change sitename to match site
-RUN cd /var/www/drupal8/sites/docker.fdsu2 && \
+RUN cd /var/www/drupal8/sites/localhost.fdsu2 && \
     sed -i 's/fdsu1/fdsu2/g' settings.php
-RUN mkdir /var/www/drupal8/sites/docker.fdsu3
-RUN mkdir /var/www/drupal8/sites/docker.fdsu3/files
-RUN mkdir /var/www/drupal8/sites/docker.fdsu3/files/temp
-RUN mkdir /var/www/drupal8/sites/docker.fdsu3/modules
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu3
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu3/files
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu3/files/temp
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu3/modules
 ## Create settings.php file
-COPY settings.conf /var/www/drupal8/sites/docker.fdsu3/settings.php
+COPY settings.conf /var/www/drupal8/sites/localhost.fdsu3/settings.php
 ## Change sitename to match site
-RUN cd /var/www/drupal8/sites/docker.fdsu3 && \
+RUN cd /var/www/drupal8/sites/localhost.fdsu3 && \
     sed -i 's/fdsu1/fdsu3/g' settings.php
-RUN mkdir /var/www/drupal8/sites/docker.fdsu4
-RUN mkdir /var/www/drupal8/sites/docker.fdsu4/files
-RUN mkdir /var/www/drupal8/sites/docker.fdsu4/files/temp
-RUN mkdir /var/www/drupal8/sites/docker.fdsu4/modules
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu4
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu4/files
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu4/files/temp
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu4/modules
 ## Create settings.php file
-COPY settings.conf /var/www/drupal8/sites/docker.fdsu4/settings.php
+COPY settings.conf /var/www/drupal8/sites/localhost.fdsu4/settings.php
 ## Change sitename to match site
-RUN cd /var/www/drupal8/sites/docker.fdsu4 && \
+RUN cd /var/www/drupal8/sites/localhost.fdsu4 && \
     sed -i 's/fdsu1/fdsu4/g' settings.php
-RUN mkdir /var/www/drupal8/sites/docker.fdsu1/files/config_acqTmp && \
-    mkdir /var/www/drupal8/sites/docker.fdsu1/files/config_acqTmp/sync
-RUN mkdir /var/www/drupal8/sites/docker.fdsu2/files/config_acqTmp && \
-    mkdir /var/www/drupal8/sites/docker.fdsu2/files/config_acqTmp/sync
-RUN mkdir /var/www/drupal8/sites/docker.fdsu3/files/config_acqTmp && \
-    mkdir /var/www/drupal8/sites/docker.fdsu3/files/config_acqTmp/sync
-RUN mkdir /var/www/drupal8/sites/docker.fdsu4/files/config_acqTmp && \
-    mkdir /var/www/drupal8/sites/docker.fdsu4/files/config_acqTmp/sync
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu1/files/config_acqTmp && \
+    mkdir /var/www/drupal8/sites/localhost.fdsu1/files/config_acqTmp/sync
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu2/files/config_acqTmp && \
+    mkdir /var/www/drupal8/sites/localhost.fdsu2/files/config_acqTmp/sync
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu3/files/config_acqTmp && \
+    mkdir /var/www/drupal8/sites/localhost.fdsu3/files/config_acqTmp/sync
+RUN mkdir /var/www/drupal8/sites/localhost.fdsu4/files/config_acqTmp && \
+    mkdir /var/www/drupal8/sites/localhost.fdsu4/files/config_acqTmp/sync
 
 # Add Drupal permissions to the drupal folder
 RUN chown -R vagrant:www-data /var/www/drupal8
diff --git a/build-scripts/drupal8/settings.conf b/build-scripts/drupal8/settings.conf
index 19c845a78e80b354d4f97fc1e02d32cd474f2035..56f9ae6f997c46e649700a8081778e2f795197f8 100644
--- a/build-scripts/drupal8/settings.conf
+++ b/build-scripts/drupal8/settings.conf
@@ -1,6 +1,6 @@
 <?php
 // Server domain name.
-$UWhost = 'docker:4444';
+$UWhost = 'localhost:4444';
 // Path to site root.
 $UWpref = 'fdsu1';
 // Name of site database.
@@ -16,17 +16,17 @@ require_once(DRUPAL_ROOT . '/profiles/uw_base_profile/drupal-settings.php');
 
 // File system settings.
 $settings['file_default_scheme'] = 'public';
-$settings['file_private_path'] = 'sites/docker.fdsu1/files/private/';
-$settings['file_public_path'] = 'sites/docker.fdsu1/files';
-$settings['file_temporary_path'] = 'sites/docker.fdsu1/files/temp/';
+$settings['file_private_path'] = 'sites/localhost.fdsu1/files/private/';
+$settings['file_public_path'] = 'sites/localhost.fdsu1/files';
+$settings['file_temporary_path'] = 'sites/localhost.fdsu1/files/temp/';
 $settings['file_chmod_directory'] = 02775;
 $settings['file_chmod_file'] = 0664;
 
 // D8 required settings.
 $settings['hash_salt'] = 'N2I1NDliYWNjNGJjYzUzODc0MDg3NTc2MTgwMGMyZTdhZGZiZGE5YTdkZGU4YTExMGZkNjhhMT';
 $settings['install_profile'] = 'uw_base_profile';
-$settings['trusted_host_patterns'] = ['^docker$',];
-$config_directories['sync'] = 'sites/docker.fdsu1/files/config_acqTmp/sync';
+$settings['trusted_host_patterns'] = ['^localhost$',];
+$config_directories['sync'] = 'sites/localhost.fdsu1/files/config_acqTmp/sync';
 if (file_exists(__DIR__ . '/settings.local.php')) {
     include __DIR__ . '/settings.local.php';
 }
\ No newline at end of file
diff --git a/build-scripts/drupal8/sites.php b/build-scripts/drupal8/sites.php
index 7d3c6e5325d6476a8bede0ee814bee3d903c6eac..f092b3f3a18f0c7d7a8c7c6b661fefae6b1a21be 100644
--- a/build-scripts/drupal8/sites.php
+++ b/build-scripts/drupal8/sites.php
@@ -1,8 +1,8 @@
 <?php
 
     $sites = array(
-        'docker.fdsu1' => 'fdsu1',
-        'docker.fdsu2' => 'fdsu2',
-        'docker.fdsu3' => 'fdsu3',
-        'docker.fdsu4' => 'fdsu4',
+        'docker1.fdsu1' => 'fdsu1',
+        'docker1.fdsu2' => 'fdsu2',
+        'docker1.fdsu3' => 'fdsu3',
+        'docker1.fdsu4' => 'fdsu4',
       );
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index aaca59dd60e781837e6802592bd2a071335275a4..1f2c1e2bdc0144a3b79d63cfcc485f2e757d6bf8 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -61,4 +61,5 @@ services:
       - portainer_data:/data
 
 volumes:
-  portainer_data:
\ No newline at end of file
+  portainer_data:
+ 
\ No newline at end of file