diff --git a/Dockerfile b/Dockerfile
index 09d6123..37907d2 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -62,7 +62,7 @@ RUN $CKAN_HOME/bin/paster make-config ckan ${CKAN_CONFIG}/${CONFIG_FILE}
 
 # Configure apache
 RUN a2dissite 000-default
-RUN echo "Listen 8080" > /etc/apache2/ports.conf
+RUN echo "Listen 80" > /etc/apache2/ports.conf
 COPY _etc/apache2/apache.wsgi $CKAN_CONFIG/apache.wsgi
 ONBUILD COPY _etc/apache2/apache.wsgi $CKAN_CONFIG/apache.wsgi
 COPY _etc/apache2/apache.conf /etc/apache2/sites-available/ckan_default.conf
@@ -91,7 +91,7 @@ ADD docker/ckan/svc/ /etc/service/
 CMD ["/sbin/my_init"]
 
 VOLUME ["/usr/lib/ckan", "/var/lib/ckan", "/etc/ckan"]
-EXPOSE 8080
+EXPOSE 80
 
 RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
diff --git a/Vagrantfile b/Vagrantfile
index adf5bfa..a3f890c 100755
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -75,7 +75,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       d.name = "ckan"
       d.ports = ["2222:22"]
       d.ports = ["5000:5000"]
-      d.ports = ["8080:8080"]
+      d.ports = ["8080:80"]
       d.link("postgres:postgres")
       d.link("solr:solr")
       d.link("datapusher:datapusher")
diff --git a/_etc/apache2/apache.conf b/_etc/apache2/apache.conf
index aa71a5c..4813abb 100755
--- a/_etc/apache2/apache.conf
+++ b/_etc/apache2/apache.conf
@@ -1,4 +1,4 @@
-<VirtualHost 0.0.0.0:8080>
+<VirtualHost 0.0.0.0:80>
     ServerName ckan
     ServerAlias *
 
diff --git a/_service-provider/_datapusher/Dockerfile b/_service-provider/_datapusher/Dockerfile
index eb2b3b6..98cfd6d 100644
--- a/_service-provider/_datapusher/Dockerfile
+++ b/_service-provider/_datapusher/Dockerfile
@@ -26,5 +26,6 @@ RUN pip install pip==1.4.1
 RUN pip install -r $DATAPUSHER_HOME/src/datapusher/requirements.txt
 
 WORKDIR $DATAPUSHER_HOME/src/datapusher/
+EXPOSE 8800
 
 CMD [ "python", "datapusher/main.py", "deployment/datapusher_settings.py"]
diff --git a/docker/ckan/my_init.d/50_configure b/docker/ckan/my_init.d/50_configure
index c9c3962..ba1a087 100755
--- a/docker/ckan/my_init.d/50_configure
+++ b/docker/ckan/my_init.d/50_configure
@@ -22,7 +22,7 @@ write_config () {
   # update the config dynamic urls
   echo "Configuring dynamic URLs"
   "$CKAN_HOME"/bin/paster --plugin=ckan config-tool "$CONFIG" -e \
-      "ckan.site_url            = http://$(hostname -f):8080/" \
+      "ckan.site_url            = http://$(hostname -f)" \
       "sqlalchemy.url           = ${DATABASE_URL}" \
       "solr_url                 = ${SOLR_URL}" \
       "ckan.datastore.write_url = ${DATASTORE_WRITE_URL}" \
diff --git a/docker/nginx/nginx.conf b/docker/nginx/nginx.conf
index 393a4c6..6d1a524 100644
--- a/docker/nginx/nginx.conf
+++ b/docker/nginx/nginx.conf
@@ -39,7 +39,7 @@ http {
     client_max_body_size 100M;
 
     location / {
-      proxy_pass http://ckan:8080/;
+      proxy_pass http://ckan:80/;
       proxy_set_header X-Real-IP $remote_addr;
       proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
       proxy_set_header X-Forwarded-Proto $scheme;
diff --git a/fig.yml b/fig.yml
index ccff58c..32f1301 100755
--- a/fig.yml
+++ b/fig.yml
@@ -38,7 +38,7 @@ ckan:
   ports:
     - "2222:22"
     - "5000:5000"
-    - "8080:8080"
+    - "8080:80"
   links:
     - postgres:postgres
     - solr:solr