diff --git a/env/django.env b/env/django.env
index 812323a4..5620aaae 100644
--- a/env/django.env
+++ b/env/django.env
@@ -1,7 +1,10 @@
 DATABASE_URL=postgis://docker:docker@postgis:5432/cartoview
 DATASTORE_DATABASE_URL=postgis://docker:docker@postgis:5432/cartoview_datastore
+GEOSERVER_WEB_UI_LOCATION=http://10.5.0.4/geoserver/
 GEOSERVER_PUBLIC_LOCATION=http://10.5.0.4/geoserver/
 GEOSERVER_LOCATION=http://geoserver:8080/geoserver/
+GEOSERVER_ADMIN_USER=admin
+GEOSERVER_ADMIN_PASSWORD=geoserver
 DEFAULT_BACKEND_UPLOADER=geonode.importer
 SITEURL=http://10.5.0.4/
 NGINX_LOCATION=http://nginx:80/
diff --git a/env/postgis.env b/env/postgis.env
index 762f5854..8883e479 100644
--- a/env/postgis.env
+++ b/env/postgis.env
@@ -3,3 +3,10 @@ POSTGRES_USER=docker
 POSTGRES_PASS=docker
 ALLOW_IP_RANGE=0.0.0.0/0
 POSTGRES_MULTIPLE_EXTENSIONS=postgis
+
+GEONODE_DATABASE=cartoview
+GEONODE_DATABASE_PASSWORD=cartoview
+GEONODE_GEODATABASE=cartoview_datastore
+GEONODE_GEODATABASE_PASSWORD=cartoview_datastore
+GEONODE_DATABASE_SCHEMA=public
+GEONODE_GEODATABASE_SCHEMA=public
diff --git a/env/tomcat.env b/env/tomcat.env
index 509520e4..0b527be8 100644
--- a/env/tomcat.env
+++ b/env/tomcat.env
@@ -1 +1,26 @@
-GEOSERVER_JAVA_OPTS=-Djava.awt.headless=true -XX:MaxPermSize=512m -XX:PermSize=256m -Xms512m -Xmx2048m -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 -Dfile.encoding=UTF8 -Duser.timezone=GMT -Djavax.servlet.request.encoding=UTF-8 -Djavax.servlet.response.encoding=UTF-8 -Duser.timezone=GMT -Dorg.geotools.shapefile.datetime=true
+DATABASE_HOST=postgis
+DATABASE_PORT=5432
+
+GEONODE_DATABASE=cartoview
+GEONODE_DATABASE_PASSWORD=cartoview
+GEONODE_GEODATABASE=cartoview_datastore
+GEONODE_GEODATABASE_PASSWORD=cartoview_datastore
+GEONODE_DATABASE_SCHEMA=public
+GEONODE_GEODATABASE_SCHEMA=public
+
+GEOSERVER_WEB_UI_LOCATION=http://10.5.0.4/geoserver/
+GEOSERVER_PUBLIC_LOCATION=http://10.5.0.4/geoserver/
+GEOSERVER_LOCATION=http://geoserver:8080/geoserver/
+GEOSERVER_ADMIN_USER=admin
+GEOSERVER_ADMIN_PASSWORD=geoserver
+
+OGC_REQUEST_TIMEOUT=30
+OGC_REQUEST_MAX_RETRIES=1
+OGC_REQUEST_BACKOFF_FACTOR=0.3
+OGC_REQUEST_POOL_MAXSIZE=10
+OGC_REQUEST_POOL_CONNECTIONS=10
+
+# Java Options & Memory
+ENABLE_JSONP=true
+outFormat=text/javascript
+GEOSERVER_JAVA_OPTS=-Djava.awt.headless=true -Xms2G -Xmx4G -XX:+UnlockDiagnosticVMOptions -XX:+LogVMOutput -XX:LogFile=/var/log/jvm.log -XX:PerfDataSamplingInterval=500 -XX:SoftRefLRUPolicyMSPerMB=36000 -XX:-UseGCOverheadLimit -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:ParallelGCThreads=4 -Dfile.encoding=UTF8 -Djavax.servlet.request.encoding=UTF-8 -Djavax.servlet.response.encoding=UTF-8 -Duser.timezone=GMT -Dorg.geotools.shapefile.datetime=false -DGEOSERVER_CSRF_DISABLED=true -DPRINT_BASE_URL=http://geoserver:8080/geoserver/pdf -DALLOW_ENV_PARAMETRIZATION=true -Xbootclasspath/a:/usr/local/tomcat/webapps/geoserver/WEB-INF/lib/marlin-0.9.3-Unsafe.jar -Dsun.java2d.renderer=org.marlin.pisces.MarlinRenderingEngine