diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile
index 673380dc65..3a47620a99 100644
--- a/5.5/apache/Dockerfile
+++ b/5.5/apache/Dockerfile
@@ -79,6 +79,7 @@ COPY docker-php-ext-* /usr/local/bin/
 COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
 
-EXPOSE 80
+EXPOSE 8080
+USER www-data
 CMD ["apache2-foreground"]
 ##</autogenerated>##
diff --git a/5.5/apache/apache2.conf b/5.5/apache/apache2.conf
index ab5b2648a6..8742f2a591 100644
--- a/5.5/apache/apache2.conf
+++ b/5.5/apache/apache2.conf
@@ -16,12 +16,12 @@ IncludeOptional mods-enabled/*.load
 IncludeOptional mods-enabled/*.conf
 
 # ports.conf
-Listen 80
+Listen 8080
 <IfModule ssl_module>
-	Listen 443
+	Listen 8443
 </IfModule>
 <IfModule mod_gnutls.c>
-	Listen 443
+	Listen 8443
 </IfModule>
 
 <Directory />
diff --git a/5.6/apache/apache2.conf b/5.6/apache/apache2.conf
index ab5b2648a6..8742f2a591 100644
--- a/5.6/apache/apache2.conf
+++ b/5.6/apache/apache2.conf
@@ -16,12 +16,12 @@ IncludeOptional mods-enabled/*.load
 IncludeOptional mods-enabled/*.conf
 
 # ports.conf
-Listen 80
+Listen 8080
 <IfModule ssl_module>
-	Listen 443
+	Listen 8443
 </IfModule>
 <IfModule mod_gnutls.c>
-	Listen 443
+	Listen 8443
 </IfModule>
 
 <Directory />
diff --git a/7.0/apache/Dockerfile b/7.0/apache/Dockerfile
index cff8f9455a..7f1de51d63 100644
--- a/7.0/apache/Dockerfile
+++ b/7.0/apache/Dockerfile
@@ -79,6 +79,7 @@ COPY docker-php-ext-* /usr/local/bin/
 COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
 
-EXPOSE 80
+EXPOSE 8080
+USER www-data
 CMD ["apache2-foreground"]
 ##</autogenerated>##
diff --git a/7.0/apache/apache2.conf b/7.0/apache/apache2.conf
index ab5b2648a6..8742f2a591 100644
--- a/7.0/apache/apache2.conf
+++ b/7.0/apache/apache2.conf
@@ -16,12 +16,12 @@ IncludeOptional mods-enabled/*.load
 IncludeOptional mods-enabled/*.conf
 
 # ports.conf
-Listen 80
+Listen 8080
 <IfModule ssl_module>
-	Listen 443
+	Listen 8443
 </IfModule>
 <IfModule mod_gnutls.c>
-	Listen 443
+	Listen 8443
 </IfModule>
 
 <Directory />
diff --git a/apache-Dockerfile-block-2 b/apache-Dockerfile-block-2
index 613378a197..7fda63417c 100644
--- a/apache-Dockerfile-block-2
+++ b/apache-Dockerfile-block-2
@@ -1,5 +1,6 @@
 COPY apache2-foreground /usr/local/bin/
 WORKDIR /var/www/html
 
-EXPOSE 80
+EXPOSE 8080
+USER www-data
 CMD ["apache2-foreground"]