diff --git a/5.4/Dockerfile b/5.4/Dockerfile
index eba8265b..a3b893b7 100644
--- a/5.4/Dockerfile
+++ b/5.4/Dockerfile
@@ -1,20 +1,30 @@
-FROM buildpack-deps:jessie
+FROM debian:jessie
 
-RUN apt-get update && apt-get install -y curl && rm -r /var/lib/apt/lists/*
+# persistent / runtime deps
+RUN apt-get update && apt-get install -y curl libxml2 --no-install-recommends && rm -r /var/lib/apt/lists/*
 
-##<apache2>##
-##</apache2>##
+##<autogenerated>##
+##</autogenerated>##
 
 RUN gpg --keyserver pgp.mit.edu --recv-keys F38252826ACD957EF380D39F2F7956BC5DA04B5D
 
 ENV PHP_VERSION 5.4.34
 
-RUN set -x \
-	&& curl -SLO http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb \
-	&& curl -SLO http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb \
-	&& dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb \
-	&& dpkg -i bison_2.7.1.dfsg-1_amd64.deb \
-	&& rm *.deb \
+RUN buildDeps=" \
+		$PHP_EXTRA_BUILD_DEPS \
+		build-essential \
+		bzip2 \
+		file \
+		libcurl4-openssl-dev \
+		libpng12-dev \
+		libreadline6-dev \
+		libssl-dev \
+		libxml2-dev \
+		m4 \
+		pkg-config \
+	"; \
+	set -x \
+	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2 \
 	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2.asc/from/this/mirror" -o php.tar.bz2.asc \
 	&& gpg --verify php.tar.bz2.asc \
@@ -23,17 +33,21 @@ RUN set -x \
 	&& rm php.tar.bz2* \
 	&& cd /usr/src/php \
 	&& ./configure --disable-cgi \
-		$(command -v apxs2 > /dev/null 2>&1 && echo '--with-apxs2' || true) \
+		$PHP_EXTRA_CONFIGURE_ARGS \
 		--with-curl \
 		--with-gd \
 		--with-mysql \
 		--with-mysqli \
 		--with-openssl \
 		--with-pdo-mysql \
+		--with-readline \
 		--with-zlib \
 	&& make -j"$(nproc)" \
 	&& make install \
-	&& dpkg -r bison libbison-dev \
+	&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -r /usr/src/php
 
+##<autogenerated>##
 CMD ["php", "-a"]
+##</autogenerated>##
diff --git a/5.4/apache/Dockerfile b/5.4/apache/Dockerfile
index 14330d6e..4c50e6a8 100644
--- a/5.4/apache/Dockerfile
+++ b/5.4/apache/Dockerfile
@@ -1,9 +1,10 @@
-FROM buildpack-deps:jessie
+FROM debian:jessie
 
-RUN apt-get update && apt-get install -y curl && rm -r /var/lib/apt/lists/*
+# persistent / runtime deps
+RUN apt-get update && apt-get install -y curl libxml2 --no-install-recommends && rm -r /var/lib/apt/lists/*
 
-##<apache2>##
-RUN apt-get update && apt-get install -y apache2-bin apache2-dev apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
+##<autogenerated>##
+RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
 RUN rm -rf /var/www/html && mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html && chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html
 
@@ -12,18 +13,31 @@ RUN a2dismod mpm_event && a2enmod mpm_prefork
 
 RUN mv /etc/apache2/apache2.conf /etc/apache2/apache2.conf.dist
 COPY apache2.conf /etc/apache2/apache2.conf
-##</apache2>##
+# it'd be nice if we could not COPY apache2.conf until the end of the Dockerfile, but its contents are checked by PHP during compilation
+
+ENV PHP_EXTRA_BUILD_DEPS apache2-dev
+ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
+##</autogenerated>##
 
 RUN gpg --keyserver pgp.mit.edu --recv-keys F38252826ACD957EF380D39F2F7956BC5DA04B5D
 
 ENV PHP_VERSION 5.4.34
 
-RUN set -x \
-	&& curl -SLO http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb \
-	&& curl -SLO http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb \
-	&& dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb \
-	&& dpkg -i bison_2.7.1.dfsg-1_amd64.deb \
-	&& rm *.deb \
+RUN buildDeps=" \
+		$PHP_EXTRA_BUILD_DEPS \
+		build-essential \
+		bzip2 \
+		file \
+		libcurl4-openssl-dev \
+		libpng12-dev \
+		libreadline6-dev \
+		libssl-dev \
+		libxml2-dev \
+		m4 \
+		pkg-config \
+	"; \
+	set -x \
+	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2 \
 	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2.asc/from/this/mirror" -o php.tar.bz2.asc \
 	&& gpg --verify php.tar.bz2.asc \
@@ -32,20 +46,24 @@ RUN set -x \
 	&& rm php.tar.bz2* \
 	&& cd /usr/src/php \
 	&& ./configure --disable-cgi \
-		$(command -v apxs2 > /dev/null 2>&1 && echo '--with-apxs2' || true) \
+		$PHP_EXTRA_CONFIGURE_ARGS \
 		--with-curl \
 		--with-gd \
 		--with-mysql \
 		--with-mysqli \
 		--with-openssl \
 		--with-pdo-mysql \
+		--with-readline \
 		--with-zlib \
 	&& make -j"$(nproc)" \
 	&& make install \
-	&& dpkg -r bison libbison-dev \
+	&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -r /usr/src/php
 
+##<autogenerated>##
 WORKDIR /var/www/html
 
 EXPOSE 80
 CMD ["apache2", "-DFOREGROUND"]
+##</autogenerated>##
diff --git a/5.5/Dockerfile b/5.5/Dockerfile
index 441c3687..46374d36 100644
--- a/5.5/Dockerfile
+++ b/5.5/Dockerfile
@@ -1,20 +1,30 @@
-FROM buildpack-deps:jessie
+FROM debian:jessie
 
-RUN apt-get update && apt-get install -y curl && rm -r /var/lib/apt/lists/*
+# persistent / runtime deps
+RUN apt-get update && apt-get install -y curl libxml2 --no-install-recommends && rm -r /var/lib/apt/lists/*
 
-##<apache2>##
-##</apache2>##
+##<autogenerated>##
+##</autogenerated>##
 
 RUN gpg --keyserver pgp.mit.edu --recv-keys 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D
 
 ENV PHP_VERSION 5.5.18
 
-RUN set -x \
-	&& curl -SLO http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb \
-	&& curl -SLO http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb \
-	&& dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb \
-	&& dpkg -i bison_2.7.1.dfsg-1_amd64.deb \
-	&& rm *.deb \
+RUN buildDeps=" \
+		$PHP_EXTRA_BUILD_DEPS \
+		build-essential \
+		bzip2 \
+		file \
+		libcurl4-openssl-dev \
+		libpng12-dev \
+		libreadline6-dev \
+		libssl-dev \
+		libxml2-dev \
+		m4 \
+		pkg-config \
+	"; \
+	set -x \
+	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2 \
 	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2.asc/from/this/mirror" -o php.tar.bz2.asc \
 	&& gpg --verify php.tar.bz2.asc \
@@ -23,17 +33,21 @@ RUN set -x \
 	&& rm php.tar.bz2* \
 	&& cd /usr/src/php \
 	&& ./configure --disable-cgi \
-		$(command -v apxs2 > /dev/null 2>&1 && echo '--with-apxs2' || true) \
+		$PHP_EXTRA_CONFIGURE_ARGS \
 		--with-curl \
 		--with-gd \
 		--with-mysql \
 		--with-mysqli \
 		--with-openssl \
 		--with-pdo-mysql \
+		--with-readline \
 		--with-zlib \
 	&& make -j"$(nproc)" \
 	&& make install \
-	&& dpkg -r bison libbison-dev \
+	&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -r /usr/src/php
 
+##<autogenerated>##
 CMD ["php", "-a"]
+##</autogenerated>##
diff --git a/5.5/apache/Dockerfile b/5.5/apache/Dockerfile
index f394c505..9246e885 100644
--- a/5.5/apache/Dockerfile
+++ b/5.5/apache/Dockerfile
@@ -1,9 +1,10 @@
-FROM buildpack-deps:jessie
+FROM debian:jessie
 
-RUN apt-get update && apt-get install -y curl && rm -r /var/lib/apt/lists/*
+# persistent / runtime deps
+RUN apt-get update && apt-get install -y curl libxml2 --no-install-recommends && rm -r /var/lib/apt/lists/*
 
-##<apache2>##
-RUN apt-get update && apt-get install -y apache2-bin apache2-dev apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
+##<autogenerated>##
+RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
 RUN rm -rf /var/www/html && mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html && chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html
 
@@ -12,18 +13,31 @@ RUN a2dismod mpm_event && a2enmod mpm_prefork
 
 RUN mv /etc/apache2/apache2.conf /etc/apache2/apache2.conf.dist
 COPY apache2.conf /etc/apache2/apache2.conf
-##</apache2>##
+# it'd be nice if we could not COPY apache2.conf until the end of the Dockerfile, but its contents are checked by PHP during compilation
+
+ENV PHP_EXTRA_BUILD_DEPS apache2-dev
+ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
+##</autogenerated>##
 
 RUN gpg --keyserver pgp.mit.edu --recv-keys 0BD78B5F97500D450838F95DFE857D9A90D90EC1 0B96609E270F565C13292B24C13C70B87267B52D
 
 ENV PHP_VERSION 5.5.18
 
-RUN set -x \
-	&& curl -SLO http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb \
-	&& curl -SLO http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb \
-	&& dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb \
-	&& dpkg -i bison_2.7.1.dfsg-1_amd64.deb \
-	&& rm *.deb \
+RUN buildDeps=" \
+		$PHP_EXTRA_BUILD_DEPS \
+		build-essential \
+		bzip2 \
+		file \
+		libcurl4-openssl-dev \
+		libpng12-dev \
+		libreadline6-dev \
+		libssl-dev \
+		libxml2-dev \
+		m4 \
+		pkg-config \
+	"; \
+	set -x \
+	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2 \
 	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2.asc/from/this/mirror" -o php.tar.bz2.asc \
 	&& gpg --verify php.tar.bz2.asc \
@@ -32,20 +46,24 @@ RUN set -x \
 	&& rm php.tar.bz2* \
 	&& cd /usr/src/php \
 	&& ./configure --disable-cgi \
-		$(command -v apxs2 > /dev/null 2>&1 && echo '--with-apxs2' || true) \
+		$PHP_EXTRA_CONFIGURE_ARGS \
 		--with-curl \
 		--with-gd \
 		--with-mysql \
 		--with-mysqli \
 		--with-openssl \
 		--with-pdo-mysql \
+		--with-readline \
 		--with-zlib \
 	&& make -j"$(nproc)" \
 	&& make install \
-	&& dpkg -r bison libbison-dev \
+	&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -r /usr/src/php
 
+##<autogenerated>##
 WORKDIR /var/www/html
 
 EXPOSE 80
 CMD ["apache2", "-DFOREGROUND"]
+##</autogenerated>##
diff --git a/5.6/Dockerfile b/5.6/Dockerfile
index 24370270..56fbfd00 100644
--- a/5.6/Dockerfile
+++ b/5.6/Dockerfile
@@ -1,20 +1,30 @@
-FROM buildpack-deps:jessie
+FROM debian:jessie
 
-RUN apt-get update && apt-get install -y curl && rm -r /var/lib/apt/lists/*
+# persistent / runtime deps
+RUN apt-get update && apt-get install -y curl libxml2 --no-install-recommends && rm -r /var/lib/apt/lists/*
 
-##<apache2>##
-##</apache2>##
+##<autogenerated>##
+##</autogenerated>##
 
 RUN gpg --keyserver pgp.mit.edu --recv-keys 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1
 
 ENV PHP_VERSION 5.6.2
 
-RUN set -x \
-	&& curl -SLO http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb \
-	&& curl -SLO http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb \
-	&& dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb \
-	&& dpkg -i bison_2.7.1.dfsg-1_amd64.deb \
-	&& rm *.deb \
+RUN buildDeps=" \
+		$PHP_EXTRA_BUILD_DEPS \
+		build-essential \
+		bzip2 \
+		file \
+		libcurl4-openssl-dev \
+		libpng12-dev \
+		libreadline6-dev \
+		libssl-dev \
+		libxml2-dev \
+		m4 \
+		pkg-config \
+	"; \
+	set -x \
+	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2 \
 	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2.asc/from/this/mirror" -o php.tar.bz2.asc \
 	&& gpg --verify php.tar.bz2.asc \
@@ -23,17 +33,21 @@ RUN set -x \
 	&& rm php.tar.bz2* \
 	&& cd /usr/src/php \
 	&& ./configure --disable-cgi \
-		$(command -v apxs2 > /dev/null 2>&1 && echo '--with-apxs2' || true) \
+		$PHP_EXTRA_CONFIGURE_ARGS \
 		--with-curl \
 		--with-gd \
 		--with-mysql \
 		--with-mysqli \
 		--with-openssl \
 		--with-pdo-mysql \
+		--with-readline \
 		--with-zlib \
 	&& make -j"$(nproc)" \
 	&& make install \
-	&& dpkg -r bison libbison-dev \
+	&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -r /usr/src/php
 
+##<autogenerated>##
 CMD ["php", "-a"]
+##</autogenerated>##
diff --git a/5.6/apache/Dockerfile b/5.6/apache/Dockerfile
index 64aef64c..bd5beb81 100644
--- a/5.6/apache/Dockerfile
+++ b/5.6/apache/Dockerfile
@@ -1,9 +1,10 @@
-FROM buildpack-deps:jessie
+FROM debian:jessie
 
-RUN apt-get update && apt-get install -y curl && rm -r /var/lib/apt/lists/*
+# persistent / runtime deps
+RUN apt-get update && apt-get install -y curl libxml2 --no-install-recommends && rm -r /var/lib/apt/lists/*
 
-##<apache2>##
-RUN apt-get update && apt-get install -y apache2-bin apache2-dev apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
+##<autogenerated>##
+RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
 
 RUN rm -rf /var/www/html && mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html && chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html
 
@@ -12,18 +13,31 @@ RUN a2dismod mpm_event && a2enmod mpm_prefork
 
 RUN mv /etc/apache2/apache2.conf /etc/apache2/apache2.conf.dist
 COPY apache2.conf /etc/apache2/apache2.conf
-##</apache2>##
+# it'd be nice if we could not COPY apache2.conf until the end of the Dockerfile, but its contents are checked by PHP during compilation
+
+ENV PHP_EXTRA_BUILD_DEPS apache2-dev
+ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
+##</autogenerated>##
 
 RUN gpg --keyserver pgp.mit.edu --recv-keys 6E4F6AB321FDC07F2C332E3AC2BF0BC433CFC8B3 0BD78B5F97500D450838F95DFE857D9A90D90EC1
 
 ENV PHP_VERSION 5.6.2
 
-RUN set -x \
-	&& curl -SLO http://launchpadlibrarian.net/140087283/libbison-dev_2.7.1.dfsg-1_amd64.deb \
-	&& curl -SLO http://launchpadlibrarian.net/140087282/bison_2.7.1.dfsg-1_amd64.deb \
-	&& dpkg -i libbison-dev_2.7.1.dfsg-1_amd64.deb \
-	&& dpkg -i bison_2.7.1.dfsg-1_amd64.deb \
-	&& rm *.deb \
+RUN buildDeps=" \
+		$PHP_EXTRA_BUILD_DEPS \
+		build-essential \
+		bzip2 \
+		file \
+		libcurl4-openssl-dev \
+		libpng12-dev \
+		libreadline6-dev \
+		libssl-dev \
+		libxml2-dev \
+		m4 \
+		pkg-config \
+	"; \
+	set -x \
+	&& apt-get update && apt-get install -y $buildDeps --no-install-recommends && rm -rf /var/lib/apt/lists/* \
 	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2/from/this/mirror" -o php.tar.bz2 \
 	&& curl -SL "http://php.net/get/php-$PHP_VERSION.tar.bz2.asc/from/this/mirror" -o php.tar.bz2.asc \
 	&& gpg --verify php.tar.bz2.asc \
@@ -32,20 +46,24 @@ RUN set -x \
 	&& rm php.tar.bz2* \
 	&& cd /usr/src/php \
 	&& ./configure --disable-cgi \
-		$(command -v apxs2 > /dev/null 2>&1 && echo '--with-apxs2' || true) \
+		$PHP_EXTRA_CONFIGURE_ARGS \
 		--with-curl \
 		--with-gd \
 		--with-mysql \
 		--with-mysqli \
 		--with-openssl \
 		--with-pdo-mysql \
+		--with-readline \
 		--with-zlib \
 	&& make -j"$(nproc)" \
 	&& make install \
-	&& dpkg -r bison libbison-dev \
+	&& { find /usr/local/bin /usr/local/sbin -type f -executable -exec strip --strip-all '{}' + || true; } \
+	&& apt-get purge -y --auto-remove $buildDeps \
 	&& rm -r /usr/src/php
 
+##<autogenerated>##
 WORKDIR /var/www/html
 
 EXPOSE 80
 CMD ["apache2", "-DFOREGROUND"]
+##</autogenerated>##
diff --git a/apache-Dockerfile-block-1 b/apache-Dockerfile-block-1
new file mode 100644
index 00000000..ed8264c1
--- /dev/null
+++ b/apache-Dockerfile-block-1
@@ -0,0 +1,13 @@
+RUN apt-get update && apt-get install -y apache2-bin apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
+
+RUN rm -rf /var/www/html && mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html && chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html
+
+# Apache + PHP requires preforking Apache for best results
+RUN a2dismod mpm_event && a2enmod mpm_prefork
+
+RUN mv /etc/apache2/apache2.conf /etc/apache2/apache2.conf.dist
+COPY apache2.conf /etc/apache2/apache2.conf
+# it'd be nice if we could not COPY apache2.conf until the end of the Dockerfile, but its contents are checked by PHP during compilation
+
+ENV PHP_EXTRA_BUILD_DEPS apache2-dev
+ENV PHP_EXTRA_CONFIGURE_ARGS --with-apxs2
diff --git a/apache-Dockerfile-block-2 b/apache-Dockerfile-block-2
new file mode 100644
index 00000000..0dd7f61e
--- /dev/null
+++ b/apache-Dockerfile-block-2
@@ -0,0 +1,4 @@
+WORKDIR /var/www/html
+
+EXPOSE 80
+CMD ["apache2", "-DFOREGROUND"]
diff --git a/update.sh b/update.sh
index 789f369d..5c7b2545 100755
--- a/update.sh
+++ b/update.sh
@@ -31,24 +31,16 @@ for version in "${versions[@]}"; do
 		exit 1
 	fi
 	
-	awk '$1 != "CMD" { print } $1 == "##<apache2>##" && c == 0 { c = 1; system("cat") }' "$version/Dockerfile" > "$version/apache/Dockerfile" <<-'EOD'
-		RUN apt-get update && apt-get install -y apache2-bin apache2-dev apache2.2-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
-		
-		RUN rm -rf /var/www/html && mkdir -p /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html && chown -R www-data:www-data /var/lock/apache2 /var/run/apache2 /var/log/apache2 /var/www/html
-		
-		# Apache + PHP requires preforking Apache for best results
-		RUN a2dismod mpm_event && a2enmod mpm_prefork
-		
-		RUN mv /etc/apache2/apache2.conf /etc/apache2/apache2.conf.dist
-		COPY apache2.conf /etc/apache2/apache2.conf
-	EOD
-	
-	cat >> "$version/apache/Dockerfile" <<-'EOD'
-		WORKDIR /var/www/html
-		
-		EXPOSE 80
-		CMD ["apache2", "-DFOREGROUND"]
-	EOD
+	for variant in apache; do
+		echo "Generating $version/$variant/Dockerfile from $variant-Dockerfile-block-*"
+		awk '
+			$1 == "##</autogenerated>##" { ia = 0 }
+			!ia { print }
+			$1 == "##<autogenerated>##" { ia = 1; ab++; ac = 0 }
+			ia { ac++ }
+			ia && ac == 1 { system("cat '$variant'-Dockerfile-block-" ab) }
+		' "$version/Dockerfile" > "$version/$variant/Dockerfile"
+	done
 	
 	(
 		set -x