diff --git a/deployment/docker-compose.yml b/deployment/docker-compose.yml
index 7ca444f..cd67904 100644
--- a/deployment/docker-compose.yml
+++ b/deployment/docker-compose.yml
@@ -4,7 +4,7 @@ services:
   postgres:
     # Note you cannot scale if you use conteiner_name
     container_name: haitidata-postgres
-    image: kartoza/postgis:9.4-2.1
+    image: dimasciput/haitidata_nginx:latest
     volumes:
       - ./pg/postgres_data:/var/lib/postgresql
       - ./backups:/backups
diff --git a/deployment/docker-geoserver/entrypoint.sh b/deployment/docker-geoserver/entrypoint.sh
index 39c80cb..865436f 100644
--- a/deployment/docker-geoserver/entrypoint.sh
+++ b/deployment/docker-geoserver/entrypoint.sh
@@ -13,7 +13,7 @@ echo "Remove redundant library..."
 echo "Cleaning old cluster settings ..."
 rm -vf $CLUSTER_CONFIG_DIR/*
 
-export GEOSERVER_OPTS='-Djava.awt.headless=true -server -Xms16G -Xmx32G -Xrs -XX:PerfDataSamplingInterval=500 -Dorg.geotools.referencing.forceXY=true -XX:SoftRefLRUPolicyMSPerMB=36000 -XX:+UseParallelGC -XX:NewRatio=2 -XX:+CMSClassUnloadingEnabled'
+# export GEOSERVER_OPTS='-Djava.awt.headless=true -server -Xms16G -Xmx32G -Xrs -XX:PerfDataSamplingInterval=500 -Dorg.geotools.referencing.forceXY=true -XX:SoftRefLRUPolicyMSPerMB=36000 -XX:+UseParallelGC -XX:NewRatio=2 -XX:+CMSClassUnloadingEnabled'
 export CATALINA_OPTS='-DCLUSTER_CONFIG_DIR="$CLUSTER_CONFIG_DIR" -Dactivemq.base="$CLUSTER_CONFIG_DIR/tmp" -Dactivemq.transportConnectors.server.uri="tcp://0.0.0.0:0?maximumConnections=1000&wireFormat.maxFrameSize=104857600&jms.useAsyncSend=true&transport.daemon=true&trace=true"'
 export JAVA_OPTS=$GEOSERVER_OPTS
 
diff --git a/django_project/clip-and-ship/views.py b/django_project/clip-and-ship/views.py
index 84bfcd7..b2a3bcb 100644
--- a/django_project/clip-and-ship/views.py
+++ b/django_project/clip-and-ship/views.py
@@ -408,7 +408,7 @@ class ClipView(View):
             'geotiffname': geotiffname,
             'resource': {
                 'get_tiles_url': "%sgwc/service/gmaps?layers=geonode:%s&zoom={z}&x={x}&y={y}&format=image/png8" % (
-                    settings.GEOSERVER_PUBLIC_LOCATION,
+                    settings.GEOSERVER_DEV_LOCATION,
                     geotiffname
                 ),
                 'service_typename': 'geonode:' + geotiffname
diff --git a/django_project/core/settings/project.py b/django_project/core/settings/project.py
index b026268..423edef 100644
--- a/django_project/core/settings/project.py
+++ b/django_project/core/settings/project.py
@@ -10,6 +10,8 @@ GEOSERVER_PUBLIC_LOCATION = os.environ.get(
     os.environ.get('SITEURL') + 'api/geoserver/'
 )
 
+GEOSERVER_DEV_LOCATION = 'http://136.243.4.93:8080/geoserver/'
+
 # dynamic setting based on domain
 GEOSERVER_BASE_URL = os.environ.get(
     'GEOSERVER_BASE_URL',
diff --git a/django_project/core/templates/base/_resourcebase_snippet.html b/django_project/core/templates/base/_resourcebase_snippet.html
index 7af8e6d..da6c591 100644
--- a/django_project/core/templates/base/_resourcebase_snippet.html
+++ b/django_project/core/templates/base/_resourcebase_snippet.html
@@ -11,7 +11,7 @@
           <a href="{{ item.detail_url }}"><img ng-src="{{ item.thumbnail_url }}" /></a>
           <span ng-model="isUser" ng-init="isUser=['ciat','cnigs','dpc','european-union','fac-sciences-haiti','idb','ihsi','mairiedepap','marndr','prcu','undp-haiti']" ></span>
           <span ng-if="isUser.indexOf(item.owner__username) > -1">
-            <img class="cnigs-logo" ng-src="/uploaded/avatars/{{ item.owner__username }}/resized/240/{{ item.owner__username }}.png" />
+            <img class="cnigs-logo" ng-src="/media/avatars/{{ item.owner__username }}/resized/240/{{ item.owner__username }}.png" />
           </span>
         </div>
         <div class="col-xs-8 item-details">
diff --git a/django_project/core/templates/people/profile_detail.html b/django_project/core/templates/people/profile_detail.html
index 89f9115..d0ed854 100644
--- a/django_project/core/templates/people/profile_detail.html
+++ b/django_project/core/templates/people/profile_detail.html
@@ -30,7 +30,7 @@
 {% if user == profile %}
   {% for group in profile.group_list_all %}
   <div ng-if="group.logo != ''" class="col-xs-1 pull-right group-logo">
-    <a href="{{ group.get_absolute_url }}" ><img src="/uploaded/{{ group.logo }}" alt="{{ group.title }}" /></a>
+    <a href="{{ group.get_absolute_url }}" ><img src="/media/{{ group.logo }}" alt="{{ group.title }}" /></a>
   </div>
   <!-- <div class="col-xs-6 col-md-8">
     <h5>
@@ -42,7 +42,7 @@
 {% else %}
   {% for group in profile.group_list_public %}
   <div ng-if="group.logo != ''" class="col-xs-1 pull-right group-logo">
-    <a href="{{ group.get_absolute_url }}" ><img src="/uploaded/{{ group.logo }}" alt="{{ group.title }}" /></a>
+    <a href="{{ group.get_absolute_url }}" ><img src="/media/{{ group.logo }}" alt="{{ group.title }}" /></a>
   </div>
   <!-- <div class="col-xs-6 col-md-8">
     <h5>