diff --git a/services/proxy/000-default.conf b/services/proxy/000-default.conf
index 77b0397a3a6a4179e850a5be63ae4db4c0bfa28b..2d703eb9b7325e6567e50bf2e386c398ed08f12a 100644
--- a/services/proxy/000-default.conf
+++ b/services/proxy/000-default.conf
@@ -9,8 +9,8 @@
     #ServerName www.example.com
 
     ServerAdmin webmaster@backfrontend
-    ProxyPass / http://cloud:8080/
-    ProxyPassReverse / http://cloud:8080/
+    ProxyPass / http://webapp:8080/
+    ProxyPassReverse / http://webapp:8080/
 
     # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
     # error, crit, alert, emerg.
@@ -18,8 +18,8 @@
     # modules, e.g.
     #LogLevel info ssl:warn
 
-    ErrorLog ${APACHE_LOG_DIR}/error.log
-    CustomLog ${APACHE_LOG_DIR}/access.log combined
+    #ErrorLog ${APACHE_LOG_DIR}/error.log
+    #CustomLog ${APACHE_LOG_DIR}/access.log combined
 
     # For most configuration files from conf-available/, which are
     # enabled or disabled at a global level, it is possible to
@@ -41,8 +41,8 @@
     #RewriteCond %{HTTP_HOST} !=localhost
     #RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
     
-    ProxyPass / http://cloud:8080/
-    ProxyPassReverse / http://cloud:8080/ 
+    ProxyPass / http://webapp:8080/
+    ProxyPassReverse / http://webapp:8080/ 
        
 </VirtualHost>
 
diff --git a/services/proxy/001-proxy.conf b/services/proxy/001-proxy.conf
index e5de80c5f868714faf28672c44c31de0903a90ed..052a1a6d6465dd65dad41c2b51348c467241ce75 100644
--- a/services/proxy/001-proxy.conf
+++ b/services/proxy/001-proxy.conf
@@ -24,71 +24,5 @@
     
 </VirtualHost>
 
-
-#---------------------------
-#  Localhost
-#---------------------------
-
-# Non-SSL 
-<VirtualHost *:80>
-
-    ServerName localhost
-    ProxyPass / http://webapp:8080/
-    ProxyPassReverse / http://webapp:8080/
-
-</VirtualHost>
-
-# SSL
-<VirtualHost *:443>
-
-    ServerName localhost
-     
-    SSLEngine on
-
-    SSLCertificateFile /root/certificates/rosetta_platform/rosetta_platform.crt
-    SSLCertificateKeyFile /root/certificates/rosetta_platform/rosetta_platform.key
-    SSLCACertificateFile /root/certificates/rosetta_platform/rosetta_platform.ca-bundle
-    #SSLCertificateFile  /etc/ssl/certs/ssl-cert-snakeoil.pem
-    #SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
-    #SSLCACertificateFile /etc/ssl/certs/ca-certificates.crt
-
-    ProxyPass / http://webapp:8080/
-    ProxyPassReverse / http://webapp:8080/
-
-</VirtualHost>
-
-
-#---------------------------
-#  Anything
-#---------------------------
-
-# Non-SSL 
-<VirtualHost *:80>
-
-    ProxyPass / http://webapp:8080/
-    ProxyPassReverse / http://webapp:8080/
-
-</VirtualHost>
-
-# SSL
-<VirtualHost *:443>
-  
-    SSLEngine on
-
-    SSLCertificateFile /root/certificates/rosetta_platform/rosetta_platform.crt
-    SSLCertificateKeyFile /root/certificates/rosetta_platform/rosetta_platform.key
-    SSLCACertificateFile /root/certificates/rosetta_platform/rosetta_platform.ca-bundle
-    #SSLCertificateFile  /etc/ssl/certs/ssl-cert-snakeoil.pem
-    #SSLCertificateKeyFile /etc/ssl/private/ssl-cert-snakeoil.key
-    #SSLCACertificateFile /etc/ssl/certs/ca-certificates.crt
-
-    ProxyPass / http://webapp:8080/
-    ProxyPassReverse / http://webapp:8080/
-
-</VirtualHost>
-
-
-
-
 # vim: syntax=apache ts=4 sw=4 sts=4 sr noet
 
diff --git a/services/proxy/default-ssl.conf b/services/proxy/default-ssl.conf
index 013e4b9b553881724ce08cbb5b25cbeec3587da4..6a67b5b84c6f3a15426c8aeb08cd41e5d03b4c8c 100644
--- a/services/proxy/default-ssl.conf
+++ b/services/proxy/default-ssl.conf
@@ -2,8 +2,8 @@
     <VirtualHost _default_:443>
         ServerAdmin webmaster@localhost
 
-        ProxyPass / http://cloud:8080/
-        ProxyPassReverse / http://cloud:8080/
+        ProxyPass / http://webapp:8080/
+        ProxyPassReverse / http://webapp:8080/
 
         # Available loglevels: trace8, ..., trace1, debug, info, notice, warn,
         # error, crit, alert, emerg.
@@ -11,8 +11,8 @@
         # modules, e.g.
         #LogLevel info ssl:warn
 
-        ErrorLog ${APACHE_LOG_DIR}/error.log
-        CustomLog ${APACHE_LOG_DIR}/access.log combined
+        #ErrorLog ${APACHE_LOG_DIR}/error.log
+        #CustomLog ${APACHE_LOG_DIR}/access.log combined
 
         # For most configuration files from conf-available/, which are
         # enabled or disabled at a global level, it is possible to