diff --git a/cookbooks/colab/templates/01-apps.yaml.erb b/cookbooks/colab/templates/01-apps.yaml.erb
index e4c67c9..3fd7338 100644
--- a/cookbooks/colab/templates/01-apps.yaml.erb
+++ b/cookbooks/colab/templates/01-apps.yaml.erb
@@ -3,4 +3,4 @@ PROXIED_APPS:
   gitlab:
     upstream: 'http://<%= node['peers']['integration'] %>:81/gitlab/'
   noosfero:
-    upstream: 'http://<%= node['peers']['social'] %>:8080/social/'
+    upstream: 'http://<%= node['peers']['social'] %>:80/social/'
diff --git a/cookbooks/noosfero/templates/nginx.conf.erb b/cookbooks/noosfero/templates/nginx.conf.erb
index f1c6330..f24dace 100644
--- a/cookbooks/noosfero/templates/nginx.conf.erb
+++ b/cookbooks/noosfero/templates/nginx.conf.erb
@@ -7,8 +7,8 @@ upstream noosfero {
 }
 
 server {
-  listen *:8080;
-  server_name <%= node['config']['external_hostname'] %>;
+  listen *:80;
+  server_name <%= node['config']['external_hostname'] %> <%= node['peers']['social'] %>;
   underscores_in_headers  on;
   access_log            /var/log/nginx/noosfero.access.log;
   error_log             /var/log/nginx/noosfero.error.log;
diff --git a/test/noosfero_test.sh b/test/noosfero_test.sh
index 83ec272..4eb316e 100644
--- a/test/noosfero_test.sh
+++ b/test/noosfero_test.sh
@@ -14,12 +14,12 @@ test_noosfero_on_subdir() {
 }
 
 test_reverse_proxy_noosfero() {
-  local meta="$(run_on social curl-host softwarepublico.dev http://localhost:8080/social | sed -e '/noosfero:root/ !d; s/^\s*//')"
+  local meta="$(run_on social curl-host softwarepublico.dev http://localhost/social | sed -e '/noosfero:root/ !d; s/^\s*//')"
   assertEquals '<meta property="noosfero:root" content="/social"/>' "$meta"
 }
 
 test_reverse_proxy_static_files() {
-  local content_type="$(curl-host softwarepublico.dev --head http://$social:8080/social/images/noosfero-network.png | grep-header Content-Type)"
+  local content_type="$(curl-host softwarepublico.dev --head http://$social/social/images/noosfero-network.png | grep-header Content-Type)"
   assertEquals "Content-Type: image/png" "$content_type"
 }
 
--
libgit2 0.21.2