diff --git a/nginx-php/Dockerfile b/nginx-php/7.1/Dockerfile
similarity index 94%
rename from nginx-php/Dockerfile
rename to nginx-php/7.1/Dockerfile
index 8ed6f2b..19edd9d 100644
--- a/nginx-php/Dockerfile
+++ b/nginx-php/7.1/Dockerfile
@@ -3,9 +3,14 @@ FROM alpine:3.5
 ARG BUILD_CORES
 
 ARG NGINX_VER=1.13.0
-ARG PHP_VER=7.1.4
+ARG PHP_VER=7.1.5
 ARG LIBICONV_VERSION=1.15
 
+LABEL description="nginx + php image based on Alpine" \
+      maintainer="Wonderfall <wonderfall@targaryen.house>" \
+      php_version="PHP v$PHP_VER built from source" \
+      nginx_version="nginx v$NGINX_VER built from source"
+
 ARG PHP_MIRROR=http://ch1.php.net
 
 ARG NGINX_CONF=" \
diff --git a/nginx-php/rootfs/etc/s6.d/.s6-svscan/finish b/nginx-php/7.1/rootfs/etc/s6.d/.s6-svscan/finish
similarity index 100%
rename from nginx-php/rootfs/etc/s6.d/.s6-svscan/finish
rename to nginx-php/7.1/rootfs/etc/s6.d/.s6-svscan/finish
diff --git a/nginx-php/rootfs/etc/s6.d/nginx/run b/nginx-php/7.1/rootfs/etc/s6.d/nginx/run
similarity index 100%
rename from nginx-php/rootfs/etc/s6.d/nginx/run
rename to nginx-php/7.1/rootfs/etc/s6.d/nginx/run
diff --git a/nginx-php/rootfs/etc/s6.d/php/run b/nginx-php/7.1/rootfs/etc/s6.d/php/run
similarity index 100%
rename from nginx-php/rootfs/etc/s6.d/php/run
rename to nginx-php/7.1/rootfs/etc/s6.d/php/run
diff --git a/nginx-php/rootfs/nginx/conf.d/php.conf b/nginx-php/7.1/rootfs/nginx/conf.d/php.conf
similarity index 100%
rename from nginx-php/rootfs/nginx/conf.d/php.conf
rename to nginx-php/7.1/rootfs/nginx/conf.d/php.conf
diff --git a/nginx-php/rootfs/nginx/conf/nginx.conf b/nginx-php/7.1/rootfs/nginx/conf/nginx.conf
similarity index 100%
rename from nginx-php/rootfs/nginx/conf/nginx.conf
rename to nginx-php/7.1/rootfs/nginx/conf/nginx.conf
diff --git a/nginx-php/rootfs/php/etc/php-fpm.conf b/nginx-php/7.1/rootfs/php/etc/php-fpm.conf
similarity index 100%
rename from nginx-php/rootfs/php/etc/php-fpm.conf
rename to nginx-php/7.1/rootfs/php/etc/php-fpm.conf
diff --git a/nginx-php/rootfs/usr/local/bin/docker-php-ext-configure b/nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-configure
similarity index 100%
rename from nginx-php/rootfs/usr/local/bin/docker-php-ext-configure
rename to nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-configure
diff --git a/nginx-php/rootfs/usr/local/bin/docker-php-ext-enable b/nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-enable
similarity index 100%
rename from nginx-php/rootfs/usr/local/bin/docker-php-ext-enable
rename to nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-enable
diff --git a/nginx-php/rootfs/usr/local/bin/docker-php-ext-install b/nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-install
similarity index 100%
rename from nginx-php/rootfs/usr/local/bin/docker-php-ext-install
rename to nginx-php/7.1/rootfs/usr/local/bin/docker-php-ext-install