diff --git a/5.3/Dockerfile b/5.3/Dockerfile
index f28befad15..3289030b33 100644
--- a/5.3/Dockerfile
+++ b/5.3/Dockerfile
@@ -26,3 +26,5 @@ RUN set -x \
 	&& dpkg -r bison libbison-dev \
 	&& apt-get purge -y --auto-remove autoconf2.13 curl \
 	&& rm -r /usr/src/php
+
+CMD ["php", "-a"]
diff --git a/5.4/Dockerfile b/5.4/Dockerfile
index 91f67abfa1..1900f24e1f 100644
--- a/5.4/Dockerfile
+++ b/5.4/Dockerfile
@@ -25,3 +25,5 @@ RUN set -x \
 	&& dpkg -r bison libbison-dev \
 	&& apt-get purge -y --auto-remove curl \
 	&& rm -r /usr/src/php
+
+CMD ["php", "-a"]
diff --git a/5.5/Dockerfile b/5.5/Dockerfile
index f0d874a97c..3bf2497c33 100644
--- a/5.5/Dockerfile
+++ b/5.5/Dockerfile
@@ -25,3 +25,5 @@ RUN set -x \
 	&& dpkg -r bison libbison-dev \
 	&& apt-get purge -y --auto-remove curl \
 	&& rm -r /usr/src/php
+
+CMD ["php", "-a"]
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
index 403958efb0..63a2df857e 100644
--- a/5.6/Dockerfile
+++ b/5.6/Dockerfile
@@ -25,3 +25,5 @@ RUN set -x \
 	&& dpkg -r bison libbison-dev \
 	&& apt-get purge -y --auto-remove curl \
 	&& rm -r /usr/src/php
+
+CMD ["php", "-a"]
diff --git a/Dockerfile-apache-tail b/Dockerfile-apache-tail
index d9413a76c9..814a21f235 100644
--- a/Dockerfile-apache-tail
+++ b/Dockerfile-apache-tail
@@ -1,4 +1,3 @@
-
 ENV PATH $PATH:/usr/local/apache2/bin
 
 WORKDIR /var/www/html
diff --git a/update.sh b/update.sh
index 847f46c19d..937a830705 100755
--- a/update.sh
+++ b/update.sh
@@ -31,7 +31,9 @@ for version in "${versions[@]}"; do
 		exit 1
 	fi
 	
-	insert="$(cat "Dockerfile-apache-insert" | sed 's/[\]/\\&/g')"
+	dockerfile="$( cat "$version/Dockerfile")"
+	apacheInsert="$(cat "Dockerfile-apache-insert")"
+	apacheTail="$(cat "Dockerfile-apache-tail")"
 	(
 		set -x
 		sed -ri '
@@ -39,7 +41,8 @@ for version in "${versions[@]}"; do
 			s/^(RUN gpg .* --recv-keys) [0-9a-fA-F ]*$/\1 '"$gpgKey"'/
 		' "$version/Dockerfile"
 		
-		awk -vf2="$insert" '/^\t&& make install \\$/{print f2;next}1' "$version/Dockerfile" "Dockerfile-apache-tail" > "$version/apache/Dockerfile"
+		apacheDockerfile="${dockerfile/?\&\& make install \\/$apacheInsert}"
+		echo "${apacheDockerfile/CMD*/$apacheTail}" > "$version/apache/Dockerfile"
 	)
 done