diff --git a/13.0/apache/entrypoint.sh b/13.0/apache/entrypoint.sh
index 069ea096..a28b5153 100755
--- a/13.0/apache/entrypoint.sh
+++ b/13.0/apache/entrypoint.sh
@@ -132,11 +132,9 @@ fi
 ## APACHE SSL configuration (self signed certificates)
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
-echo expr "$1"
 
-if expr "$1" : "apache" ; then
+if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
   echo "in de apache loop"	
-  #	[ "${APACHE_SSL_SELFSIGNED}" "true" ]; 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 069ea096..a28b5153 100755
--- a/13.0/fpm-alpine/entrypoint.sh
+++ b/13.0/fpm-alpine/entrypoint.sh
@@ -132,11 +132,9 @@ fi
 ## APACHE SSL configuration (self signed certificates)
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
-echo expr "$1"
 
-if expr "$1" : "apache" ; then
+if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
   echo "in de apache loop"	
-  #	[ "${APACHE_SSL_SELFSIGNED}" "true" ]; 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 069ea096..a28b5153 100755
--- a/13.0/fpm/entrypoint.sh
+++ b/13.0/fpm/entrypoint.sh
@@ -132,11 +132,9 @@ fi
 ## APACHE SSL configuration (self signed certificates)
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
-echo expr "$1"
 
-if expr "$1" : "apache" ; then
+if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
   echo "in de apache loop"	
-  #	[ "${APACHE_SSL_SELFSIGNED}" "true" ]; 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 069ea096..a28b5153 100755
--- a/14.0/apache/entrypoint.sh
+++ b/14.0/apache/entrypoint.sh
@@ -132,11 +132,9 @@ fi
 ## APACHE SSL configuration (self signed certificates)
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
-echo expr "$1"
 
-if expr "$1" : "apache" ; then
+if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
   echo "in de apache loop"	
-  #	[ "${APACHE_SSL_SELFSIGNED}" "true" ]; 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 069ea096..a28b5153 100755
--- a/14.0/fpm-alpine/entrypoint.sh
+++ b/14.0/fpm-alpine/entrypoint.sh
@@ -132,11 +132,9 @@ fi
 ## APACHE SSL configuration (self signed certificates)
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
-echo expr "$1"
 
-if expr "$1" : "apache" ; then
+if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
   echo "in de apache loop"	
-  #	[ "${APACHE_SSL_SELFSIGNED}" "true" ]; 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 069ea096..a28b5153 100755
--- a/14.0/fpm/entrypoint.sh
+++ b/14.0/fpm/entrypoint.sh
@@ -132,11 +132,9 @@ fi
 ## APACHE SSL configuration (self signed certificates)
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
-echo expr "$1"
 
-if expr "$1" : "apache" ; then
+if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
   echo "in de apache loop"	
-  #	[ "${APACHE_SSL_SELFSIGNED}" "true" ]; 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 069ea096..a28b5153 100755
--- a/15.0/apache/entrypoint.sh
+++ b/15.0/apache/entrypoint.sh
@@ -132,11 +132,9 @@ fi
 ## APACHE SSL configuration (self signed certificates)
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
-echo expr "$1"
 
-if expr "$1" : "apache" ; then
+if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
   echo "in de apache loop"	
-  #	[ "${APACHE_SSL_SELFSIGNED}" "true" ]; 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 069ea096..a28b5153 100755
--- a/15.0/fpm-alpine/entrypoint.sh
+++ b/15.0/fpm-alpine/entrypoint.sh
@@ -132,11 +132,9 @@ fi
 ## APACHE SSL configuration (self signed certificates)
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
-echo expr "$1"
 
-if expr "$1" : "apache" ; then
+if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
   echo "in de apache loop"	
-  #	[ "${APACHE_SSL_SELFSIGNED}" "true" ]; 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 069ea096..a28b5153 100755
--- a/15.0/fpm/entrypoint.sh
+++ b/15.0/fpm/entrypoint.sh
@@ -132,11 +132,9 @@ fi
 ## APACHE SSL configuration (self signed certificates)
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
-echo expr "$1"
 
-if expr "$1" : "apache" ; then
+if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
   echo "in de apache loop"	
-  #	[ "${APACHE_SSL_SELFSIGNED}" "true" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 069ea096..a28b5153 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -132,11 +132,9 @@ fi
 ## APACHE SSL configuration (self signed certificates)
 ## ENV VAR set dan dit uitvoeren nog inbouwen
 echo "net voor de loop"
-echo expr "$1"
 
-if expr "$1" : "apache" ; then
+if expr "$1" : "apache" || [ "${APACHE_SSL_SELFSIGNED}" = "true" ] ; then
   echo "in de apache loop"	
-  #	[ "${APACHE_SSL_SELFSIGNED}" "true" ]; then
   a2enmod ssl
   a2enmod headers
   openssl genrsa -out ca.key 2048