diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh
index 58ae538d..64fc0490 100755
--- a/13.0/apache/entrypoint.sh
+++ b/13.0/apache/entrypoint.sh
@@ -130,11 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-echo "net voor de loop"
-
-if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
-# if [ -d "/etc/apache2" ]; then
-  echo "in de apache loop"	
+if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -d "/etc/apache2" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh
index 58ae538d..64fc0490 100755
--- a/13.0/fpm-alpine/entrypoint.sh
+++ b/13.0/fpm-alpine/entrypoint.sh
@@ -130,11 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-echo "net voor de loop"
-
-if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
-# if [ -d "/etc/apache2" ]; then
-  echo "in de apache loop"	
+if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -d "/etc/apache2" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh
index 58ae538d..64fc0490 100755
--- a/13.0/fpm/entrypoint.sh
+++ b/13.0/fpm/entrypoint.sh
@@ -130,11 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-echo "net voor de loop"
-
-if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
-# if [ -d "/etc/apache2" ]; then
-  echo "in de apache loop"	
+if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -d "/etc/apache2" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh
index 58ae538d..64fc0490 100755
--- a/14.0/apache/entrypoint.sh
+++ b/14.0/apache/entrypoint.sh
@@ -130,11 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-echo "net voor de loop"
-
-if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
-# if [ -d "/etc/apache2" ]; then
-  echo "in de apache loop"	
+if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -d "/etc/apache2" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh
index 58ae538d..64fc0490 100755
--- a/14.0/fpm-alpine/entrypoint.sh
+++ b/14.0/fpm-alpine/entrypoint.sh
@@ -130,11 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-echo "net voor de loop"
-
-if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
-# if [ -d "/etc/apache2" ]; then
-  echo "in de apache loop"	
+if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -d "/etc/apache2" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh
index 58ae538d..64fc0490 100755
--- a/14.0/fpm/entrypoint.sh
+++ b/14.0/fpm/entrypoint.sh
@@ -130,11 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-echo "net voor de loop"
-
-if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
-# if [ -d "/etc/apache2" ]; then
-  echo "in de apache loop"	
+if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -d "/etc/apache2" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh
index 58ae538d..64fc0490 100755
--- a/15.0/apache/entrypoint.sh
+++ b/15.0/apache/entrypoint.sh
@@ -130,11 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-echo "net voor de loop"
-
-if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
-# if [ -d "/etc/apache2" ]; then
-  echo "in de apache loop"	
+if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -d "/etc/apache2" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
diff --git a/15.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh
index 58ae538d..64fc0490 100755
--- a/15.0/fpm-alpine/entrypoint.sh
+++ b/15.0/fpm-alpine/entrypoint.sh
@@ -130,11 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-echo "net voor de loop"
-
-if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
-# if [ -d "/etc/apache2" ]; then
-  echo "in de apache loop"	
+if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -d "/etc/apache2" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
diff --git a/15.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh
index 58ae538d..64fc0490 100755
--- a/15.0/fpm/entrypoint.sh
+++ b/15.0/fpm/entrypoint.sh
@@ -130,11 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-echo "net voor de loop"
-
-if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
-# if [ -d "/etc/apache2" ]; then
-  echo "in de apache loop"	
+if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -d "/etc/apache2" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 58ae538d..64fc0490 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -130,11 +130,7 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-echo "net voor de loop"
-
-if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
-# if [ -d "/etc/apache2" ]; then
-  echo "in de apache loop"	
+if [ "${APACHE_SSL_SELFSIGNED}" = "true" ] || [ -d "/etc/apache2" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048