diff --git a/apache-php7/Dockerfile b/apache-php7/Dockerfile
index 1e0552d..05e0dc9 100755
--- a/apache-php7/Dockerfile
+++ b/apache-php7/Dockerfile
@@ -14,8 +14,8 @@ RUN docker-php-ext-install mcrypt
 VOLUME /var/www/html
 
 # Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.6.3
-ENV JOOMLA_SHA1 01eb3724e191fcfd034b54f54745703a8a4f288e
+ENV JOOMLA_VERSION 3.6.4
+ENV JOOMLA_SHA1 81ecad99727fd336f72756439666808eaabcc716
 
 # Download package and extract to web volume
 RUN curl -o joomla.zip -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.zip \
diff --git a/apache-php7/docker-entrypoint.sh b/apache-php7/docker-entrypoint.sh
index 5d858b4..0f1acae 100755
--- a/apache-php7/docker-entrypoint.sh
+++ b/apache-php7/docker-entrypoint.sh
@@ -2,9 +2,6 @@
 
 set -e
 
-#wait for dockercompose to start the mysql
-sleep 3
-
 if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/apache/Dockerfile b/apache/Dockerfile
index 17f0f5f..685bee0 100755
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -14,8 +14,8 @@ RUN docker-php-ext-install mcrypt
 VOLUME /var/www/html
 
 # Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.6.3
-ENV JOOMLA_SHA1 01eb3724e191fcfd034b54f54745703a8a4f288e
+ENV JOOMLA_VERSION 3.6.4
+ENV JOOMLA_SHA1 81ecad99727fd336f72756439666808eaabcc716
 
 # Download package and extract to web volume
 RUN curl -o joomla.zip -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.zip \
diff --git a/apache/docker-entrypoint.sh b/apache/docker-entrypoint.sh
index 5d858b4..0f1acae 100755
--- a/apache/docker-entrypoint.sh
+++ b/apache/docker-entrypoint.sh
@@ -2,9 +2,6 @@
 
 set -e
 
-#wait for dockercompose to start the mysql
-sleep 3
-
 if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/fpm-php7/Dockerfile b/fpm-php7/Dockerfile
index e56ecdc..6135fbb 100755
--- a/fpm-php7/Dockerfile
+++ b/fpm-php7/Dockerfile
@@ -11,8 +11,8 @@ RUN docker-php-ext-install mcrypt
 VOLUME /var/www/html
 
 # Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.6.3
-ENV JOOMLA_SHA1 01eb3724e191fcfd034b54f54745703a8a4f288e
+ENV JOOMLA_VERSION 3.6.4
+ENV JOOMLA_SHA1 81ecad99727fd336f72756439666808eaabcc716
 
 # Download package and extract to web volume
 RUN curl -o joomla.zip -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.zip \
diff --git a/fpm-php7/docker-entrypoint.sh b/fpm-php7/docker-entrypoint.sh
index 5d858b4..0f1acae 100755
--- a/fpm-php7/docker-entrypoint.sh
+++ b/fpm-php7/docker-entrypoint.sh
@@ -2,9 +2,6 @@
 
 set -e
 
-#wait for dockercompose to start the mysql
-sleep 3
-
 if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index d349ed6..3625bdc 100755
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -11,8 +11,8 @@ RUN docker-php-ext-install mcrypt
 VOLUME /var/www/html
 
 # Define Joomla version and expected SHA1 signature
-ENV JOOMLA_VERSION 3.6.3
-ENV JOOMLA_SHA1 01eb3724e191fcfd034b54f54745703a8a4f288e
+ENV JOOMLA_VERSION 3.6.4
+ENV JOOMLA_SHA1 81ecad99727fd336f72756439666808eaabcc716
 
 # Download package and extract to web volume
 RUN curl -o joomla.zip -SL https://github.com/joomla/joomla-cms/releases/download/${JOOMLA_VERSION}/Joomla_${JOOMLA_VERSION}-Stable-Full_Package.zip \
diff --git a/fpm/docker-entrypoint.sh b/fpm/docker-entrypoint.sh
index 5d858b4..0f1acae 100755
--- a/fpm/docker-entrypoint.sh
+++ b/fpm/docker-entrypoint.sh
@@ -2,9 +2,6 @@
 
 set -e
 
-#wait for dockercompose to start the mysql
-sleep 3
-
 if [[ "$1" == apache2* ]] || [ "$1" == php-fpm ]; then
         if [ -n "$MYSQL_PORT_3306_TCP" ]; then
                 if [ -z "$JOOMLA_DB_HOST" ]; then