diff --git a/7/Dockerfile b/7/apache/Dockerfile
similarity index 100%
rename from 7/Dockerfile
rename to 7/apache/Dockerfile
diff --git a/7/fpm/Dockerfile b/7/fpm/Dockerfile
new file mode 100644
index 000000000..20169e6ab
--- /dev/null
+++ b/7/fpm/Dockerfile
@@ -0,0 +1,20 @@
+# from https://www.drupal.org/requirements/php#drupalversions
+FROM php:5.6-fpm
+
+# install the PHP extensions we need
+RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-install gd mbstring pdo pdo_mysql pdo_pgsql zip
+
+WORKDIR /var/www/html
+
+# https://www.drupal.org/node/3060/release
+ENV DRUPAL_VERSION 7.41
+ENV DRUPAL_MD5 7636e75e8be213455b4ac7911ce5801f
+
+RUN curl -fSL "http://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
+	&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
+	&& tar -xz --strip-components=1 -f drupal.tar.gz \
+	&& rm drupal.tar.gz \
+	&& chown -R www-data:www-data sites
diff --git a/8/Dockerfile b/8/apache/Dockerfile
similarity index 100%
rename from 8/Dockerfile
rename to 8/apache/Dockerfile
diff --git a/8/fpm/Dockerfile b/8/fpm/Dockerfile
new file mode 100644
index 000000000..a66617c24
--- /dev/null
+++ b/8/fpm/Dockerfile
@@ -0,0 +1,31 @@
+# from https://www.drupal.org/requirements/php#drupalversions
+FROM php:5.6-fpm
+
+# install the PHP extensions we need
+RUN apt-get update && apt-get install -y libpng12-dev libjpeg-dev libpq-dev \
+	&& rm -rf /var/lib/apt/lists/* \
+	&& docker-php-ext-configure gd --with-png-dir=/usr --with-jpeg-dir=/usr \
+	&& docker-php-ext-install gd mbstring opcache pdo pdo_mysql pdo_pgsql zip
+
+# set recommended PHP.ini settings
+# see https://secure.php.net/manual/en/opcache.installation.php
+RUN { \
+		echo 'opcache.memory_consumption=128'; \
+		echo 'opcache.interned_strings_buffer=8'; \
+		echo 'opcache.max_accelerated_files=4000'; \
+		echo 'opcache.revalidate_freq=60'; \
+		echo 'opcache.fast_shutdown=1'; \
+		echo 'opcache.enable_cli=1'; \
+	} > /usr/local/etc/php/conf.d/opcache-recommended.ini
+
+WORKDIR /var/www/html
+
+# https://www.drupal.org/node/3060/release
+ENV DRUPAL_VERSION 8.0.1
+ENV DRUPAL_MD5 423cc4d28da066d099986ac0844f6abb
+
+RUN curl -fSL "http://ftp.drupal.org/files/projects/drupal-${DRUPAL_VERSION}.tar.gz" -o drupal.tar.gz \
+	&& echo "${DRUPAL_MD5} *drupal.tar.gz" | md5sum -c - \
+	&& tar -xz --strip-components=1 -f drupal.tar.gz \
+	&& rm drupal.tar.gz \
+	&& chown -R www-data:www-data sites
diff --git a/generate-stackbrew-library.sh b/generate-stackbrew-library.sh
index b577eeeb2..d1e0dd272 100755
--- a/generate-stackbrew-library.sh
+++ b/generate-stackbrew-library.sh
@@ -8,7 +8,7 @@ aliases=(
 
 cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
-versions=( */ )
+versions=( */*/ )
 versions=( "${versions[@]%/}" )
 url='git://github.com/docker-library/drupal'
 
diff --git a/update.sh b/update.sh
index ae80d7222..d9de1ea9b 100755
--- a/update.sh
+++ b/update.sh
@@ -5,7 +5,7 @@ cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
 
 versions=( "$@" )
 if [ ${#versions[@]} -eq 0 ]; then
-	versions=( */ )
+	versions=( */*/ )
 fi
 versions=( "${versions[@]%/}" )