diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh
index ebb85691..6e271bca 100755
--- a/13.0/apache/entrypoint.sh
+++ b/13.0/apache/entrypoint.sh
@@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-
-# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then
-if [ -d "/etc/apache2" ]; then
+if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
+# if [ -d "/etc/apache2" ]; then
   echo "in de apache loop"	
   a2enmod ssl
   a2enmod headers
diff --git a/13.0/fpm-alpine/entrypoint.sh b/13.0/fpm-alpine/entrypoint.sh
index ebb85691..6e271bca 100755
--- a/13.0/fpm-alpine/entrypoint.sh
+++ b/13.0/fpm-alpine/entrypoint.sh
@@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-
-# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then
-if [ -d "/etc/apache2" ]; then
+if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
+# if [ -d "/etc/apache2" ]; then
   echo "in de apache loop"	
   a2enmod ssl
   a2enmod headers
diff --git a/13.0/fpm/entrypoint.sh b/13.0/fpm/entrypoint.sh
index ebb85691..6e271bca 100755
--- a/13.0/fpm/entrypoint.sh
+++ b/13.0/fpm/entrypoint.sh
@@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-
-# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then
-if [ -d "/etc/apache2" ]; then
+if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
+# if [ -d "/etc/apache2" ]; then
   echo "in de apache loop"	
   a2enmod ssl
   a2enmod headers
diff --git a/14.0/apache/entrypoint.sh b/14.0/apache/entrypoint.sh
index ebb85691..6e271bca 100755
--- a/14.0/apache/entrypoint.sh
+++ b/14.0/apache/entrypoint.sh
@@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-
-# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then
-if [ -d "/etc/apache2" ]; then
+if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
+# if [ -d "/etc/apache2" ]; then
   echo "in de apache loop"	
   a2enmod ssl
   a2enmod headers
diff --git a/14.0/fpm-alpine/entrypoint.sh b/14.0/fpm-alpine/entrypoint.sh
index ebb85691..6e271bca 100755
--- a/14.0/fpm-alpine/entrypoint.sh
+++ b/14.0/fpm-alpine/entrypoint.sh
@@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-
-# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then
-if [ -d "/etc/apache2" ]; then
+if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
+# if [ -d "/etc/apache2" ]; then
   echo "in de apache loop"	
   a2enmod ssl
   a2enmod headers
diff --git a/14.0/fpm/entrypoint.sh b/14.0/fpm/entrypoint.sh
index ebb85691..6e271bca 100755
--- a/14.0/fpm/entrypoint.sh
+++ b/14.0/fpm/entrypoint.sh
@@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-
-# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then
-if [ -d "/etc/apache2" ]; then
+if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
+# if [ -d "/etc/apache2" ]; then
   echo "in de apache loop"	
   a2enmod ssl
   a2enmod headers
diff --git a/15.0/apache/entrypoint.sh b/15.0/apache/entrypoint.sh
index ebb85691..6e271bca 100755
--- a/15.0/apache/entrypoint.sh
+++ b/15.0/apache/entrypoint.sh
@@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-
-# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then
-if [ -d "/etc/apache2" ]; then
+if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
+# if [ -d "/etc/apache2" ]; then
   echo "in de apache loop"	
   a2enmod ssl
   a2enmod headers
diff --git a/15.0/fpm-alpine/entrypoint.sh b/15.0/fpm-alpine/entrypoint.sh
index ebb85691..6e271bca 100755
--- a/15.0/fpm-alpine/entrypoint.sh
+++ b/15.0/fpm-alpine/entrypoint.sh
@@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-
-# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then
-if [ -d "/etc/apache2" ]; then
+if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
+# if [ -d "/etc/apache2" ]; then
   echo "in de apache loop"	
   a2enmod ssl
   a2enmod headers
diff --git a/15.0/fpm/entrypoint.sh b/15.0/fpm/entrypoint.sh
index ebb85691..6e271bca 100755
--- a/15.0/fpm/entrypoint.sh
+++ b/15.0/fpm/entrypoint.sh
@@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-
-# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then
-if [ -d "/etc/apache2" ]; then
+if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
+# if [ -d "/etc/apache2" ]; then
   echo "in de apache loop"	
   a2enmod ssl
   a2enmod headers
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index ebb85691..6e271bca 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -130,12 +130,10 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
 fi
 
 ## APACHE SSL configuration (self signed certificates)
-## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
 
-
-# if expr "$1" : "apache" 1>/dev/null && [ -n "${APACHE_SSL_SELFSIGNED+x}" ] ; then
-if [ -d "/etc/apache2" ]; then
+if [ -n "${APACHE_SSL_SELFSIGNED+x}" "true" ] ; then
+# if [ -d "/etc/apache2" ]; then
   echo "in de apache loop"	
   a2enmod ssl
   a2enmod headers