diff --git a/README.md b/README.md
index e923bf2..31e3b6e 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@ This repository will contain orchestration files and documentation for using the
 At the moment only the archives of the orchestration/documentation will be added here. Over the next releases the actual 
 content will also live here.
 
-## Location of hub-docker 3.6.0 archive: 
+## Location of hub-docker 3.6.1 archive: 
 
-https://github.com/blackducksoftware/hub/raw/master/archives/hub-docker-3.6.0.tar
+https://github.com/blackducksoftware/hub/raw/master/archives/hub-docker-3.6.1.tar
 
 ## Location of Docker Hub images:
 
@@ -38,4 +38,3 @@ This is the minimum hardware that is needed to run a single instance of each con
 
 * 4 CPUs
 * 16 GB RAM (or 15GB if you're constrained running on AWS or other cloud providers)
-
diff --git a/docker-compose/bin/hub_db_migrate.sh b/docker-compose/bin/hub_db_migrate.sh
index 948bba0..e1ceb02 100755
--- a/docker-compose/bin/hub_db_migrate.sh
+++ b/docker-compose/bin/hub_db_migrate.sh
@@ -13,7 +13,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_VERSION=${HUB_VERSION:-3.6.0}
+HUB_VERSION=${HUB_VERSION:-3.6.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 
 function fail() {
diff --git a/docker-compose/bin/hub_reportdb_changepassword.sh b/docker-compose/bin/hub_reportdb_changepassword.sh
index 7dc77be..857fe2d 100755
--- a/docker-compose/bin/hub_reportdb_changepassword.sh
+++ b/docker-compose/bin/hub_reportdb_changepassword.sh
@@ -3,7 +3,7 @@
 set -e
 
 TIMEOUT=${TIMEOUT:-10}
-HUB_VERSION=${HUB_VERSION:-3.6.0}
+HUB_VERSION=${HUB_VERSION:-3.6.1}
 HUB_DATABASE_IMAGE_NAME=${HUB_DATABASE_IMAGE_NAME:-postgres}
 
 function fail() {
diff --git a/docker-compose/docker-compose.dbmigrate.yml b/docker-compose/docker-compose.dbmigrate.yml
index 87f2255..31702d9 100644
--- a/docker-compose/docker-compose.dbmigrate.yml
+++ b/docker-compose/docker-compose.dbmigrate.yml
@@ -1,17 +1,17 @@
 version: '2.1'
 services:
   cfssl:
-    image: blackducksoftware/hub-cfssl:3.6.0
+    image: blackducksoftware/hub-cfssl:3.6.1
     volumes:
       - config-volume:/etc/cfssl
  
   logstash:
-    image: blackducksoftware/hub-logstash:3.6.0
+    image: blackducksoftware/hub-logstash:3.6.1
     volumes:
       - log-volume:/var/lib/logstash/data
 
   postgres:
-    image: blackducksoftware/hub-postgres:3.6.0
+    image: blackducksoftware/hub-postgres:3.6.1
     links:
       - cfssl
       - logstash
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
index 641e98c..756dfb5 100644
--- a/docker-compose/docker-compose.yml
+++ b/docker-compose/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.1'
 services:
   cfssl:
-    image: blackducksoftware/hub-cfssl:3.6.0
+    image: blackducksoftware/hub-cfssl:3.6.1
     volumes: ['config-volume:/etc/cfssl']
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'http://127.0.0.1:8888/api/v1/cfssl/scaninfo']
@@ -11,7 +11,7 @@ services:
     restart: always
     mem_limit: 512M
   logstash:
-    image: blackducksoftware/hub-logstash:3.6.0
+    image: blackducksoftware/hub-logstash:3.6.1
     volumes: ['log-volume:/var/lib/logstash/data']
     healthcheck:
       test: [CMD, /usr/local/bin/docker-healthcheck.sh, 'http://127.0.0.1:9600/']
@@ -21,7 +21,8 @@ services:
     restart: always
     mem_limit: 640M
   postgres:
-    image: blackducksoftware/hub-postgres:3.6.0
+    image: blackducksoftware/hub-postgres:3.6.1
+    ports: ['55436:5432']
     links: [cfssl, logstash]
     volumes: ['data-volume:/var/lib/postgresql/data']
     healthcheck:
@@ -32,7 +33,7 @@ services:
     restart: always
     mem_limit: 3072M
   registration:
-    image: blackducksoftware/hub-registration:3.6.0
+    image: blackducksoftware/hub-registration:3.6.1
     links: [logstash]
     volumes: ['config-volume:/opt/blackduck/hub/registration/config']
     env_file: hub-proxy.env
@@ -44,7 +45,7 @@ services:
     restart: always
     mem_limit: 640M
   zookeeper:
-    image: blackducksoftware/hub-zookeeper:3.6.0
+    image: blackducksoftware/hub-zookeeper:3.6.1
     links: [logstash]
     healthcheck:
       test: [CMD, zkServer.sh, status]
@@ -54,7 +55,7 @@ services:
     restart: always
     mem_limit: 384M
   solr:
-    image: blackducksoftware/hub-solr:3.6.0
+    image: blackducksoftware/hub-solr:3.6.1
     depends_on: [zookeeper]
     links: [logstash, zookeeper]
     healthcheck:
@@ -65,7 +66,7 @@ services:
     restart: always
     mem_limit: 640M
   webapp:
-    image: blackducksoftware/hub-webapp:3.6.0
+    image: blackducksoftware/hub-webapp:3.6.1
     links: [cfssl, logstash, postgres, registration, zookeeper, solr]
     volumes: ['log-volume:/opt/blackduck/hub/logs']
     env_file: hub-proxy.env
@@ -78,7 +79,7 @@ services:
     restart: always
     mem_limit: 3584M
   jobrunner:
-    image: blackducksoftware/hub-jobrunner:3.6.0
+    image: blackducksoftware/hub-jobrunner:3.6.1
     links: [cfssl, logstash, postgres, registration, zookeeper, solr]
     env_file: hub-proxy.env
     healthcheck:
@@ -90,7 +91,7 @@ services:
     restart: always
     mem_limit: 4608M
   webserver:
-    image: blackducksoftware/hub-nginx:3.6.0
+    image: blackducksoftware/hub-nginx:3.6.1
     ports: ['443:443']
     env_file: hub-webserver.env
     links: [webapp, cfssl]
diff --git a/docker-compose/hub-webserver.env b/docker-compose/hub-webserver.env
index 32990c6..ac2d3ec 100644
--- a/docker-compose/hub-webserver.env
+++ b/docker-compose/hub-webserver.env
@@ -1,4 +1,4 @@
- # This should be the real host this will be served from so the certificate host name matches.
- # This is the default if none is specified, just takes the service name.
- # You should change this
- PUBLIC_HUB_WEBSERVER_HOST: hub-webserver
+# This should be the real host this will be served from so the certificate host name matches.
+# This is the default if none is specified, just takes the service name.
+# You should change this
+PUBLIC_HUB_WEBSERVER_HOST=localhost