From c8fc6b35cdde37479b8898fd46570eefabfc7e55 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Tue, 21 Jun 2016 22:49:28 +0200
Subject: [PATCH 01/13] Update logo

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 16c3ea722..85345f68f 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,6 @@
-# WebDevOps Dockerfiles
+![Dockerfile](https://static.webdevops.io/dockerfile.svg)
+
+Automated build on [WebDevOps Build server](https://build.webdevops.io/) sponsored by ![infogene](https://static.webdevops.io/sponsor-infogene.png | width=100)
 
 Dockerfiles for various prebuilt docker containers
 

From 3a140085817c9add2bdba3f738ceb28acb51e9c0 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <markus@familie-blaschke.net>
Date: Tue, 21 Jun 2016 22:56:01 +0200
Subject: [PATCH 02/13] Feature/logo fix (#103)

* Fix logo

* Fix build server info line
---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 85345f68f..89d6a104d 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,6 @@
 ![Dockerfile](https://static.webdevops.io/dockerfile.svg)
 
-Automated build on [WebDevOps Build server](https://build.webdevops.io/) sponsored by ![infogene](https://static.webdevops.io/sponsor-infogene.png | width=100)
-
-Dockerfiles for various prebuilt docker containers
+Automated built and tested on [WebDevOps Build server](https://build.webdevops.io/) sponsored by [<img src="https://static.webdevops.io/sponsor-infogene.png" width="100">](http://infogene.fr/)
 
 [![Docker layout](documentation/docs/resources/images/docker-image-layout.gv.png)](documentation/docs/resources/images/docker-image-layout.gv.png)
 

From 60782e3449a827d13c3b80caee953008f577f1c8 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Tue, 21 Jun 2016 22:58:35 +0200
Subject: [PATCH 03/13] Update known issues page

---
 documentation/docs/content/KnownIssues/index.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/documentation/docs/content/KnownIssues/index.rst b/documentation/docs/content/KnownIssues/index.rst
index febe81a76..a0365a248 100644
--- a/documentation/docs/content/KnownIssues/index.rst
+++ b/documentation/docs/content/KnownIssues/index.rst
@@ -2,6 +2,14 @@
 Known issues
 ============
 
+General images
+--------------
+
+webdevops/...:alpine-3
+^^^^^^^^^^^^^^^^^^^^^^
+
+- doesn't support ``locales`` (upstream issue)
+
 PHP images
 ----------
 
@@ -22,6 +30,11 @@ webdevops/php...:alpine-3
 
 - missing mhash
 
+webdevops/php...-dev:alpine-3
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+- missing blackfire (not supported)
+
 webdevops/php...-dev:debian-8-php7
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

From 23a3f6dcba6af11a9d20543c5563b7b98b7f0420 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Wed, 22 Jun 2016 21:36:48 +0200
Subject: [PATCH 04/13] Remove --force from apk-install

---
 baselayout/usr/local/bin/apk-install          |   2 +-
 docker/bootstrap/alpine-3/baselayout.tar      | Bin 8484 -> 8478 bytes
 docker/bootstrap/centos-7/baselayout.tar      | Bin 8484 -> 8478 bytes
 docker/bootstrap/debian-7/baselayout.tar      | Bin 8484 -> 8478 bytes
 docker/bootstrap/debian-8/baselayout.tar      | Bin 8484 -> 8478 bytes
 docker/bootstrap/debian-9/baselayout.tar      | Bin 8484 -> 8478 bytes
 docker/bootstrap/ubuntu-12.04/baselayout.tar  | Bin 8484 -> 8478 bytes
 docker/bootstrap/ubuntu-14.04/baselayout.tar  | Bin 8484 -> 8478 bytes
 docker/bootstrap/ubuntu-15.04/baselayout.tar  | Bin 8484 -> 8478 bytes
 docker/bootstrap/ubuntu-15.10/baselayout.tar  | Bin 8484 -> 8478 bytes
 docker/bootstrap/ubuntu-16.04/baselayout.tar  | Bin 8484 -> 8478 bytes
 .../samson-deployment/latest/baselayout.tar   | Bin 8484 -> 8478 bytes
 12 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/baselayout/usr/local/bin/apk-install b/baselayout/usr/local/bin/apk-install
index e0458b31a..cbcedca6e 100755
--- a/baselayout/usr/local/bin/apk-install
+++ b/baselayout/usr/local/bin/apk-install
@@ -7,7 +7,7 @@ set -o errexit   ## set -e : exit the script if any statement returns a non-true
 apk update
 
 # Install packages
-apk add --upgrade --force $*
+apk add --upgrade $*
 
 # Clear files (reduce snapshot size)
 rm -rf var/cache/apk/*
diff --git a/docker/bootstrap/alpine-3/baselayout.tar b/docker/bootstrap/alpine-3/baselayout.tar
index 42188128acb5300aa06eff366c8e9df6f2a7817a..cd19b173ed46546325b2056617d445c8952b3063 100644
GIT binary patch
literal 8478
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
M<ce^iAR^&P&Niuv-T(jq

literal 8484
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
S?3uzZ{9VZu;X*?p^|>%abb%WH

diff --git a/docker/bootstrap/centos-7/baselayout.tar b/docker/bootstrap/centos-7/baselayout.tar
index 42188128acb5300aa06eff366c8e9df6f2a7817a..cd19b173ed46546325b2056617d445c8952b3063 100644
GIT binary patch
literal 8478
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
M<ce^iAR^&P&Niuv-T(jq

literal 8484
zcmV+<A=}<UT4*^jL0KkKS;&2EOaNA+f9?Ie0APRr|NsC0|NsC0|Nj685&#eY009I5
z02p8>Ui<A7edmf_0Csc09@y_;$*m_W+1a~o+vW4v_3J+PkbAoEqr2<c&wAf|%?@@t
zR$3MBuf9?A*Vk`-fEooHy*dVhfC7aD5}*JDP%4AyYb5~s8r~9wQ^-R!g*`CTdP1J3
zr>c6MO#*t2lwql(Y7H7aBSvau(+J2kXf-gHfdMo^o+Tbo^)^V+pc()JL5LbQQzxhZ
z00g0;O)2P9@urZ<dWWW=i1iwJYI>O(WXSam8UO*H0001#^pXfQF%<O3r=awy_>)t5
zLq>^)gbh5AkQp|hzye_gm_(%12{JuR41m)kCV&9YG8!2G$Ql{|0006+L;ye#049QD
zDt?6ZPs*MY#?+f9r7=HLJx@?E41*&hPhdB{-rY|*2_{3jLoK*mlF%@uj1VQ^09zO*
z?DqQmX9=Y}^7@bnOL%4pf-Wk-x_m~EboVa~IPeN+D}Ndg8d5P5sRDv5P%I$;V8#|S
z2($>oj1VfeC@2z<5}H6!L1;xqL})=8YLQi{p-@(Zr9rBsQJ`p5X;GyS6cM3BL28-;
z1d>S^2p~wv1SU=Vqf^WBD~aB?oKa~SM!i&3I7#Tm!j{TzkC2s<kj5&%=OrO+L`qs}
zma^)o(~KD`lwi3WMVZXHc4higPf~sqv>iV^!Q2?5hi`<lY_jXe*)Z2IOI_KTS;8uK
z^ih}{+;Z`gu&~qSbAF0~mJ`;Yn>3`x^?WNDk1guzxOAvenXrDKMv{CY2ndZ#4^oSx
z&xPcfiCF7aq>cIC+Q&)=s;Zb%S(5D8Y4p`s4c6>B><E~M+%gY63X7E>d^&f<)jURx
zyn^5=B|s@NLF#)Kpe{mzAqg$um;eEKLK0p}m<Qsw>Wqc33xF-htHyq$B~Z4>7BJQJ
zLaN5*LTf5we?<XeB0gdFl^KV(m{#l+2`#%X%MANJbd}ee{Aq#qF+kg2C-rYJG;Krv
zv;8!bzA>J3+*rI&igG!h3<cO<{A>6+Mn1MHoU1T9F<dv)vf+k#I}#v(i9yd$Ht{Zp
zW;uDed~<ViczL7YAf@hky;h5P8{I35LwkikL*B0z_r2mW^EO&~J^JNNUWyunR<gcx
z-Cuuv+bt)1LY+{XgjwGUUPhypG@ddZu7#VJ9N5^bQj!p<0ED)!C$@T9O5qvwu00j$
zr!6|jZk;ZB?g-01a5E92w)?qpcc%5<efQG)kliBXi?7Lqj6DiklA2TZro6R!@Vaw-
zc^5|NpDb-YGPTOvzIh(e%DopIHzUmZC$?RjV_Nd!hM?3#?RKIzFFcEh_-0qU`9cSX
zr!KC#WqhG8+is+6vLW-2OXyUK<%8nS80=YdefxRkmj03=<~F45kzk|tJJIP_nR2VK
z%)0y24TeswC@7<Qxm&AD7U^C}dwA)R=9kB@HO~1W$4V(56ZJfn?*t?y1f;w%nU@G_
z_4i5v6kgnZM|*Fk=Lczns%SIylr^A!F0aob6~aAJ$$2N33Bc8c74BYurFR`CD5Wdg
zht&B)rxtzK&VLCEkw?*-^FxD93b=kmV;YCz^hq2|V$>o*CPlN~Tqy?Ye={x<K6PK)
z(WQU_9u*fV2dDCN`<7Q)Yv+ns`|{|M+@=E1g30w}Cd!j}X8H&a6juXU&wD&;nDKy}
z{hq(%J^?h_y3f4#VingRY)qf^Ra8|~RaI40QYE@I5XwX2Oq^m`rW*E~IY}g0B$B>0
zNUFKW;!0Ik<V96gQC8$tRaI40Rc>9%k_#kNl1TzdX}NKW6s;8&qe{0Rd@j!9!(I)0
z-<DyozR}H7WQ;=%rz@0kl1Q|om9j?Uwr9TnV@CutS2R^n)sC_{!n@uL7)~nJbHNNg
z4)=Z_F7~%@_iU15<C*$S-MpQ5==prM_hwRq)3|kjImG%5^fCkq1NeMpAta{`A|0qb
zd^=1CIZemAhTO+@9kDt5g=Gry&<R=|IzbTxL=hsALP$voAtWS(kdhKYNJ$AHC!ep+
zqG?=p(K_ZXdHc5cIUTu^9(}aNN~xTVe0KKlT=P|3VXoM{7@k?3#L7y}_Q8O;2{TY<
z*v&R#dAH_sm~n{`{=C-BGLmLrTQZw$#s*=qIWkEyh#@39i6yiQ*|TWg=a#|W*JijI
zG*Rwn2_l?iB!rTu8@ju@E<#<{s$7JSl2p60<Wfj`l05+SE0ik+c|u4@2_Ym>NJ$B$
z-CTr_k`h8lNeLk&B!rNX5^}n{V#~X_ySwsp`H%xwznO)%T@cJLnI07}FYc$etl?Vs
z=uH9`n{oR05G)oPw)j|Hwi~wJ(dqNY3rl$2Dq;wTB4$*~&2<z@RWi!%r0dzmh>u!l
zo-bA=Bzw2>aA5GD+|hT7#xcqs#llFWkVQ??8Uf`%%Mv11=Rl5$n5TUM%xpaHQO>rN
zBFt#dQzXn0r6EL5vmx(EUT8x(6;AmT8u@Y<k>|1F<yz-ug%6csx2#2HY&-pXxLtF9
zVnPI|;qWmmJ#B(W@#XDj=G$(Do{gM%aXv=TPN@r#Ue29d<X*+kH1SAoks7%bT>7{N
zR}Aw_INjCV-CX7en)AKz@BE!v6&Te(`KK&f)(q!z>A{?rB4g8^S3I8V@@8>(Z0gyL
z&1txSqdqPIQ3MT-iTnrE<2yC7j0#bOwvsWDB&Sy0o)A^YBQ~sPD2(r*Oh9e{L6+`|
znG)mF%FH#cbME@P(l5MZbvJC2teVV>PTKcZ&31Zu*&t*F!;b4@IB@pXhu0VDN#VL>
zx`0FsZQxm-&H(4jzdZYQZdK@1I$m~N=2e|8DI_Gi--8&6sESFStIh{Kb$D{-J};xO
zw{KO2-P)?hRUGAAMrv<EEL|0e@XW^JJd~0w;o2)sll1^L9~rah7oB^=wb8cvyKm05
zXGC(Cw#)Z?(+$5@(gnxQd=VZZULa{&HZhHPMqQ^(fLULOVEm~@`vA}*YDl;knt)TN
zmfRzyMePJ{q&vOzWsfy=6|!U&$|#i@s=C#{lvtB8&wvVE^$i<chrH;sBi`pE{dYLJ
z-9r_q8;Ca3a+u!CnIg2;4EZB}<Ma9M_>SE*UP}Q(Qx+RprG3Af4aexpaw!WKYxgyy
zmM?hF|IeKlr=-xWkKNZ3rkDRj!+NvF-;EM^J-fBHLGy6vecd=f(zE6p0=s&i3@^FQ
z_cnX9`u+-dx)`pPg;}6G4hFd95Xr8;udqwB7jp<amVfB2Dvu_V34ojcK?DUHv4YG{
z3JNE;Kpz*PtMXfD*-;b_?&N&JWFQI|zs3*I17O1zY5+q70>qolWqouA6WGEV{Sc54
z#kgRj=76F>>w<#d*#TP!B!qzo2_OVu3}6Eoh{%FSh!P4iD7J!x+H>SB_OD98FQ*t4
zBdv?6B+!DRJ$?(^6$<a=CSIq{a>R!PSB{iDpd_+<uT1D<3g3Oy0!oT_?I@d^j$O79
zFupHo<bqikG31al(a@-)O7y0R7vCLmW78|jXJp?rY|0FmA)^7T-EGb^r^@IsWLpr@
zRqD<Q|0}P)Hpz}J4S%Yb37)^KlV99d2Zs2}e=q%cNdE4;@cMLzp>*Q}?uwk+tj9R}
ze<c+*>B`z?AJ}YNt`By3RR!BpS%}=!Z80XERY_0qzSgJ5NovQ6(hSZ7gm0K3NNKd^
zykhao2CSjoDV?-bn@P)_-2sdnO{>3%0UO#~j1YTBhVCMDAze^FDHlp1NGiIZ0#U9%
zhoPUd^uv}%6ZTs%2?!G4)XV`92m~b`oid$6K+M3+Qn-20bEl~Hyg1C)+feI%E`y-u
zIOiSrfRHVpJ}K_*_(g``zQ1kv+~m)Eajq^F<ea{{@#8z2ZZ4%kHrqDhB6vAIiH+-M
zPWCSEzki`RByWm0-`1uI0~e+&Mc*}$^6O7`)I8Vm)AW|ZIP<*x&z)W^>wRJ}^_wmI
zpPO8%+2^6CHnKi(y1xE%Y_y&23Uxwm5odfYc^ZyX(s<)Brf)T=(B>9sH6$20sjSZ<
zWL#brBRo^O&V*$}{}mdN#Vrb9cBSUSgjQVTmSD?tajmZh35ihOosry3iL$7OgDj^q
zZoEg7<jt+Chl3@s=VOJgS@TO3vZ~u{?!SPB$rmhLT;A;knJJ_mehJ4sZrN;8_zR`8
zp0~BDqvHphYg_H99!KGgapCEGE59llgIIlT)JDbUk#d^a%d?<oc-x4*uIX=uUJ<Y`
zMU}EEQY@QMp4`@3zPn!fb3|N*kviao<JWhi(zKaO)`O0<yIqrr5QAE=SB$P&rFK)&
z4+mQ+UY13D;Yjtf)rE@fM=se95LDfnIhJyZMs=(MeM2aLqCvdBQNW`^kDpqQ)?24V
z-MrD*Y<0S)CIMK%o44&~&J@nU-s1phIXx+6ZrjP$=U|Eel&At}-Pkr%IJdM`2p43M
z90{UxdL&0+f1QC4_iJo1*psr>du7|WVQx@?*?=1bLWGcn187|5`rT=V^-=qIVTO6@
zrWRQtN$_7<Z-6Um^;(6bL<#{wfb{w)iVCEP=lS;++3VZ->vu!fefXfs1Qyta!VZp_
z6JZ5+DcP??i4)xNupuou`5r-QR9aaU^UM!rU~;s%rJgq;s|Bxhilm@nin7WVsRb2C
z#B=;`31ri1eE7xJiv)}*1*f|(RurWo#i!z`4<G<T0cE6WfYkvC^_*jx51PrSRoQ7%
zL>#MGT6Kd|E$Ao#b}r%pNZp7FQ4}c@SI-QMfB<0t403=BSQ>5@YHUCOhspMn!1v&M
zNU4Ly+4DtxI%j2GK2Len;qBIGhr$)<!kcr;f*US2XOL~@V6GnK_yw55HM1|r?dZ!#
zjG1e_*}~}X<r9W~btk^5w5MCXBC-s_9z|tAl?IvvtL1I$Ts@PzlvPDlsYOVt`F;Ir
zoPt!oTDc8vJ6jW5n7i^P2U@MuTaB<}7>8y#4mEK8i<#{Dj^tT%#$wmt<;N)uona3i
zu8!;Wq8qb5#j}+&F;#0}4X}w&5bd|Xb(KC54SaITSfXZPs@B3ABuapWaOQur{oqRv
z*uvBdI3e^r7vIZ;N|j{uEOpf!m<6EA8-!93I8mqxw=EsIl?1Y<fyF^VFV=yYA&F|&
zOA;;y5rTreAQdxe9%{!n7ObIEy(!dU%-3x=AZA@b&5U-jzpb8XUcj-bzC0vTN2MZj
znN<v`JFIE4t1CTgS*cV+#F}LkoOrF?H*VJ~vUl8foH$GG!7|b*4q>AMgC=*On9xe?
zqFa8oqACbDL;%_b^s#=D1wiK2682EQ!yy6z@#(}B-Ov!hFDd-F2^5EE0i=gK<xF*j
z!!ZuGbXPY?PIC(E#2(vbox<uQ&`8A$A5;Vxzz~j|%zAHgBQ&JQ*y%20WhpX?1bVQe
z5pUn|S#maWnU~aUq=hRpFQ^&WwC+Zl07<d~p@gvl+!*b(ZwjT{H7!s8LqK`wvC##E
zjBIRn4ZP<Bj{7^XD9&qAg(iXQJKE7tDO!{%H+OLvunfTlPFcn_cD8iowmnKJ8fx`x
zTAtKBBxNfZO(^oAe!2uSLx-GENKsHR<2?lI<rFAIDO(bwXL}$@m~W9Q4U2W1dP7ud
zoFELE#f4q9oey&SEuy~*rt(@Td;x<kXtCQ_k<JoMiC-aZVAw=JXuwfu_@^Lx5NtH@
zd`|4UyZZ+D`yt)k!xP8=BpI2eCe9t*+%Z3Yfd>B&+z_oU<=-jpOR4#7G->P%LcMSe
zh`1OhenH_t@o2TS4Cl%ff}m~N(VkMdz1>}h6(UH8TN6cSwU|!Y!|AY;i47<xd!Vra
zd|W08xw`AIt(ReaFsUr)bWbPKuH6lxX=>qeO085Pv|v$mCD&%6ndGW+NP;R&Y~RnO
zSj|+48WxpFosH15cy{!Gn_OD(_P&?)n5z=7L8viY03nYpo>T&-Q=q|vRo|{R?>(3s
zb-FKMhjoQH4m~Q;Z3d)~0T!-{QxR=0q#_w~&t&CY+bU=vKtNqig>41Rg<3|&h`I{x
z=0f;kvq!c<Cpe>^V6q}?YO)bFMI8{wh>cfN1(CKy8FOL;1PE(ZlXbs*Lvaz=U}A<C
zcAWh?NR77CDN2zQtyW0L<jq8D)Vb-9Gh}9D;>^s^5DeKFnHQLY)DIU|7^z?7#C#mm
zj~gMnR->`aDD1Id0ymh0K9k|E^U1zpU2~9IxH*1GSph+A8S?Bb9XL-0J(Sb02Qh?n
zqN=kf;Yx$AaTn!qAtRP2aL35^H$5K7MTIZB%fsrBgbglE*BJ1IfMFP?pfLkPsALVG
z?H_`miM?W%w=*)5NhLEgDSBXo0Oy7#A#tB2_<tUl!s8ghmRd<6B$9m!$UQajaDgOC
zDBD$4f%o<Fy>k{u<=;K(s_ZDEfYhf9<3K6b*v~UFF)rpB`Y^_#BC3)~s;a3~Mp<QL
z-P!iEe$O5m=az1H=bl9TN~)`X+jH^njmwaib}VhT%ynt_yDw=bF>+$@B*r%ez;X`V
z4#+}F4guC|90N_ts;jQ`RnuNsm&iJ63DoPA1%=8I#OF&Ds`gh~P*hl<8AyzCCCI>i
zQ<a#XzqVm<F^OS-?&!U8EbT0?$T}4dC0KGgZe8JcUQ#N_JV1qb!+GULIjF=iG=Q?c
zgp!ceeF-v28ZPgmA>JA3-B+kH0`pN+-`kTV>Wi3cQWy>Zhb4}aT3FR<TGFd|Kq@YS
zF{V5NaDDkUj6+cJ=pBKffZ0`C6};kOEJ(6U!>>Kby!oh9B_mZZJ4A>B0>ELkz13$}
zbv<GtY^oNQU3IjJuEvd`U(3#IxP(T)u!Pfq@ZO0C=9e5yS7^3eBq1auiwc*OxgIb(
z5W<m)q8xqq+7t<@5d{YbD50D)iGNa-X39V`1f3;@qAfq@8Uf5HLG^+<1;-_O9Gu7#
z3jiz`Vt<JxDM`Sfct6RIWE=(eay!mId-)QxdMP+~>%|LcR6<DtQVd&Sz$m2b`rL%E
zIExH#{PCI=0Avz}dC|ZGPnOx%(bf#E0)q;dg(O`sa{yv@QrMIgJp61yty<n4wqz=m
z6-B%j-9@OZ5(D?l=yF**tn}=Jyh8vyyY9sqG?9ZtM=mA-z|<N?hc+vzP~08ZZz;NL
zra}#gXF=2p%m6pSMwYt>s<7!2e*9A`G0g6r@!h?1SonvDwCo8)7~j0()-7|fB9Fux
z7d6&e0@SE0L;in-!Fv(FL$?vY1qICveUVntOX?u7E$lX#Ss{pCL2e{KB)sKy)dpuW
zn@uK0X@0CDY>BZbd<4l-tR&mED1+pJd@ru_G_E4?g8Vvh0p1X8xXw%^jVuaCq$DjG
zRfPwy?rW*EO#!RW3|M~)ya9=tU=U@fN?%cO*u$v2;#usBDM!b`b94tW34sv+R$!IE
zp#8T|D=T-cu*$IC5hsW+;4IQvA$zt3*d)w=E*O{uA%eEWZ{-4l*BL4;0YPv^?fcS5
zs!HIp^kIlt?8|42-0glUv99@}Mto9exK@Uy#m}JhYTh9LQ*c0h2D#<#hOVW+R^d|n
zPMSrR)WnuiGU?g{_x%vC60;<1Gr+^1UhL^XS%5PsX)EC&*h&G&iAjqSx=c~j$`*Z0
z_EhxV3ibd|zyhJ@B$tGx<}zr+@Xi8R6+z}~w+tL&_cB?c6{qv$B#I}RyebYQoLHN1
z!4reobE&em+RW6`uPm+=SsEcIYUOaG;YcKgs>xdjc+_uLgqj$xGK_7T?NnI;+9q_d
zv28L6=-mLslH*efWQH^?R<s=0HVINEro%+mB7*O1yS(nlfMS?suy5bPr)?bTV%P;N
zS6o}Spf5r|mFXWA?giW%g@6n~LR}%73qb4c;kURH0Z`fRZ|<`HrD~GrVnqttkZZco
z-p-m*IZY;nux#HdH3S5rH?_-Y2@57b!tT#6<qa(Y^;C~sg<LrUL6yinH#{|aMGlfS
zfNqBHk`b`pBFIXN3sOkUBWTj4fqB-#+24NW1zymw20$33Ri@`wc=E0kw<!uRF$FGg
z3K8!;n+-=#S>b+0;VC$55*E7w#_1$jiUQqvGTYJ%0c5@4krspdb_rmYUiO!rm*5AT
zJBol+J~tQ(06Ba+Vi5Q|#;;;RM2rxCX;GwB9V8)$O~^$_NUcotj==%~p99_$F9ESA
zV2~xOp71qB*%nEmeJ?lIT55=biq$H%)iu;YAeCUUvI7f=TbM<v14X{g0*FgJO*aK-
zR0<{!6JkOHtcJl5<YBwSC=@z@oCCZs7D1XIHIUFFva}S7D;0?_DTtN@c-1Ko`6aP@
zvB=wa9TyqN0on%IiKD^*h)!A*H1_;N5)4+Jz`0xQv%-omO(WdIC<z8w)qtfXK|@K%
zDLda|+Ul&he}%<H2T9mkmh#&&K@D3W*i-c}DwGZbIj}rM%ZSD_gb82K*VG-xL2$jh
z+t8_aeSz-{+O+ip6dYSOUKAQLxL<mZZoXNV2BMD=^4t}mN2Bx)V~2tYApXiimVl}F
z<PSCWJ_FuxDrR}dXPGSYFVL{-1A1Jvh;4@y(2!HhGCMT@yyX5pBqc!3AQ-J+&gH-b
z8rUOtJAB@Yzbj<UV0l-3)190Y`;EB)iX+}Wl*YOu+X%!K3<^+C1u3U^2fP`8d#1pA
z;X8L%I^6?Q96$tme$H#-QwC=Q$+iJrz&j!p90;)hyHe)u0(dH#9>*-Uf!+lKdr1we
zx4EwKsL83#4gz4f?>fcAG7V2q&@KZ%F88wUC1{O|3Ii@oJ0LQUfb@ZMt^9#PH-XY%
zdC~}giw>7`Rh34-XdT61><bLaiu@Se!L%+!0ppjmM0o)!4M+}XScgat29yMlkud<)
z@c0X8Uwx=Z64aCD2h}(r3Zb@=Ol^*UKZ3U;>2IlK>_Vq6DBsfI8S_QpXG5*(Wl<Kf
z88C1`w!pCqqH>@l32bVt#Rb03CMg8t(xy<FMwoNxDxLxQ13)}1H}{^gso)OhRBA{f
z9?NQulEXs-q4jw8fgnnx1P=6QlWc52*oM_@L6JbCb$Gy`gELSYnMAB`v}*>&E7xj6
z8evt04Sy_!Oc0nh7S(7;ZD!#G;>r{{S&qD$$!PZREb2a$T^a`&SxYWCmf#Ele+VrF
zplD@^s?3y)3+nJxhBU!jU)s_|sI5>J9JL}?s4mfg$V&Ab0svw0$venz1S=r}#EMqU
z9{^AwTbPpM*CWhKIxM0$fdDoods4+Mgj62tq|;p`4tg@gTB+CcH3xe}0>DUZ1@?g?
ziDOYJB7-@|MLXmVy!Z%=8bYn=3xOZ21h@dhP%Ov^m1#t`351}e3=@K(e1e+F4Zw1|
zNUXiS`ca_~U7}4y0SpG0(!klJ+ujEt0UjNM3IjPDhhTRd#=z?;7mV6nm|TzvCKkdD
z;VA|3Eh>yd_t#__3wI{QH;5LHE4`@_6zK}I*n^J{AV~iz+d*xqVPZw%RJ<41%q%Zw
zl1cZoMhRc^8ImrbXT~v2GsS>V`+kzB;n)XX5{4{+LKnxj2_2Z;l$h)~NEYV4f>bX6
z=@`G8crMKX7?)6>kF?Dfi_7&eHi>S%aWndiK(Sk8Z(9dpO^r%}kDtG!nD)7>Qef`~
zM3=arikAe8Uy+9cw?PERc1tE7mJJ1n{T0&e!{}NghhC!bJbj=#f2okot2gW(_A!~<
z1`8mRzbOj^U<FWiE@KiTAPVT$F{^O6YYUA3c!l`5zJ0VW7Kk!~5C|X@kx?7KI4}Y^
z-wc%u$7rxG%8mmiW<Z%%S%H+5ey@KlI5b44RI2FI4;I^rf@44~AV7o%7BM7fuOw;&
zss)mdAuwQC5N3)V7*$nY0KZ#ZuI}s+3dp3b5x{_;!UEC&F9sXP1Xz6OH9`}=&qyj8
z4lp87V9+{r$MaD`RcfN&LPQdCX86q>e=79z4GU<g#dpqP+;QjHs*g2(1mVxHl)3m9
zsQ~E$@a4_197YR}<nalCrpzh<x70wZv+WMB3^ycnutL;6?2(@+50EPL?-Di%b6s>h
z#xVw|Bx=yVPy<V5_}f+tZ4^M5#t>9ffk|2+#4DNVXrs%1I8@*RAAxGH5Ara?XoQ_s
zEn>yy#Q?@L+hQ=NhZc`Uv)Av`3#X>H4;Hu0;c?NGdDkm$E_0k{^kg)+k6SWfjj*D(
z&5SeQ1rIXf$_>uHy(J%m;LnahS_1;AAtsYamZd2qOrf?b4eT^;IvIuO8t^R+K*OwJ
zT*Cqcj(&}-!b4y%sK7NC2S%;(KPf|T@p=Y_6=`A&paVuKZrEPIfus^Xse&dZAtp$s
z87C$kspZ~T>A-svL>mA^;U#BSNHOm3{I>nrU<85aB$$a6rVlQGRd>I&iuv#9HUm^q
zz_3hcHnCs;A&FFKE{|3$&<t8z1(3pt()cJPAyBa^gslZLQ{GP&1Qbak;}^@13-m(2
zF!K;;*x7+7uY}gu*w*Wn?g`w0ZuVvY{jxGogQN)lHrk|6+i5ZS@CDVX4ghcRI{L~0
z*pO5@&#6_s1`T5lD82Hujy$!uTvR;(Jh@QO8LJrrNRSZM0KJ|pB(S3P=|otyowAF;
z*PL#_W3h%ego$R7m5oB+uvP|yiqQ52g6InoXfbjK*_u=ksKgXA5OqibgtoPk0iMLq
zecdPuD*_w#a!#3;S!)ao1O`Q|0S$>tUabN%6)m5X!a<|~oUg_wj_hRP=tvhm_-qC9
zP-A>RArO*=C&CL>1Td<kdLYLVP_Jk;?N%rNylj;wB?CQRL1-EYi9nZ`kQpIR3=zes
zw>zN5SS2KsFi`=+s?gMwgK1>*3dn3V1GMPt3PK0S#1=v9F9X^PKZq?iA5!7%77Ji4
z0K5g<TnEqz0$hV=msf}q9JhC?1Efmx2GLS6L1-2t;9cltBn*R!gy<IZsBOh0xKl7=
zL<}H^G9wmSq<|DPE;--kx#&-4vB&-G_V_wlmVYO4{vf$7zOO{aLBSwENN^XQKGAoF
zKzbOI7jJji7vKbgH!nB?-a~KB2vRsJv%_PsmX_8RC8Xx=W!%FM)VO7Vk!b=j5qLbA
z(Er2}Jjb%WddAYC%y|P9eX12e7P>8kkR4edVn(n-FvSx5&lhnBnRU$7t91cu0f51N
zpNLTE4x_x1#I*>G2?hDGE;%F$D19NAthB@i_?W~ZA}4_Hjnlo~{QE`kMS)pS8px3J
S?3uzZ{9VZu;X*?p^|>%abb%WH

diff --git a/docker/bootstrap/debian-7/baselayout.tar b/docker/bootstrap/debian-7/baselayout.tar
index 42188128acb5300aa06eff366c8e9df6f2a7817a..cd19b173ed46546325b2056617d445c8952b3063 100644
GIT binary patch
literal 8478
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
M<ce^iAR^&P&Niuv-T(jq

literal 8484
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
S?3uzZ{9VZu;X*?p^|>%abb%WH

diff --git a/docker/bootstrap/debian-8/baselayout.tar b/docker/bootstrap/debian-8/baselayout.tar
index 42188128acb5300aa06eff366c8e9df6f2a7817a..cd19b173ed46546325b2056617d445c8952b3063 100644
GIT binary patch
literal 8478
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
M<ce^iAR^&P&Niuv-T(jq

literal 8484
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
S?3uzZ{9VZu;X*?p^|>%abb%WH

diff --git a/docker/bootstrap/debian-9/baselayout.tar b/docker/bootstrap/debian-9/baselayout.tar
index 42188128acb5300aa06eff366c8e9df6f2a7817a..cd19b173ed46546325b2056617d445c8952b3063 100644
GIT binary patch
literal 8478
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
M<ce^iAR^&P&Niuv-T(jq

literal 8484
zcmV+<A=}<UT4*^jL0KkKS;&2EOaNA+f9?Ie0APRr|NsC0|NsC0|Nj685&#eY009I5
z02p8>Ui<A7edmf_0Csc09@y_;$*m_W+1a~o+vW4v_3J+PkbAoEqr2<c&wAf|%?@@t
zR$3MBuf9?A*Vk`-fEooHy*dVhfC7aD5}*JDP%4AyYb5~s8r~9wQ^-R!g*`CTdP1J3
zr>c6MO#*t2lwql(Y7H7aBSvau(+J2kXf-gHfdMo^o+Tbo^)^V+pc()JL5LbQQzxhZ
z00g0;O)2P9@urZ<dWWW=i1iwJYI>O(WXSam8UO*H0001#^pXfQF%<O3r=awy_>)t5
zLq>^)gbh5AkQp|hzye_gm_(%12{JuR41m)kCV&9YG8!2G$Ql{|0006+L;ye#049QD
zDt?6ZPs*MY#?+f9r7=HLJx@?E41*&hPhdB{-rY|*2_{3jLoK*mlF%@uj1VQ^09zO*
z?DqQmX9=Y}^7@bnOL%4pf-Wk-x_m~EboVa~IPeN+D}Ndg8d5P5sRDv5P%I$;V8#|S
z2($>oj1VfeC@2z<5}H6!L1;xqL})=8YLQi{p-@(Zr9rBsQJ`p5X;GyS6cM3BL28-;
z1d>S^2p~wv1SU=Vqf^WBD~aB?oKa~SM!i&3I7#Tm!j{TzkC2s<kj5&%=OrO+L`qs}
zma^)o(~KD`lwi3WMVZXHc4higPf~sqv>iV^!Q2?5hi`<lY_jXe*)Z2IOI_KTS;8uK
z^ih}{+;Z`gu&~qSbAF0~mJ`;Yn>3`x^?WNDk1guzxOAvenXrDKMv{CY2ndZ#4^oSx
z&xPcfiCF7aq>cIC+Q&)=s;Zb%S(5D8Y4p`s4c6>B><E~M+%gY63X7E>d^&f<)jURx
zyn^5=B|s@NLF#)Kpe{mzAqg$um;eEKLK0p}m<Qsw>Wqc33xF-htHyq$B~Z4>7BJQJ
zLaN5*LTf5we?<XeB0gdFl^KV(m{#l+2`#%X%MANJbd}ee{Aq#qF+kg2C-rYJG;Krv
zv;8!bzA>J3+*rI&igG!h3<cO<{A>6+Mn1MHoU1T9F<dv)vf+k#I}#v(i9yd$Ht{Zp
zW;uDed~<ViczL7YAf@hky;h5P8{I35LwkikL*B0z_r2mW^EO&~J^JNNUWyunR<gcx
z-Cuuv+bt)1LY+{XgjwGUUPhypG@ddZu7#VJ9N5^bQj!p<0ED)!C$@T9O5qvwu00j$
zr!6|jZk;ZB?g-01a5E92w)?qpcc%5<efQG)kliBXi?7Lqj6DiklA2TZro6R!@Vaw-
zc^5|NpDb-YGPTOvzIh(e%DopIHzUmZC$?RjV_Nd!hM?3#?RKIzFFcEh_-0qU`9cSX
zr!KC#WqhG8+is+6vLW-2OXyUK<%8nS80=YdefxRkmj03=<~F45kzk|tJJIP_nR2VK
z%)0y24TeswC@7<Qxm&AD7U^C}dwA)R=9kB@HO~1W$4V(56ZJfn?*t?y1f;w%nU@G_
z_4i5v6kgnZM|*Fk=Lczns%SIylr^A!F0aob6~aAJ$$2N33Bc8c74BYurFR`CD5Wdg
zht&B)rxtzK&VLCEkw?*-^FxD93b=kmV;YCz^hq2|V$>o*CPlN~Tqy?Ye={x<K6PK)
z(WQU_9u*fV2dDCN`<7Q)Yv+ns`|{|M+@=E1g30w}Cd!j}X8H&a6juXU&wD&;nDKy}
z{hq(%J^?h_y3f4#VingRY)qf^Ra8|~RaI40QYE@I5XwX2Oq^m`rW*E~IY}g0B$B>0
zNUFKW;!0Ik<V96gQC8$tRaI40Rc>9%k_#kNl1TzdX}NKW6s;8&qe{0Rd@j!9!(I)0
z-<DyozR}H7WQ;=%rz@0kl1Q|om9j?Uwr9TnV@CutS2R^n)sC_{!n@uL7)~nJbHNNg
z4)=Z_F7~%@_iU15<C*$S-MpQ5==prM_hwRq)3|kjImG%5^fCkq1NeMpAta{`A|0qb
zd^=1CIZemAhTO+@9kDt5g=Gry&<R=|IzbTxL=hsALP$voAtWS(kdhKYNJ$AHC!ep+
zqG?=p(K_ZXdHc5cIUTu^9(}aNN~xTVe0KKlT=P|3VXoM{7@k?3#L7y}_Q8O;2{TY<
z*v&R#dAH_sm~n{`{=C-BGLmLrTQZw$#s*=qIWkEyh#@39i6yiQ*|TWg=a#|W*JijI
zG*Rwn2_l?iB!rTu8@ju@E<#<{s$7JSl2p60<Wfj`l05+SE0ik+c|u4@2_Ym>NJ$B$
z-CTr_k`h8lNeLk&B!rNX5^}n{V#~X_ySwsp`H%xwznO)%T@cJLnI07}FYc$etl?Vs
z=uH9`n{oR05G)oPw)j|Hwi~wJ(dqNY3rl$2Dq;wTB4$*~&2<z@RWi!%r0dzmh>u!l
zo-bA=Bzw2>aA5GD+|hT7#xcqs#llFWkVQ??8Uf`%%Mv11=Rl5$n5TUM%xpaHQO>rN
zBFt#dQzXn0r6EL5vmx(EUT8x(6;AmT8u@Y<k>|1F<yz-ug%6csx2#2HY&-pXxLtF9
zVnPI|;qWmmJ#B(W@#XDj=G$(Do{gM%aXv=TPN@r#Ue29d<X*+kH1SAoks7%bT>7{N
zR}Aw_INjCV-CX7en)AKz@BE!v6&Te(`KK&f)(q!z>A{?rB4g8^S3I8V@@8>(Z0gyL
z&1txSqdqPIQ3MT-iTnrE<2yC7j0#bOwvsWDB&Sy0o)A^YBQ~sPD2(r*Oh9e{L6+`|
znG)mF%FH#cbME@P(l5MZbvJC2teVV>PTKcZ&31Zu*&t*F!;b4@IB@pXhu0VDN#VL>
zx`0FsZQxm-&H(4jzdZYQZdK@1I$m~N=2e|8DI_Gi--8&6sESFStIh{Kb$D{-J};xO
zw{KO2-P)?hRUGAAMrv<EEL|0e@XW^JJd~0w;o2)sll1^L9~rah7oB^=wb8cvyKm05
zXGC(Cw#)Z?(+$5@(gnxQd=VZZULa{&HZhHPMqQ^(fLULOVEm~@`vA}*YDl;knt)TN
zmfRzyMePJ{q&vOzWsfy=6|!U&$|#i@s=C#{lvtB8&wvVE^$i<chrH;sBi`pE{dYLJ
z-9r_q8;Ca3a+u!CnIg2;4EZB}<Ma9M_>SE*UP}Q(Qx+RprG3Af4aexpaw!WKYxgyy
zmM?hF|IeKlr=-xWkKNZ3rkDRj!+NvF-;EM^J-fBHLGy6vecd=f(zE6p0=s&i3@^FQ
z_cnX9`u+-dx)`pPg;}6G4hFd95Xr8;udqwB7jp<amVfB2Dvu_V34ojcK?DUHv4YG{
z3JNE;Kpz*PtMXfD*-;b_?&N&JWFQI|zs3*I17O1zY5+q70>qolWqouA6WGEV{Sc54
z#kgRj=76F>>w<#d*#TP!B!qzo2_OVu3}6Eoh{%FSh!P4iD7J!x+H>SB_OD98FQ*t4
zBdv?6B+!DRJ$?(^6$<a=CSIq{a>R!PSB{iDpd_+<uT1D<3g3Oy0!oT_?I@d^j$O79
zFupHo<bqikG31al(a@-)O7y0R7vCLmW78|jXJp?rY|0FmA)^7T-EGb^r^@IsWLpr@
zRqD<Q|0}P)Hpz}J4S%Yb37)^KlV99d2Zs2}e=q%cNdE4;@cMLzp>*Q}?uwk+tj9R}
ze<c+*>B`z?AJ}YNt`By3RR!BpS%}=!Z80XERY_0qzSgJ5NovQ6(hSZ7gm0K3NNKd^
zykhao2CSjoDV?-bn@P)_-2sdnO{>3%0UO#~j1YTBhVCMDAze^FDHlp1NGiIZ0#U9%
zhoPUd^uv}%6ZTs%2?!G4)XV`92m~b`oid$6K+M3+Qn-20bEl~Hyg1C)+feI%E`y-u
zIOiSrfRHVpJ}K_*_(g``zQ1kv+~m)Eajq^F<ea{{@#8z2ZZ4%kHrqDhB6vAIiH+-M
zPWCSEzki`RByWm0-`1uI0~e+&Mc*}$^6O7`)I8Vm)AW|ZIP<*x&z)W^>wRJ}^_wmI
zpPO8%+2^6CHnKi(y1xE%Y_y&23Uxwm5odfYc^ZyX(s<)Brf)T=(B>9sH6$20sjSZ<
zWL#brBRo^O&V*$}{}mdN#Vrb9cBSUSgjQVTmSD?tajmZh35ihOosry3iL$7OgDj^q
zZoEg7<jt+Chl3@s=VOJgS@TO3vZ~u{?!SPB$rmhLT;A;knJJ_mehJ4sZrN;8_zR`8
zp0~BDqvHphYg_H99!KGgapCEGE59llgIIlT)JDbUk#d^a%d?<oc-x4*uIX=uUJ<Y`
zMU}EEQY@QMp4`@3zPn!fb3|N*kviao<JWhi(zKaO)`O0<yIqrr5QAE=SB$P&rFK)&
z4+mQ+UY13D;Yjtf)rE@fM=se95LDfnIhJyZMs=(MeM2aLqCvdBQNW`^kDpqQ)?24V
z-MrD*Y<0S)CIMK%o44&~&J@nU-s1phIXx+6ZrjP$=U|Eel&At}-Pkr%IJdM`2p43M
z90{UxdL&0+f1QC4_iJo1*psr>du7|WVQx@?*?=1bLWGcn187|5`rT=V^-=qIVTO6@
zrWRQtN$_7<Z-6Um^;(6bL<#{wfb{w)iVCEP=lS;++3VZ->vu!fefXfs1Qyta!VZp_
z6JZ5+DcP??i4)xNupuou`5r-QR9aaU^UM!rU~;s%rJgq;s|Bxhilm@nin7WVsRb2C
z#B=;`31ri1eE7xJiv)}*1*f|(RurWo#i!z`4<G<T0cE6WfYkvC^_*jx51PrSRoQ7%
zL>#MGT6Kd|E$Ao#b}r%pNZp7FQ4}c@SI-QMfB<0t403=BSQ>5@YHUCOhspMn!1v&M
zNU4Ly+4DtxI%j2GK2Len;qBIGhr$)<!kcr;f*US2XOL~@V6GnK_yw55HM1|r?dZ!#
zjG1e_*}~}X<r9W~btk^5w5MCXBC-s_9z|tAl?IvvtL1I$Ts@PzlvPDlsYOVt`F;Ir
zoPt!oTDc8vJ6jW5n7i^P2U@MuTaB<}7>8y#4mEK8i<#{Dj^tT%#$wmt<;N)uona3i
zu8!;Wq8qb5#j}+&F;#0}4X}w&5bd|Xb(KC54SaITSfXZPs@B3ABuapWaOQur{oqRv
z*uvBdI3e^r7vIZ;N|j{uEOpf!m<6EA8-!93I8mqxw=EsIl?1Y<fyF^VFV=yYA&F|&
zOA;;y5rTreAQdxe9%{!n7ObIEy(!dU%-3x=AZA@b&5U-jzpb8XUcj-bzC0vTN2MZj
znN<v`JFIE4t1CTgS*cV+#F}LkoOrF?H*VJ~vUl8foH$GG!7|b*4q>AMgC=*On9xe?
zqFa8oqACbDL;%_b^s#=D1wiK2682EQ!yy6z@#(}B-Ov!hFDd-F2^5EE0i=gK<xF*j
z!!ZuGbXPY?PIC(E#2(vbox<uQ&`8A$A5;Vxzz~j|%zAHgBQ&JQ*y%20WhpX?1bVQe
z5pUn|S#maWnU~aUq=hRpFQ^&WwC+Zl07<d~p@gvl+!*b(ZwjT{H7!s8LqK`wvC##E
zjBIRn4ZP<Bj{7^XD9&qAg(iXQJKE7tDO!{%H+OLvunfTlPFcn_cD8iowmnKJ8fx`x
zTAtKBBxNfZO(^oAe!2uSLx-GENKsHR<2?lI<rFAIDO(bwXL}$@m~W9Q4U2W1dP7ud
zoFELE#f4q9oey&SEuy~*rt(@Td;x<kXtCQ_k<JoMiC-aZVAw=JXuwfu_@^Lx5NtH@
zd`|4UyZZ+D`yt)k!xP8=BpI2eCe9t*+%Z3Yfd>B&+z_oU<=-jpOR4#7G->P%LcMSe
zh`1OhenH_t@o2TS4Cl%ff}m~N(VkMdz1>}h6(UH8TN6cSwU|!Y!|AY;i47<xd!Vra
zd|W08xw`AIt(ReaFsUr)bWbPKuH6lxX=>qeO085Pv|v$mCD&%6ndGW+NP;R&Y~RnO
zSj|+48WxpFosH15cy{!Gn_OD(_P&?)n5z=7L8viY03nYpo>T&-Q=q|vRo|{R?>(3s
zb-FKMhjoQH4m~Q;Z3d)~0T!-{QxR=0q#_w~&t&CY+bU=vKtNqig>41Rg<3|&h`I{x
z=0f;kvq!c<Cpe>^V6q}?YO)bFMI8{wh>cfN1(CKy8FOL;1PE(ZlXbs*Lvaz=U}A<C
zcAWh?NR77CDN2zQtyW0L<jq8D)Vb-9Gh}9D;>^s^5DeKFnHQLY)DIU|7^z?7#C#mm
zj~gMnR->`aDD1Id0ymh0K9k|E^U1zpU2~9IxH*1GSph+A8S?Bb9XL-0J(Sb02Qh?n
zqN=kf;Yx$AaTn!qAtRP2aL35^H$5K7MTIZB%fsrBgbglE*BJ1IfMFP?pfLkPsALVG
z?H_`miM?W%w=*)5NhLEgDSBXo0Oy7#A#tB2_<tUl!s8ghmRd<6B$9m!$UQajaDgOC
zDBD$4f%o<Fy>k{u<=;K(s_ZDEfYhf9<3K6b*v~UFF)rpB`Y^_#BC3)~s;a3~Mp<QL
z-P!iEe$O5m=az1H=bl9TN~)`X+jH^njmwaib}VhT%ynt_yDw=bF>+$@B*r%ez;X`V
z4#+}F4guC|90N_ts;jQ`RnuNsm&iJ63DoPA1%=8I#OF&Ds`gh~P*hl<8AyzCCCI>i
zQ<a#XzqVm<F^OS-?&!U8EbT0?$T}4dC0KGgZe8JcUQ#N_JV1qb!+GULIjF=iG=Q?c
zgp!ceeF-v28ZPgmA>JA3-B+kH0`pN+-`kTV>Wi3cQWy>Zhb4}aT3FR<TGFd|Kq@YS
zF{V5NaDDkUj6+cJ=pBKffZ0`C6};kOEJ(6U!>>Kby!oh9B_mZZJ4A>B0>ELkz13$}
zbv<GtY^oNQU3IjJuEvd`U(3#IxP(T)u!Pfq@ZO0C=9e5yS7^3eBq1auiwc*OxgIb(
z5W<m)q8xqq+7t<@5d{YbD50D)iGNa-X39V`1f3;@qAfq@8Uf5HLG^+<1;-_O9Gu7#
z3jiz`Vt<JxDM`Sfct6RIWE=(eay!mId-)QxdMP+~>%|LcR6<DtQVd&Sz$m2b`rL%E
zIExH#{PCI=0Avz}dC|ZGPnOx%(bf#E0)q;dg(O`sa{yv@QrMIgJp61yty<n4wqz=m
z6-B%j-9@OZ5(D?l=yF**tn}=Jyh8vyyY9sqG?9ZtM=mA-z|<N?hc+vzP~08ZZz;NL
zra}#gXF=2p%m6pSMwYt>s<7!2e*9A`G0g6r@!h?1SonvDwCo8)7~j0()-7|fB9Fux
z7d6&e0@SE0L;in-!Fv(FL$?vY1qICveUVntOX?u7E$lX#Ss{pCL2e{KB)sKy)dpuW
zn@uK0X@0CDY>BZbd<4l-tR&mED1+pJd@ru_G_E4?g8Vvh0p1X8xXw%^jVuaCq$DjG
zRfPwy?rW*EO#!RW3|M~)ya9=tU=U@fN?%cO*u$v2;#usBDM!b`b94tW34sv+R$!IE
zp#8T|D=T-cu*$IC5hsW+;4IQvA$zt3*d)w=E*O{uA%eEWZ{-4l*BL4;0YPv^?fcS5
zs!HIp^kIlt?8|42-0glUv99@}Mto9exK@Uy#m}JhYTh9LQ*c0h2D#<#hOVW+R^d|n
zPMSrR)WnuiGU?g{_x%vC60;<1Gr+^1UhL^XS%5PsX)EC&*h&G&iAjqSx=c~j$`*Z0
z_EhxV3ibd|zyhJ@B$tGx<}zr+@Xi8R6+z}~w+tL&_cB?c6{qv$B#I}RyebYQoLHN1
z!4reobE&em+RW6`uPm+=SsEcIYUOaG;YcKgs>xdjc+_uLgqj$xGK_7T?NnI;+9q_d
zv28L6=-mLslH*efWQH^?R<s=0HVINEro%+mB7*O1yS(nlfMS?suy5bPr)?bTV%P;N
zS6o}Spf5r|mFXWA?giW%g@6n~LR}%73qb4c;kURH0Z`fRZ|<`HrD~GrVnqttkZZco
z-p-m*IZY;nux#HdH3S5rH?_-Y2@57b!tT#6<qa(Y^;C~sg<LrUL6yinH#{|aMGlfS
zfNqBHk`b`pBFIXN3sOkUBWTj4fqB-#+24NW1zymw20$33Ri@`wc=E0kw<!uRF$FGg
z3K8!;n+-=#S>b+0;VC$55*E7w#_1$jiUQqvGTYJ%0c5@4krspdb_rmYUiO!rm*5AT
zJBol+J~tQ(06Ba+Vi5Q|#;;;RM2rxCX;GwB9V8)$O~^$_NUcotj==%~p99_$F9ESA
zV2~xOp71qB*%nEmeJ?lIT55=biq$H%)iu;YAeCUUvI7f=TbM<v14X{g0*FgJO*aK-
zR0<{!6JkOHtcJl5<YBwSC=@z@oCCZs7D1XIHIUFFva}S7D;0?_DTtN@c-1Ko`6aP@
zvB=wa9TyqN0on%IiKD^*h)!A*H1_;N5)4+Jz`0xQv%-omO(WdIC<z8w)qtfXK|@K%
zDLda|+Ul&he}%<H2T9mkmh#&&K@D3W*i-c}DwGZbIj}rM%ZSD_gb82K*VG-xL2$jh
z+t8_aeSz-{+O+ip6dYSOUKAQLxL<mZZoXNV2BMD=^4t}mN2Bx)V~2tYApXiimVl}F
z<PSCWJ_FuxDrR}dXPGSYFVL{-1A1Jvh;4@y(2!HhGCMT@yyX5pBqc!3AQ-J+&gH-b
z8rUOtJAB@Yzbj<UV0l-3)190Y`;EB)iX+}Wl*YOu+X%!K3<^+C1u3U^2fP`8d#1pA
z;X8L%I^6?Q96$tme$H#-QwC=Q$+iJrz&j!p90;)hyHe)u0(dH#9>*-Uf!+lKdr1we
zx4EwKsL83#4gz4f?>fcAG7V2q&@KZ%F88wUC1{O|3Ii@oJ0LQUfb@ZMt^9#PH-XY%
zdC~}giw>7`Rh34-XdT61><bLaiu@Se!L%+!0ppjmM0o)!4M+}XScgat29yMlkud<)
z@c0X8Uwx=Z64aCD2h}(r3Zb@=Ol^*UKZ3U;>2IlK>_Vq6DBsfI8S_QpXG5*(Wl<Kf
z88C1`w!pCqqH>@l32bVt#Rb03CMg8t(xy<FMwoNxDxLxQ13)}1H}{^gso)OhRBA{f
z9?NQulEXs-q4jw8fgnnx1P=6QlWc52*oM_@L6JbCb$Gy`gELSYnMAB`v}*>&E7xj6
z8evt04Sy_!Oc0nh7S(7;ZD!#G;>r{{S&qD$$!PZREb2a$T^a`&SxYWCmf#Ele+VrF
zplD@^s?3y)3+nJxhBU!jU)s_|sI5>J9JL}?s4mfg$V&Ab0svw0$venz1S=r}#EMqU
z9{^AwTbPpM*CWhKIxM0$fdDoods4+Mgj62tq|;p`4tg@gTB+CcH3xe}0>DUZ1@?g?
ziDOYJB7-@|MLXmVy!Z%=8bYn=3xOZ21h@dhP%Ov^m1#t`351}e3=@K(e1e+F4Zw1|
zNUXiS`ca_~U7}4y0SpG0(!klJ+ujEt0UjNM3IjPDhhTRd#=z?;7mV6nm|TzvCKkdD
z;VA|3Eh>yd_t#__3wI{QH;5LHE4`@_6zK}I*n^J{AV~iz+d*xqVPZw%RJ<41%q%Zw
zl1cZoMhRc^8ImrbXT~v2GsS>V`+kzB;n)XX5{4{+LKnxj2_2Z;l$h)~NEYV4f>bX6
z=@`G8crMKX7?)6>kF?Dfi_7&eHi>S%aWndiK(Sk8Z(9dpO^r%}kDtG!nD)7>Qef`~
zM3=arikAe8Uy+9cw?PERc1tE7mJJ1n{T0&e!{}NghhC!bJbj=#f2okot2gW(_A!~<
z1`8mRzbOj^U<FWiE@KiTAPVT$F{^O6YYUA3c!l`5zJ0VW7Kk!~5C|X@kx?7KI4}Y^
z-wc%u$7rxG%8mmiW<Z%%S%H+5ey@KlI5b44RI2FI4;I^rf@44~AV7o%7BM7fuOw;&
zss)mdAuwQC5N3)V7*$nY0KZ#ZuI}s+3dp3b5x{_;!UEC&F9sXP1Xz6OH9`}=&qyj8
z4lp87V9+{r$MaD`RcfN&LPQdCX86q>e=79z4GU<g#dpqP+;QjHs*g2(1mVxHl)3m9
zsQ~E$@a4_197YR}<nalCrpzh<x70wZv+WMB3^ycnutL;6?2(@+50EPL?-Di%b6s>h
z#xVw|Bx=yVPy<V5_}f+tZ4^M5#t>9ffk|2+#4DNVXrs%1I8@*RAAxGH5Ara?XoQ_s
zEn>yy#Q?@L+hQ=NhZc`Uv)Av`3#X>H4;Hu0;c?NGdDkm$E_0k{^kg)+k6SWfjj*D(
z&5SeQ1rIXf$_>uHy(J%m;LnahS_1;AAtsYamZd2qOrf?b4eT^;IvIuO8t^R+K*OwJ
zT*Cqcj(&}-!b4y%sK7NC2S%;(KPf|T@p=Y_6=`A&paVuKZrEPIfus^Xse&dZAtp$s
z87C$kspZ~T>A-svL>mA^;U#BSNHOm3{I>nrU<85aB$$a6rVlQGRd>I&iuv#9HUm^q
zz_3hcHnCs;A&FFKE{|3$&<t8z1(3pt()cJPAyBa^gslZLQ{GP&1Qbak;}^@13-m(2
zF!K;;*x7+7uY}gu*w*Wn?g`w0ZuVvY{jxGogQN)lHrk|6+i5ZS@CDVX4ghcRI{L~0
z*pO5@&#6_s1`T5lD82Hujy$!uTvR;(Jh@QO8LJrrNRSZM0KJ|pB(S3P=|otyowAF;
z*PL#_W3h%ego$R7m5oB+uvP|yiqQ52g6InoXfbjK*_u=ksKgXA5OqibgtoPk0iMLq
zecdPuD*_w#a!#3;S!)ao1O`Q|0S$>tUabN%6)m5X!a<|~oUg_wj_hRP=tvhm_-qC9
zP-A>RArO*=C&CL>1Td<kdLYLVP_Jk;?N%rNylj;wB?CQRL1-EYi9nZ`kQpIR3=zes
zw>zN5SS2KsFi`=+s?gMwgK1>*3dn3V1GMPt3PK0S#1=v9F9X^PKZq?iA5!7%77Ji4
z0K5g<TnEqz0$hV=msf}q9JhC?1Efmx2GLS6L1-2t;9cltBn*R!gy<IZsBOh0xKl7=
zL<}H^G9wmSq<|DPE;--kx#&-4vB&-G_V_wlmVYO4{vf$7zOO{aLBSwENN^XQKGAoF
zKzbOI7jJji7vKbgH!nB?-a~KB2vRsJv%_PsmX_8RC8Xx=W!%FM)VO7Vk!b=j5qLbA
z(Er2}Jjb%WddAYC%y|P9eX12e7P>8kkR4edVn(n-FvSx5&lhnBnRU$7t91cu0f51N
zpNLTE4x_x1#I*>G2?hDGE;%F$D19NAthB@i_?W~ZA}4_Hjnlo~{QE`kMS)pS8px3J
S?3uzZ{9VZu;X*?p^|>%abb%WH

diff --git a/docker/bootstrap/ubuntu-12.04/baselayout.tar b/docker/bootstrap/ubuntu-12.04/baselayout.tar
index 42188128acb5300aa06eff366c8e9df6f2a7817a..cd19b173ed46546325b2056617d445c8952b3063 100644
GIT binary patch
literal 8478
zcmV+(A>rOaT4*^jL0KkKSrKrhX8=~8f9?Ie0APRr|NsC0|NsC0|Nj685CRYY009I5
z02p8>UGxEDQs56`yaDa2y@w~QCzeAp+tWPT&=ZmmGm--J-n?Wz0eQJ~kvp$4ojprn
z002dh3JL%U02Ous0)dcHhK8B}=+I!4B4P=FDt?}(o~A_8Q^ZZCso_u69uo;aRCyu#
zqttp$qct?1r-~j>7#f%+K!BPNPehN(hm`dPr~uKR0qOt^44FMZ001P75+rJRpnj>e
znKT<HGz~I6G=oOe(=`uJ02u%P1~mkyq>zE2ih2;#(`7a(>TLoI14e)}27#tP82|tW
z8X5r50MGyc0B8UJ00uw+0}up=gaQC2fCLEAWW*U$^-Ug_lf^$s)Ov=Vp^@qykN_U|
zR^R>bd!M95d)42d@m7Y5kWxjYpdF<EEsPWPd%eEt#$tXGPP76N-Wmd6i;I|AAv;CE
z@xor-8-kh&-NJ+hl#E2GK!p`eP!=KuB{Y{%8mJ8<q@XIbC@2z<5}H6!L1;xqL})=8
zYLQi{p-@(Zr9rBsQJ`p5X;GyS6cM3BL28--1yyN8pca$_eGYyD-2DH@$7}HEN2)C&
zNY|2zrwKe5xKi0o(dMOO<S~k`;*yZIq9rXgOIdNK(~KD`lwi3WMVZXHc4hoiPa=M_
zv>iWv!P*$3e`k7Gu32?c_|g^S(>oeUiG)_4R;rnUY-RD2MBTsf^?zkxt%UffY13`2
zaoycm*n29v$&SSeS1bRh5v-p91O!H|2f;<$_h9nYV%(jrY)Iyv{yi0-imIuCYGkHc
zHUG-0xbC}Q*<gu?jl&@H)Kpxl1L4zrUsK3v+sH2hqErHtG#<0qy+Lvm2?$AV1i%0c
z5)hK}T);l7zL?Bg0K5Y1y8Nf<LRAZ)X_F0ih%C5nge8@XPw${IL`TSdN{qwX+ADZX
zVoPq!GsjNf;U#tRe_CLDj8Hb$%>JF`MyAw1<bO>iFN|rWHx^z<ML8VLlM!~9ex>~V
z20q3s+^b?`o@0?rroww&oe)4opy5zBGp^&bo_>!%u3a4-o{0KLDSIBzo^fw9|4Ce0
zC+rh?UiEmlx9yRavplr)`<2R^y)-ojv$DQzy1xG5&n+7Eg*u^6gjT*5yp2aHXxPYk
z^eo)K=QEjDr6eIz0SRqdHreTID}<ZrTzYHMPFi*l-8x+N+!2<1;ASI5p8L6Rcc%5<
zefQG)kliBXi?79mj6DiklA2TZro6R!@Vaw-c^66bZdlp4%GWDy`Q&>?D)d}*+>bNu
zZL;m-8rPQ;H3p&|YtD&0U9v74y^8m4P=Vqp%dcfJzEGF$w^W{45cy}N^eRR2!SQE|
zcC5L+{oL})e^C*08&R#1V59as(dk%X<yV=pc6ieh#M7>n6j8n0t=CKz>0U~Ec`1_S
zm&c)(JLHQUD5QKh!Sh?j2uMf?N$v?J<_CA`a*F|$XOBb8?D6@~ZS@du8jd$f%EXb+
z?f%P1T?qEizNDT&P6pgCUnNi!x@TJD6s>uo`=4w(F=x{m&+?GQDEc;!Y&m$Zv%B-7
z8WcXaqFQ&GC9p(-NfO>EsCyU3zNCaxjVAi>t^fiHM8arzbpLMG3RNhY{W420hJ8|d
z)WBR2T79g@*-~&VzJde=72wv%>t~Ibj|d6e>-b*z><Om5yFV-2#4D;o*qJ`+s-mi@
zs;a80kuA}vhEg8#WaARmFxQ^p%1I*0B$e+fMODs65>l$SA}Xq?ink)Fs;a80t8(sC
zkXa(El1LIuO{<JprD&+N8dbRi?7F*C4R@OLz6plC){bhLq+%FtIb5TJl0~Hytx`87
zvpv`9G;c#Sb467RjCM%ug?An87)}b;ZQh0+^SRxK3%RYk{VODx_ojXmvtKi+{2rez
zeI_YE>Ea!L4shKDdKm%)f&2W0Ata{`A|7-ewjOK*9H#T%!)}AWj@X?(VOoWF>H=1y
z%Ty5%L_rcMBqW58k`h8lNeLk&B!rNW1V^s#TbXjs`<c2aG3(DyeNHwap1NI1w%aWb
z?ZaOc?9Vk-*$tZF^kR2rcM~ZqJJ$vR<RsHUwbIiqB=Y2woWqRhnYU%GQc~7s__Ha%
z%wEhj?rFBunI*PF4Y#Zk)2CN2m}4l9aV)^^Y_rFlB#Lm5k`hXsF6!>=xe0e-sd5rR
zNmB01kx3!rk?04VT%lMq$`V3INeLp7LP$+6>f|JZkdhKYNJ$AHBqW58la<xu7G2%d
z-QStd)PNfv=QA6xz9E?7GCXQzVc$=8VZycW)J*~yn{oR$5G+<aw)oh=Y&UJgtJm;H
z3yZklDq;wTB4$*~&2@?;s+nbXQgv$L#7C(!&lj<Yi5}kWZVVmj4Xqb=yki`p=UgO;
zNd#2eF`ymP46zK=JA8orqTz_L1gEJlgAU2=iW1{2GN@HBd!hvqKD>vmC3oQr<W)P8
zDmCfIVn?2*m&&!$)+l_{hTgb}&e(W+d-z{_e_}!espIk)7CpB?BzSW3^Y81gLr(^-
zJKPU9Sf?2akzT%>dC0wMo@v^U+afh`D!K9A9CzoMX~OQV?&{|-JNO<Chlk?p%&5ky
z2g^C+-ncZK%cd;kxf33|`uXPfX`3{R17}{$wri&128}ql2}BS!J}2{^Pn7J}YA;fZ
z8+{`iQ7xTYtvn#Bh>Y8DprSLrfir>C0)u9q$+1bErpqwe+~?Eq^IB$j$m;3J*JUiR
zVs_o7eYDSCJ4hLUu;aSv4jetzq4^^Xbe<cgTc`v;#@;2F{BRC@yP4<Nw`#9Kq0;lR
z?=r0EaY-R1*6bL>RYX!u{GNau_H1|Z<~^@pQ(n$C7k6#DyOhg(;x%V(mrc&&^4|x`
z6gF&EM3dvSeKh6)=J?INfqGZKOJ1hi>+Zu!)tynwV(VeM<(O^zUqCNE1`tGf33&mk
zv}|J<^NjnBmIBrImLHuc-)I_%I8ckgz~ThciAB~&!lm|tJf=q7`m)2SdrH{iE>ux%
z8)~|)foxc{nP<ET-t`U5{|nxJW@LNZ<e$Lj6t`&4tploqZ?~M#_GHE@UC`RbIlKPv
zbv~n-yDF;ORBGmDMB|r>=x*vgo)^Hxt?{qS*A~*eV?*?_qV({Z6{-FDqIA;#p)lUY
zd40@ilg#m5t-23?e?$3pVFQV0(lzStI{9#X+&w++dj3D2zV}}}B|@yAI}6%pFotb*
zeooOY;9cw>^ICt3w5mMXP$mL!0R#{fa>ffWKqx4lDggGp6<+<ejg=9}F%VB+X^aBI
zyJ$a#3nU{7z!-uBZ!c-S>*e4fPc$O?GN=fZ)FD&RfhbD$f~YFES`}4dP@;k%LVziN
znqUd0geK4-v>+Q26KM&w6ei=JA#b^Q)(L$wfl@mdy3$PuDl^;iFNi7?-{2J2tLM35
zLxQWvN*>S>Sw2^$bTS2Rw(0>TMLd?2Gn|fH))2vbKLg1GvM^)KAZMeYQAU;NO%yM=
z9hkA{mE|+CZkje_21}69fYxrybCoIcUj{6Tq8duQdO?TW>+p@TWs}EW@unhYxAqcQ
z_7hOFVA+N1d^%1Sn`<>3m9o}J)UfN?V_{NfHp6#2Z&cf>mDJKdxY)a#9{n?_3-+Y6
z5xJ<^WKBHklAq4_ad>YnTt5w{2{0%T<Xt4tH`<zC7&!e9ampK|G`fnDaXItbs2c{;
zYX9f}M)sF$1Rmj_^k_%tWj}x*2x)&yK@3SH`~U<(reD9*)7knV%Oi>VZkU9G32<s=
z0EmPF5|8GRX~a+@fhy8|Js{~%rQdupC4VW0K2dy!xs_u+tNVbU7Sl{6-rKq?FH81*
zXXMYtrTAfA!|`8=nSR{S`VS`qic-Lr12<I>Jsw}CM;^Kp&7Ys<&DWh0IfWbf_bY?K
z3&c{Zs%N3qx_`6gYaiyH(6^RL(;2?l*+gYeW5TSxh*yU{%C1!H_NZzOc1O-PSKrz>
z<)dEEr&KBMir2!|k*MWO8ysdd&Dm;nHVVi!Bp5bRRy>YqxV$Vzc&CcV2-`+)RT~!P
zw{c7zu~T7yth+{8U$aQ#R_q)mbwiSNM|YVMc~KDtTW2xrJV%w|r&it^xa)_>q8i+@
z>9;<+Y}c<|-ThJ<BwVp|b9>GUGE+!A{Z@{6-g#_I?w3nu+TPZ#kBlC1t#7uZc^`ah
zj{cX@yYiu^HHX&oqE8oWi<2#^yE+NG#@t2icT0Q9@RPv77FNiuNV087y}7KneRjR{
z=7_lsA*+HHk6GT2O3{gpXgKU!&ht(nLJey&uNhpmO6;ek9uBrty)26R!jbD|ti_7+
zqnC7tfRaYpxzT&2ojce$vUtP?T!Cmy`4+^fIve#w8#uUTaJ?cBv}|u1xdrHxPXE8F
zj258>XM52AOz8D(nYo@&vv^3L31WaJQ;&G*sCT;iw}J&WrK5o>eO@t}zAvZ;46-?h
z-iLx?K^2W&IRs(M3@RW4V5m@%5P)q9s(+KMG5$1u{&?f2n>Ax=NK$;4<xTMgbzZfs
zE+QaM3IqqU=%zqbBv&_r@_2A+`ev3ZW)tC18IT-GC@O;(>3HZ2O@QmI#^U06y^IB7
zf?d?w$@L2*y-{prTHavxRtH){PT%ap>Q%Tb=v>N@0}M*Zdbku-BN5N)fJ-KuQ|ZPp
zz*vaJkbCbm1!9v(lE>9hJiq}A1(uPi0jU8Ch9;AqfPA-3g^_FUENTOlvXHl6DgkfO
zkO6y3xq%H{&<RjNK@A}#_XbAb07QTY{Qv?i3YUfIs{jB)>-}u<KDZCm#@R!Aljs|M
z+pQv+d-{z|kB#wl9nm+{g;!tK1T4O!odI_=75Mo#Kp=!_g--YTIBneZl3S|rVCeUD
zMDEY>r1_OM)b4#kD^Vd2+Qx{`(?D_bb@Hws4DHg2sH&*QBQmP0<=T=XkV_ZYXOz{&
zztWbyB|kcH_blrgzJ|XMjBn-0I<U&;xv8t4YH<0&Ml;*?bZpRU!^&cKHE_pLPG3QO
z?C=>?O`3CamZ%jB11WRxA2Ar5&QVKRp@mgV-Z7M|mQ#?JHSHfaU<U#3KxBdgS|gD0
zUw<wYDpixrve!X+uqqzmTr`F>e9ce<c9lN*6a-BV6N-X@U$Fx<A&F~iqY^I$5sHGm
zAQe*LI#$P2PaL9aM_H#61eNQ3$ONRH7!cN+sUD0nm!MeG-yP&kk4i%`6;R5f#bZsC
zX0v+Mtff%~rf$YW4)-ENT2dL9s)kh-v`<wCt<c#9z|_Ft$(`tCR1&{vmfy&=BA|nW
zKn<X8RhQ@>R1R%XFJ%l&a}XdO9+?8az5*B}^2gSM(b~geIcr#H(59BNI$d<q=(<&F
zQkPoHy6dK$;_D>TBxHsUt^y4p2}hUIj~=${PB^<1ac$U`#oZZ{cu>M3@4w=+<ZS0N
zFRa^13RY%cSTnb2-i=y-B-sJf!dQWB47S|2g;MVtmZ$(BpglC$=z_(V*x2kY=6X<X
zcVrV97}jEFY8{5{Xse{nt1&b?J1`QsGYB$en2p>wZ_AMDNh=DKzP7ch?NQcbtSVM6
zM{5c0U_o;Xy++2!5TGg0_7T67P@xp1Y?T{483I(te2G}tw_CGRHAbnz0L`qJRoz+C
zd)M!}iwtj^323Ge4auWMZkb(;?y~sRZLrf&P?84}3TTV+BDfBi#ihI7F5P>2w3u1W
zMlp;?EKmUmLJ*jm5hEDJBo;cgpkcZfgCt34*5q5!G_OkHwMDct3id!YBJg0I8HbGn
z$)e`iGoL6{5`nJ0adekL+qbxIq)8DAVw_fsRteo$eKr!2A*BOe=qx~A7YTwQNQkpe
zD@CgWA=H*da_rAshM>5)aJ?l~st~Sl2$V8b`^L*vw#{sY2&pz%yPr(4nyC^rEh>{c
z8=+?4<F*3LX4jXG<^6_A$yh<G7_R^j$DYqR05I((1OWh2ZTlmC8SOB0>~vn!4(keX
z9D0?bP7O&S0xew@rXki8<P3x&cO~0x7-S>_fCdHh>Q_))*j1!#Xp7*k-efP69h#om
z2%RF1fr`wDvsI9Zv{BIvc?j0J;4K?uL7z4tKtP7Iw41IQ;v0yL+XhHsk8#h}xQN?z
zLW;o6nWcFPj$}0vuT{@Xft=EFnsI5)bBKUvG@Ry(%t7i0hh8yKr+)ys5-OFZWJ=5m
zWQwIZ%Ag2fQVMb%OFYgvkw@5@q#`E=p`4(I2$4KXB`mLPAIIn1_VMKP=```uvL%Vg
zJ)Eif))aF;CWnyG<$Ifj9?3>UZ<j6qs8K}@e%75woH>Iruyh81>y#cStT<2bpk-%z
z8~7@!n{Br0s;R!PFvvN9pwJnLE+d2Q%Bmu&sJqH$WSN<n-BunN_P4;2C6sHiRbYF&
zJTFwmk-2xza;mzDDBv~}hNVEfbLp-zjACI;Iq}nOQcJsSySux$cQ<y%+daIat*2)g
zyhbsMSwD0{LaN|3+WXt1a^xl5iyLk4oOJ!2cdU~bxiNT>V;e(IIR|EkTp=Zf@ai=U
z;ilD8h=`)3L_|*+%)TMhSWd3FP*_}{EKYQ>TCZhw-?ZFsc3yZ`c9qD$eDjr<pX0J&
zaWRQufbH~NsTOt?SY#avhnZF!j+<9-UKf;#vPU3bx&|j}9)}YExZVWieyN$72OITF
zshP8m#p5E%a#da-m=~IgrtZv{FJdi&K`@|X3^^>dO=)JUTGo|Y$^lVz8Vxbx8-wr7
zv}6~DZNa=QC>l1~Zi2+jrEwz3GY+iwrs>+ji*U?h2Xv$$Zw+(j!-f^B4yUX{G}S_^
zL^_;Bl!`$M;dmp!IRnrMgH1RO9q5pbX)h5R*F>h_v5m2|lPF-4xv#<tfN0veq<(+%
z)4(woa9j)|Ll|}kV6^9|B03fi5R;)}Sc{MMhM+lxC_cbPP`Ku>W0RQzVPFdkvVT%a
zQj>u|@qddj%s315@;nYed^r-ddX$_zwedpQRS=Rul!F%7uoO~u{zoA!P9nxwe>7-?
zh#7>T;B{~T6X&*d+&aOX;80;x0Hlkf+`t%}^tvSlPfsf#*H*WOb+Z*pilW{NZn0|>
zgn<0UlsPQj_Vw+Ayn_%t{4dEFw2_NLM=mBIz}5{T$D0-OsBRAYca+^WreY0=X+hKs
z3_v%+Mys8Os<F^X{4z|jmWO=rj{WPJ%g8*9r)Wwb%MIrq!E4gV6n;R^xvs+C7P6qO
z5AFT;h73mm4$TV?ND}*l$B9K!HY6ZPg}3zfdWRzf3vnU=CFv`&s5Cj0+G?2@s|{=;
zY=R;16D3NqCf%__A2JE?!n@GYyo?45_w>jIfI+tNNimi*u_+>ukhp196dvE;*IQ_s
z16Uv!vHb4<1}196AkSDzUrBn{!>qvKTiF=WkB^M#=ni5N0wMsc!7GD7{ddtTR{w3#
z%CO%NCy+4UEfQIwd-etRq|CrC6GkH$npP59J%ErUPV`Vp0U%2;UxxIODw4b{f-%S}
z?Vismz1;kjV_x~AMx0V;yjKRZV&~L)wRaGJDYzg$L9UnbnMxJ_4FXF?9hNt%1wsoV
z5SoA@Jm)HjN_UXZVxqk-<<689U<PF^C43}2#Go9Al%`l~qY65iLbqAHl|B2xUcd@C
z08~8$lJJzf45t`uTHu_flp|a+>~V3E+{tF7E06MKB#I}Zz$y&1>`GS*5jVYeIJQ>J
zY|TwNvdZCAk)jfYu2+?d-H2Hl$u7B(-;lhds%T2Q&N8}ixlv{dXqnNCi)olwQ*;9&
zOU-69%?xN-*0>kk#Udy)e{7%7WQ2h)eBbT;&3vababR0EZl`q|>$2DdEU&z~Z%|-_
zfh-a}E#3>fHwzFLgoL^Vj4lJSzlPrMPz6J0!N1dNK839%&dC%jazU?k!M&X+NaZw|
z62Y^4sMZJxL~m=B(h?SIfrb6Pf7BYT0|iu%Zep%HfuPRx9y^{o-qAy(ji4K$yd;Ed
zH;A+)Mg_?vXpyvOQo(`P!s*|J=LSze%mjd9kye|WbH{aXrMXB^fs7j_G6W;wdo~)!
zPi*kRGjNogHVF$}z;U`s7D9l#UnX6GL10<0fFwo0{@sFDrP;lu>1;6r(w*f%DxVw7
zMTi`}PUwU_4?(OLkdY$<AR1I@6^BU(ViR%^Qc^2ZO;Oq)KvU#C0Yd;A5{3x^TIBcv
ztsN|`6wzL*tLH5>L_tMrm0N0>;zBTDkZu-WV|goc2)RINH``EA32Cg=xGO@SQ80NM
z5)dV5Y!MDd8@z&nL#!FVJOcq{8X^N+hM<nx&{8bytdjzn31U}`QjrgmTNlliX50Yk
zywXSx;5O7v9xwz#a?qitx8fj>Vz~AN>hFELXrlzuJ?uh&kY$>%DM?UJ(sBw<2io?!
zt6o3fc~ODT?Ji4sb+bVYT_M_2^|30H4g)!`JcY}M#x#TpVb$5z9p+(pz1!Q=RKPyK
z_y+B5Jz!*mi)QQsgGQH&?@|rd&qEN_DDp5a#ask>zfkr#c%Y&W?xZPb3ZGno=)T9m
zd(H(-4@m9wC7z}liyeS(OO~jH*l|q>1w8a4w^#-TC-LY)R1G2lislUOTmVt7!Z&5N
z(du3q-6oR*&b#KE?ZHpH+n5<5J_G2O*K%o@H-&CMr3C;|ns)$t!I%f6Y6sFYjtgSK
z16mFs0zH3kHSwv7G=gN?0I*;ku?mg^Spd6|=I#P`Dw>aDmR&&b0)jonhSlBP*MZh%
z)aZu+FkW~ag5nv5v)USh@HF%AdoS}>2-v`&GW5f?133r}SQkaVkSIp*HpK_AFk=CY
z!M0@zM2!HrIf{nxkkF{G#f{z@Li9i$S^G63%n49yAUUCA9RPT=pd^Hehz7TZ$St9U
z7a<@^StsBJ*EpaGp|+AtZH|CHkzJZ}yV_fJK~tBUZ|LC~b4CDZL$T{KsEe44*f=2D
zV6qof=Rimj*wtB*3%#67k_pSAnL=qAvFFqz@(<(}0p%f&QNX<N2ZOzhL_o$K4qHb;
z#-kId_4#-KAWEbJ4+LsSQA!0UTFXif1_KL|z7-HnY6ntLD>z!3#j%S8+>pkYRbvBR
z)ge<9CJGv5TuU^p+#tLeLWfH+)suNG9xO{Zog~qaX_a!vF@ePaKt2G7K;R6Eq?L$F
zXm8r_RE9LcU0>^IBIH)63(i`|mMROlU~3q@CP4rceIg^MgAib<FgY=?Xwmlt0tLB=
zE=_Vh1jDM-M(`j8#IR~urLc;F-Bg-up+lagSr;mHeC<Kt(TK4U8$pG@Ng`QPN{FD&
zauH7n1MfaT5sOGw!9jQ<_2QQR7;6IAfikWrmf<jz6oG<pR4|ZJSwXlCSP2!Ex8X`O
zA}h2>sDL4W()t)1HDA5rasUzI+CZQ*k;rz3dERUe!l8i8rTPWw0Fq&JAny{8Uoml1
zWFMJ!!LYk>Y-4!=aRR^Gks(fjR+|uU;sgmFm2IH5)UjlY1gU^8v6$Gwo@poG%}f%*
z=QJc;V9$(XnrD*$q4xa+Lx*S`oJtuo1qfdr=p=T_1f<Jh(1C7i=Ose%4uco&-V3)-
zLlWy05%!uR0eSwm2GK3pE+(HzkQP^3xGjURO^r%}kEg?-Gvq_LrzeIHNiQU!7G?~A
zZoq3fdV~#!Y_ehb;?P+i;I6Cm51nd94$WfnJiWj=f0dBUt4Hh}_A#1X1}iX>zTy@t
zz!gE-xr|7VfGer4V^?E%);F4dG8fgw^X{R5wII$6fFOWYiiq9;!GICZ2xO>cTSbY6
zbZ{A~W(k#Lu`3X#<Mq~#h0J1sLR(sZ<)#Esid+Q40s;^mSj3U3U`W&nR0~Qx%0UA_
zhG?PQ!m6tGg8Z$T-QCzC6_H6=Be;Qq2pSLrXd%`>qchW_)d)`yO;A)e9AHF+hJn+h
ze(ES{tyEj+NP<pm-x?#+=C4j+sJe=rSA^&-#~yvksPtH3PCWZbOP`5?kPd)g9J#h5
zh{19ko<T4)*^NLp`$P)6KG5s{$8twT2wKDR=8ZW(e88*Oyhzw3&2~`m7{nUVNY>E5
zSOZIET<MYsv{3?M7(r1@<t1o`0Ip||LOW-q3NitY#JN}x!owk=5_MTMlNX~D0~pVB
znBY*uHjicT-PL#!p4;XQSI)<k$3|7>T&>t_Z&}6Sk*e$-S@1)ClBQd4G&JD_4?^<P
z8=ZfSN<SCDpB%!p1_e|?O(v5rN>WIfLu^(zu+-j^Gz=0o@GcHO!?0pp!x99Jeyyzn
zLtrqdz%`5mt6O}JxS_cCy+Nqrt}KH%0Mx}z+YA^mH9*MZxh2b)Z8lmHa8$y$sESc=
z1YoNm+5}SS71FSfW#8fVUHWmv2?NwgF%m0`UVTEU@PBI-6XDR<4N*q|!ec?Tix2?}
zN~2MHdswtUF>1OCLkcHMAfS|mLdjkwa4DLf0(h_>qDdE-K3sTVsS6DQ&_Tz#rsC+!
z&$`z7+S_uxVs_9CzYbs@?IR@iIzWg1=Pf2QHrh;n-T=Dwpx_4oGqbRu4T%Lqu=-V3
zdJIdy3}1d$pvOgS#!W|12S!|}oj0O@qG$#zz%#^72HsX@j%>~hVir++AKs=HptG|K
zun7{;B`Ye0;bB-c5-Wq)78g)i7Xud{jhZDv3XDNRK?hubC`)TupcAo5YyTNgDpukb
z{h34OGbb!W2nY;|S^^sql)bG2G!-tNnqeT-0BI}h6U%l|arGn%-u!j~`Dih|AP|U2
zLlfZz%Mut>Qaw;*ktkR+8vB)$0AMyslOlnpxDZ?hp)n{D^fLoADglZ(wHIl88A}AD
zl7=cEICb0_$w)Sqo?%%HhOjowc7g1Gx(Y!m4f1d}0YmkKOU}Y);1Yz`3s4vUyUW1&
z!5~YJZ4&G90z;PX1z_kUfs1IV86da|BJf@aWh4y4iiGGFbO;<$OU8AFB!hS)LQr=2
zd<y}LYLk!typPp(yG-tJaeX}vtZ?{85H339a(5IENv$A2FxD--uHkqGP<ojZ7k7Wy
z7-9s2H!ny7;6rcH2vRsJv&UnxEiJ4sOH}CZW&Fb+)?PBfnQ;O!5r90|)c^bmo`cz6
zO>wlSv>sr^Uvh;|1+P-rS_AS>ffN;j5)o35pSP|_DMvi`@$8T-U@jOh(eVl$Vb*vO
zSuJ4^sE}XZ%)HQu2+uhKNpY;s2OydRA|fZC^^Mu9>ic|UUi^aM!Z#5i{r8Uef+yrI
M<ce^iAR^&P&Niuv-T(jq

literal 8484
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
S?3uzZ{9VZu;X*?p^|>%abb%WH

diff --git a/docker/bootstrap/ubuntu-14.04/baselayout.tar b/docker/bootstrap/ubuntu-14.04/baselayout.tar
index 42188128acb5300aa06eff366c8e9df6f2a7817a..cd19b173ed46546325b2056617d445c8952b3063 100644
GIT binary patch
literal 8478
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
M<ce^iAR^&P&Niuv-T(jq

literal 8484
zcmV+<A=}<UT4*^jL0KkKS;&2EOaNA+f9?Ie0APRr|NsC0|NsC0|Nj685&#eY009I5
z02p8>Ui<A7edmf_0Csc09@y_;$*m_W+1a~o+vW4v_3J+PkbAoEqr2<c&wAf|%?@@t
zR$3MBuf9?A*Vk`-fEooHy*dVhfC7aD5}*JDP%4AyYb5~s8r~9wQ^-R!g*`CTdP1J3
zr>c6MO#*t2lwql(Y7H7aBSvau(+J2kXf-gHfdMo^o+Tbo^)^V+pc()JL5LbQQzxhZ
z00g0;O)2P9@urZ<dWWW=i1iwJYI>O(WXSam8UO*H0001#^pXfQF%<O3r=awy_>)t5
zLq>^)gbh5AkQp|hzye_gm_(%12{JuR41m)kCV&9YG8!2G$Ql{|0006+L;ye#049QD
zDt?6ZPs*MY#?+f9r7=HLJx@?E41*&hPhdB{-rY|*2_{3jLoK*mlF%@uj1VQ^09zO*
z?DqQmX9=Y}^7@bnOL%4pf-Wk-x_m~EboVa~IPeN+D}Ndg8d5P5sRDv5P%I$;V8#|S
z2($>oj1VfeC@2z<5}H6!L1;xqL})=8YLQi{p-@(Zr9rBsQJ`p5X;GyS6cM3BL28-;
z1d>S^2p~wv1SU=Vqf^WBD~aB?oKa~SM!i&3I7#Tm!j{TzkC2s<kj5&%=OrO+L`qs}
zma^)o(~KD`lwi3WMVZXHc4higPf~sqv>iV^!Q2?5hi`<lY_jXe*)Z2IOI_KTS;8uK
z^ih}{+;Z`gu&~qSbAF0~mJ`;Yn>3`x^?WNDk1guzxOAvenXrDKMv{CY2ndZ#4^oSx
z&xPcfiCF7aq>cIC+Q&)=s;Zb%S(5D8Y4p`s4c6>B><E~M+%gY63X7E>d^&f<)jURx
zyn^5=B|s@NLF#)Kpe{mzAqg$um;eEKLK0p}m<Qsw>Wqc33xF-htHyq$B~Z4>7BJQJ
zLaN5*LTf5we?<XeB0gdFl^KV(m{#l+2`#%X%MANJbd}ee{Aq#qF+kg2C-rYJG;Krv
zv;8!bzA>J3+*rI&igG!h3<cO<{A>6+Mn1MHoU1T9F<dv)vf+k#I}#v(i9yd$Ht{Zp
zW;uDed~<ViczL7YAf@hky;h5P8{I35LwkikL*B0z_r2mW^EO&~J^JNNUWyunR<gcx
z-Cuuv+bt)1LY+{XgjwGUUPhypG@ddZu7#VJ9N5^bQj!p<0ED)!C$@T9O5qvwu00j$
zr!6|jZk;ZB?g-01a5E92w)?qpcc%5<efQG)kliBXi?7Lqj6DiklA2TZro6R!@Vaw-
zc^5|NpDb-YGPTOvzIh(e%DopIHzUmZC$?RjV_Nd!hM?3#?RKIzFFcEh_-0qU`9cSX
zr!KC#WqhG8+is+6vLW-2OXyUK<%8nS80=YdefxRkmj03=<~F45kzk|tJJIP_nR2VK
z%)0y24TeswC@7<Qxm&AD7U^C}dwA)R=9kB@HO~1W$4V(56ZJfn?*t?y1f;w%nU@G_
z_4i5v6kgnZM|*Fk=Lczns%SIylr^A!F0aob6~aAJ$$2N33Bc8c74BYurFR`CD5Wdg
zht&B)rxtzK&VLCEkw?*-^FxD93b=kmV;YCz^hq2|V$>o*CPlN~Tqy?Ye={x<K6PK)
z(WQU_9u*fV2dDCN`<7Q)Yv+ns`|{|M+@=E1g30w}Cd!j}X8H&a6juXU&wD&;nDKy}
z{hq(%J^?h_y3f4#VingRY)qf^Ra8|~RaI40QYE@I5XwX2Oq^m`rW*E~IY}g0B$B>0
zNUFKW;!0Ik<V96gQC8$tRaI40Rc>9%k_#kNl1TzdX}NKW6s;8&qe{0Rd@j!9!(I)0
z-<DyozR}H7WQ;=%rz@0kl1Q|om9j?Uwr9TnV@CutS2R^n)sC_{!n@uL7)~nJbHNNg
z4)=Z_F7~%@_iU15<C*$S-MpQ5==prM_hwRq)3|kjImG%5^fCkq1NeMpAta{`A|0qb
zd^=1CIZemAhTO+@9kDt5g=Gry&<R=|IzbTxL=hsALP$voAtWS(kdhKYNJ$AHC!ep+
zqG?=p(K_ZXdHc5cIUTu^9(}aNN~xTVe0KKlT=P|3VXoM{7@k?3#L7y}_Q8O;2{TY<
z*v&R#dAH_sm~n{`{=C-BGLmLrTQZw$#s*=qIWkEyh#@39i6yiQ*|TWg=a#|W*JijI
zG*Rwn2_l?iB!rTu8@ju@E<#<{s$7JSl2p60<Wfj`l05+SE0ik+c|u4@2_Ym>NJ$B$
z-CTr_k`h8lNeLk&B!rNX5^}n{V#~X_ySwsp`H%xwznO)%T@cJLnI07}FYc$etl?Vs
z=uH9`n{oR05G)oPw)j|Hwi~wJ(dqNY3rl$2Dq;wTB4$*~&2<z@RWi!%r0dzmh>u!l
zo-bA=Bzw2>aA5GD+|hT7#xcqs#llFWkVQ??8Uf`%%Mv11=Rl5$n5TUM%xpaHQO>rN
zBFt#dQzXn0r6EL5vmx(EUT8x(6;AmT8u@Y<k>|1F<yz-ug%6csx2#2HY&-pXxLtF9
zVnPI|;qWmmJ#B(W@#XDj=G$(Do{gM%aXv=TPN@r#Ue29d<X*+kH1SAoks7%bT>7{N
zR}Aw_INjCV-CX7en)AKz@BE!v6&Te(`KK&f)(q!z>A{?rB4g8^S3I8V@@8>(Z0gyL
z&1txSqdqPIQ3MT-iTnrE<2yC7j0#bOwvsWDB&Sy0o)A^YBQ~sPD2(r*Oh9e{L6+`|
znG)mF%FH#cbME@P(l5MZbvJC2teVV>PTKcZ&31Zu*&t*F!;b4@IB@pXhu0VDN#VL>
zx`0FsZQxm-&H(4jzdZYQZdK@1I$m~N=2e|8DI_Gi--8&6sESFStIh{Kb$D{-J};xO
zw{KO2-P)?hRUGAAMrv<EEL|0e@XW^JJd~0w;o2)sll1^L9~rah7oB^=wb8cvyKm05
zXGC(Cw#)Z?(+$5@(gnxQd=VZZULa{&HZhHPMqQ^(fLULOVEm~@`vA}*YDl;knt)TN
zmfRzyMePJ{q&vOzWsfy=6|!U&$|#i@s=C#{lvtB8&wvVE^$i<chrH;sBi`pE{dYLJ
z-9r_q8;Ca3a+u!CnIg2;4EZB}<Ma9M_>SE*UP}Q(Qx+RprG3Af4aexpaw!WKYxgyy
zmM?hF|IeKlr=-xWkKNZ3rkDRj!+NvF-;EM^J-fBHLGy6vecd=f(zE6p0=s&i3@^FQ
z_cnX9`u+-dx)`pPg;}6G4hFd95Xr8;udqwB7jp<amVfB2Dvu_V34ojcK?DUHv4YG{
z3JNE;Kpz*PtMXfD*-;b_?&N&JWFQI|zs3*I17O1zY5+q70>qolWqouA6WGEV{Sc54
z#kgRj=76F>>w<#d*#TP!B!qzo2_OVu3}6Eoh{%FSh!P4iD7J!x+H>SB_OD98FQ*t4
zBdv?6B+!DRJ$?(^6$<a=CSIq{a>R!PSB{iDpd_+<uT1D<3g3Oy0!oT_?I@d^j$O79
zFupHo<bqikG31al(a@-)O7y0R7vCLmW78|jXJp?rY|0FmA)^7T-EGb^r^@IsWLpr@
zRqD<Q|0}P)Hpz}J4S%Yb37)^KlV99d2Zs2}e=q%cNdE4;@cMLzp>*Q}?uwk+tj9R}
ze<c+*>B`z?AJ}YNt`By3RR!BpS%}=!Z80XERY_0qzSgJ5NovQ6(hSZ7gm0K3NNKd^
zykhao2CSjoDV?-bn@P)_-2sdnO{>3%0UO#~j1YTBhVCMDAze^FDHlp1NGiIZ0#U9%
zhoPUd^uv}%6ZTs%2?!G4)XV`92m~b`oid$6K+M3+Qn-20bEl~Hyg1C)+feI%E`y-u
zIOiSrfRHVpJ}K_*_(g``zQ1kv+~m)Eajq^F<ea{{@#8z2ZZ4%kHrqDhB6vAIiH+-M
zPWCSEzki`RByWm0-`1uI0~e+&Mc*}$^6O7`)I8Vm)AW|ZIP<*x&z)W^>wRJ}^_wmI
zpPO8%+2^6CHnKi(y1xE%Y_y&23Uxwm5odfYc^ZyX(s<)Brf)T=(B>9sH6$20sjSZ<
zWL#brBRo^O&V*$}{}mdN#Vrb9cBSUSgjQVTmSD?tajmZh35ihOosry3iL$7OgDj^q
zZoEg7<jt+Chl3@s=VOJgS@TO3vZ~u{?!SPB$rmhLT;A;knJJ_mehJ4sZrN;8_zR`8
zp0~BDqvHphYg_H99!KGgapCEGE59llgIIlT)JDbUk#d^a%d?<oc-x4*uIX=uUJ<Y`
zMU}EEQY@QMp4`@3zPn!fb3|N*kviao<JWhi(zKaO)`O0<yIqrr5QAE=SB$P&rFK)&
z4+mQ+UY13D;Yjtf)rE@fM=se95LDfnIhJyZMs=(MeM2aLqCvdBQNW`^kDpqQ)?24V
z-MrD*Y<0S)CIMK%o44&~&J@nU-s1phIXx+6ZrjP$=U|Eel&At}-Pkr%IJdM`2p43M
z90{UxdL&0+f1QC4_iJo1*psr>du7|WVQx@?*?=1bLWGcn187|5`rT=V^-=qIVTO6@
zrWRQtN$_7<Z-6Um^;(6bL<#{wfb{w)iVCEP=lS;++3VZ->vu!fefXfs1Qyta!VZp_
z6JZ5+DcP??i4)xNupuou`5r-QR9aaU^UM!rU~;s%rJgq;s|Bxhilm@nin7WVsRb2C
z#B=;`31ri1eE7xJiv)}*1*f|(RurWo#i!z`4<G<T0cE6WfYkvC^_*jx51PrSRoQ7%
zL>#MGT6Kd|E$Ao#b}r%pNZp7FQ4}c@SI-QMfB<0t403=BSQ>5@YHUCOhspMn!1v&M
zNU4Ly+4DtxI%j2GK2Len;qBIGhr$)<!kcr;f*US2XOL~@V6GnK_yw55HM1|r?dZ!#
zjG1e_*}~}X<r9W~btk^5w5MCXBC-s_9z|tAl?IvvtL1I$Ts@PzlvPDlsYOVt`F;Ir
zoPt!oTDc8vJ6jW5n7i^P2U@MuTaB<}7>8y#4mEK8i<#{Dj^tT%#$wmt<;N)uona3i
zu8!;Wq8qb5#j}+&F;#0}4X}w&5bd|Xb(KC54SaITSfXZPs@B3ABuapWaOQur{oqRv
z*uvBdI3e^r7vIZ;N|j{uEOpf!m<6EA8-!93I8mqxw=EsIl?1Y<fyF^VFV=yYA&F|&
zOA;;y5rTreAQdxe9%{!n7ObIEy(!dU%-3x=AZA@b&5U-jzpb8XUcj-bzC0vTN2MZj
znN<v`JFIE4t1CTgS*cV+#F}LkoOrF?H*VJ~vUl8foH$GG!7|b*4q>AMgC=*On9xe?
zqFa8oqACbDL;%_b^s#=D1wiK2682EQ!yy6z@#(}B-Ov!hFDd-F2^5EE0i=gK<xF*j
z!!ZuGbXPY?PIC(E#2(vbox<uQ&`8A$A5;Vxzz~j|%zAHgBQ&JQ*y%20WhpX?1bVQe
z5pUn|S#maWnU~aUq=hRpFQ^&WwC+Zl07<d~p@gvl+!*b(ZwjT{H7!s8LqK`wvC##E
zjBIRn4ZP<Bj{7^XD9&qAg(iXQJKE7tDO!{%H+OLvunfTlPFcn_cD8iowmnKJ8fx`x
zTAtKBBxNfZO(^oAe!2uSLx-GENKsHR<2?lI<rFAIDO(bwXL}$@m~W9Q4U2W1dP7ud
zoFELE#f4q9oey&SEuy~*rt(@Td;x<kXtCQ_k<JoMiC-aZVAw=JXuwfu_@^Lx5NtH@
zd`|4UyZZ+D`yt)k!xP8=BpI2eCe9t*+%Z3Yfd>B&+z_oU<=-jpOR4#7G->P%LcMSe
zh`1OhenH_t@o2TS4Cl%ff}m~N(VkMdz1>}h6(UH8TN6cSwU|!Y!|AY;i47<xd!Vra
zd|W08xw`AIt(ReaFsUr)bWbPKuH6lxX=>qeO085Pv|v$mCD&%6ndGW+NP;R&Y~RnO
zSj|+48WxpFosH15cy{!Gn_OD(_P&?)n5z=7L8viY03nYpo>T&-Q=q|vRo|{R?>(3s
zb-FKMhjoQH4m~Q;Z3d)~0T!-{QxR=0q#_w~&t&CY+bU=vKtNqig>41Rg<3|&h`I{x
z=0f;kvq!c<Cpe>^V6q}?YO)bFMI8{wh>cfN1(CKy8FOL;1PE(ZlXbs*Lvaz=U}A<C
zcAWh?NR77CDN2zQtyW0L<jq8D)Vb-9Gh}9D;>^s^5DeKFnHQLY)DIU|7^z?7#C#mm
zj~gMnR->`aDD1Id0ymh0K9k|E^U1zpU2~9IxH*1GSph+A8S?Bb9XL-0J(Sb02Qh?n
zqN=kf;Yx$AaTn!qAtRP2aL35^H$5K7MTIZB%fsrBgbglE*BJ1IfMFP?pfLkPsALVG
z?H_`miM?W%w=*)5NhLEgDSBXo0Oy7#A#tB2_<tUl!s8ghmRd<6B$9m!$UQajaDgOC
zDBD$4f%o<Fy>k{u<=;K(s_ZDEfYhf9<3K6b*v~UFF)rpB`Y^_#BC3)~s;a3~Mp<QL
z-P!iEe$O5m=az1H=bl9TN~)`X+jH^njmwaib}VhT%ynt_yDw=bF>+$@B*r%ez;X`V
z4#+}F4guC|90N_ts;jQ`RnuNsm&iJ63DoPA1%=8I#OF&Ds`gh~P*hl<8AyzCCCI>i
zQ<a#XzqVm<F^OS-?&!U8EbT0?$T}4dC0KGgZe8JcUQ#N_JV1qb!+GULIjF=iG=Q?c
zgp!ceeF-v28ZPgmA>JA3-B+kH0`pN+-`kTV>Wi3cQWy>Zhb4}aT3FR<TGFd|Kq@YS
zF{V5NaDDkUj6+cJ=pBKffZ0`C6};kOEJ(6U!>>Kby!oh9B_mZZJ4A>B0>ELkz13$}
zbv<GtY^oNQU3IjJuEvd`U(3#IxP(T)u!Pfq@ZO0C=9e5yS7^3eBq1auiwc*OxgIb(
z5W<m)q8xqq+7t<@5d{YbD50D)iGNa-X39V`1f3;@qAfq@8Uf5HLG^+<1;-_O9Gu7#
z3jiz`Vt<JxDM`Sfct6RIWE=(eay!mId-)QxdMP+~>%|LcR6<DtQVd&Sz$m2b`rL%E
zIExH#{PCI=0Avz}dC|ZGPnOx%(bf#E0)q;dg(O`sa{yv@QrMIgJp61yty<n4wqz=m
z6-B%j-9@OZ5(D?l=yF**tn}=Jyh8vyyY9sqG?9ZtM=mA-z|<N?hc+vzP~08ZZz;NL
zra}#gXF=2p%m6pSMwYt>s<7!2e*9A`G0g6r@!h?1SonvDwCo8)7~j0()-7|fB9Fux
z7d6&e0@SE0L;in-!Fv(FL$?vY1qICveUVntOX?u7E$lX#Ss{pCL2e{KB)sKy)dpuW
zn@uK0X@0CDY>BZbd<4l-tR&mED1+pJd@ru_G_E4?g8Vvh0p1X8xXw%^jVuaCq$DjG
zRfPwy?rW*EO#!RW3|M~)ya9=tU=U@fN?%cO*u$v2;#usBDM!b`b94tW34sv+R$!IE
zp#8T|D=T-cu*$IC5hsW+;4IQvA$zt3*d)w=E*O{uA%eEWZ{-4l*BL4;0YPv^?fcS5
zs!HIp^kIlt?8|42-0glUv99@}Mto9exK@Uy#m}JhYTh9LQ*c0h2D#<#hOVW+R^d|n
zPMSrR)WnuiGU?g{_x%vC60;<1Gr+^1UhL^XS%5PsX)EC&*h&G&iAjqSx=c~j$`*Z0
z_EhxV3ibd|zyhJ@B$tGx<}zr+@Xi8R6+z}~w+tL&_cB?c6{qv$B#I}RyebYQoLHN1
z!4reobE&em+RW6`uPm+=SsEcIYUOaG;YcKgs>xdjc+_uLgqj$xGK_7T?NnI;+9q_d
zv28L6=-mLslH*efWQH^?R<s=0HVINEro%+mB7*O1yS(nlfMS?suy5bPr)?bTV%P;N
zS6o}Spf5r|mFXWA?giW%g@6n~LR}%73qb4c;kURH0Z`fRZ|<`HrD~GrVnqttkZZco
z-p-m*IZY;nux#HdH3S5rH?_-Y2@57b!tT#6<qa(Y^;C~sg<LrUL6yinH#{|aMGlfS
zfNqBHk`b`pBFIXN3sOkUBWTj4fqB-#+24NW1zymw20$33Ri@`wc=E0kw<!uRF$FGg
z3K8!;n+-=#S>b+0;VC$55*E7w#_1$jiUQqvGTYJ%0c5@4krspdb_rmYUiO!rm*5AT
zJBol+J~tQ(06Ba+Vi5Q|#;;;RM2rxCX;GwB9V8)$O~^$_NUcotj==%~p99_$F9ESA
zV2~xOp71qB*%nEmeJ?lIT55=biq$H%)iu;YAeCUUvI7f=TbM<v14X{g0*FgJO*aK-
zR0<{!6JkOHtcJl5<YBwSC=@z@oCCZs7D1XIHIUFFva}S7D;0?_DTtN@c-1Ko`6aP@
zvB=wa9TyqN0on%IiKD^*h)!A*H1_;N5)4+Jz`0xQv%-omO(WdIC<z8w)qtfXK|@K%
zDLda|+Ul&he}%<H2T9mkmh#&&K@D3W*i-c}DwGZbIj}rM%ZSD_gb82K*VG-xL2$jh
z+t8_aeSz-{+O+ip6dYSOUKAQLxL<mZZoXNV2BMD=^4t}mN2Bx)V~2tYApXiimVl}F
z<PSCWJ_FuxDrR}dXPGSYFVL{-1A1Jvh;4@y(2!HhGCMT@yyX5pBqc!3AQ-J+&gH-b
z8rUOtJAB@Yzbj<UV0l-3)190Y`;EB)iX+}Wl*YOu+X%!K3<^+C1u3U^2fP`8d#1pA
z;X8L%I^6?Q96$tme$H#-QwC=Q$+iJrz&j!p90;)hyHe)u0(dH#9>*-Uf!+lKdr1we
zx4EwKsL83#4gz4f?>fcAG7V2q&@KZ%F88wUC1{O|3Ii@oJ0LQUfb@ZMt^9#PH-XY%
zdC~}giw>7`Rh34-XdT61><bLaiu@Se!L%+!0ppjmM0o)!4M+}XScgat29yMlkud<)
z@c0X8Uwx=Z64aCD2h}(r3Zb@=Ol^*UKZ3U;>2IlK>_Vq6DBsfI8S_QpXG5*(Wl<Kf
z88C1`w!pCqqH>@l32bVt#Rb03CMg8t(xy<FMwoNxDxLxQ13)}1H}{^gso)OhRBA{f
z9?NQulEXs-q4jw8fgnnx1P=6QlWc52*oM_@L6JbCb$Gy`gELSYnMAB`v}*>&E7xj6
z8evt04Sy_!Oc0nh7S(7;ZD!#G;>r{{S&qD$$!PZREb2a$T^a`&SxYWCmf#Ele+VrF
zplD@^s?3y)3+nJxhBU!jU)s_|sI5>J9JL}?s4mfg$V&Ab0svw0$venz1S=r}#EMqU
z9{^AwTbPpM*CWhKIxM0$fdDoods4+Mgj62tq|;p`4tg@gTB+CcH3xe}0>DUZ1@?g?
ziDOYJB7-@|MLXmVy!Z%=8bYn=3xOZ21h@dhP%Ov^m1#t`351}e3=@K(e1e+F4Zw1|
zNUXiS`ca_~U7}4y0SpG0(!klJ+ujEt0UjNM3IjPDhhTRd#=z?;7mV6nm|TzvCKkdD
z;VA|3Eh>yd_t#__3wI{QH;5LHE4`@_6zK}I*n^J{AV~iz+d*xqVPZw%RJ<41%q%Zw
zl1cZoMhRc^8ImrbXT~v2GsS>V`+kzB;n)XX5{4{+LKnxj2_2Z;l$h)~NEYV4f>bX6
z=@`G8crMKX7?)6>kF?Dfi_7&eHi>S%aWndiK(Sk8Z(9dpO^r%}kDtG!nD)7>Qef`~
zM3=arikAe8Uy+9cw?PERc1tE7mJJ1n{T0&e!{}NghhC!bJbj=#f2okot2gW(_A!~<
z1`8mRzbOj^U<FWiE@KiTAPVT$F{^O6YYUA3c!l`5zJ0VW7Kk!~5C|X@kx?7KI4}Y^
z-wc%u$7rxG%8mmiW<Z%%S%H+5ey@KlI5b44RI2FI4;I^rf@44~AV7o%7BM7fuOw;&
zss)mdAuwQC5N3)V7*$nY0KZ#ZuI}s+3dp3b5x{_;!UEC&F9sXP1Xz6OH9`}=&qyj8
z4lp87V9+{r$MaD`RcfN&LPQdCX86q>e=79z4GU<g#dpqP+;QjHs*g2(1mVxHl)3m9
zsQ~E$@a4_197YR}<nalCrpzh<x70wZv+WMB3^ycnutL;6?2(@+50EPL?-Di%b6s>h
z#xVw|Bx=yVPy<V5_}f+tZ4^M5#t>9ffk|2+#4DNVXrs%1I8@*RAAxGH5Ara?XoQ_s
zEn>yy#Q?@L+hQ=NhZc`Uv)Av`3#X>H4;Hu0;c?NGdDkm$E_0k{^kg)+k6SWfjj*D(
z&5SeQ1rIXf$_>uHy(J%m;LnahS_1;AAtsYamZd2qOrf?b4eT^;IvIuO8t^R+K*OwJ
zT*Cqcj(&}-!b4y%sK7NC2S%;(KPf|T@p=Y_6=`A&paVuKZrEPIfus^Xse&dZAtp$s
z87C$kspZ~T>A-svL>mA^;U#BSNHOm3{I>nrU<85aB$$a6rVlQGRd>I&iuv#9HUm^q
zz_3hcHnCs;A&FFKE{|3$&<t8z1(3pt()cJPAyBa^gslZLQ{GP&1Qbak;}^@13-m(2
zF!K;;*x7+7uY}gu*w*Wn?g`w0ZuVvY{jxGogQN)lHrk|6+i5ZS@CDVX4ghcRI{L~0
z*pO5@&#6_s1`T5lD82Hujy$!uTvR;(Jh@QO8LJrrNRSZM0KJ|pB(S3P=|otyowAF;
z*PL#_W3h%ego$R7m5oB+uvP|yiqQ52g6InoXfbjK*_u=ksKgXA5OqibgtoPk0iMLq
zecdPuD*_w#a!#3;S!)ao1O`Q|0S$>tUabN%6)m5X!a<|~oUg_wj_hRP=tvhm_-qC9
zP-A>RArO*=C&CL>1Td<kdLYLVP_Jk;?N%rNylj;wB?CQRL1-EYi9nZ`kQpIR3=zes
zw>zN5SS2KsFi`=+s?gMwgK1>*3dn3V1GMPt3PK0S#1=v9F9X^PKZq?iA5!7%77Ji4
z0K5g<TnEqz0$hV=msf}q9JhC?1Efmx2GLS6L1-2t;9cltBn*R!gy<IZsBOh0xKl7=
zL<}H^G9wmSq<|DPE;--kx#&-4vB&-G_V_wlmVYO4{vf$7zOO{aLBSwENN^XQKGAoF
zKzbOI7jJji7vKbgH!nB?-a~KB2vRsJv%_PsmX_8RC8Xx=W!%FM)VO7Vk!b=j5qLbA
z(Er2}Jjb%WddAYC%y|P9eX12e7P>8kkR4edVn(n-FvSx5&lhnBnRU$7t91cu0f51N
zpNLTE4x_x1#I*>G2?hDGE;%F$D19NAthB@i_?W~ZA}4_Hjnlo~{QE`kMS)pS8px3J
S?3uzZ{9VZu;X*?p^|>%abb%WH

diff --git a/docker/bootstrap/ubuntu-15.04/baselayout.tar b/docker/bootstrap/ubuntu-15.04/baselayout.tar
index 42188128acb5300aa06eff366c8e9df6f2a7817a..cd19b173ed46546325b2056617d445c8952b3063 100644
GIT binary patch
literal 8478
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
M<ce^iAR^&P&Niuv-T(jq

literal 8484
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
S?3uzZ{9VZu;X*?p^|>%abb%WH

diff --git a/docker/bootstrap/ubuntu-15.10/baselayout.tar b/docker/bootstrap/ubuntu-15.10/baselayout.tar
index 42188128acb5300aa06eff366c8e9df6f2a7817a..cd19b173ed46546325b2056617d445c8952b3063 100644
GIT binary patch
literal 8478
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
M<ce^iAR^&P&Niuv-T(jq

literal 8484
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
S?3uzZ{9VZu;X*?p^|>%abb%WH

diff --git a/docker/bootstrap/ubuntu-16.04/baselayout.tar b/docker/bootstrap/ubuntu-16.04/baselayout.tar
index 42188128acb5300aa06eff366c8e9df6f2a7817a..cd19b173ed46546325b2056617d445c8952b3063 100644
GIT binary patch
literal 8478
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
M<ce^iAR^&P&Niuv-T(jq

literal 8484
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
S?3uzZ{9VZu;X*?p^|>%abb%WH

diff --git a/docker/samson-deployment/latest/baselayout.tar b/docker/samson-deployment/latest/baselayout.tar
index 42188128acb5300aa06eff366c8e9df6f2a7817a..cd19b173ed46546325b2056617d445c8952b3063 100644
GIT binary patch
literal 8478
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
M<ce^iAR^&P&Niuv-T(jq

literal 8484
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
S?3uzZ{9VZu;X*?p^|>%abb%WH


From f628ce844ad2deef82aade5fe3b1fd743a886542 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Thu, 23 Jun 2016 18:53:25 +0200
Subject: [PATCH 05/13] Remove provision from all and build

Provision is not needed to build the images
---
 Makefile  | 5 +++--
 README.md | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c9150cfbb..abe9caa95 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,9 @@ DOCKER_TAG_LATEST=`cat DOCKER_TAG_LATEST`
 list:
 	sh -c "echo; $(MAKE) -p no_targets__ | awk -F':' '/^[a-zA-Z0-9][^\$$#\\t=]*:([^=]|$$)/ {split(\$$1,A,/ /);for(i in A)print A[i]}' | grep -v '__\$$' | grep -v 'Makefile'| sort"
 
-all:       provision bootstrap base web php php-dev hhvm service misc applications
-build:     all
+full:      provision build
+all:       build
+build:     bootstrap base web php php-dev hhvm service misc applications
 
 bootstrap: webdevops/bootstrap webdevops/ansible
 base:      webdevops/base webdevops/base-app webdevops/storage
diff --git a/README.md b/README.md
index 89d6a104d..8f343e2c2 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,7 @@ Command                     | Description
 `make baselayout`           | Build and deploy baselayout.tar
 `make provision`            | Deploy all configuration files from [_provisioning/](_provisioning/README.md)
 `make dist-update`          | Update local distrubtion images (CentOS, Debian, Ubuntu)
+`make full`                 | Run provision and build all images
 <br>                        |
 `make test`                 | Run testsuite (use currently available docker images on your docker host)
 `make test-hub-images`      | Run testsuite but pull newest docker images from docker hub first

From 766cfa1980b9bb28b2d489d680f1521fdeb7d022 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Thu, 23 Jun 2016 19:21:24 +0200
Subject: [PATCH 06/13] Remove wait between php5  and 7 tests

With new infogene server we don't need this anymore
---
 test/run.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/run.sh b/test/run.sh
index 9fa1547be..bd6592f0f 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -373,7 +373,7 @@ initEnvironment
     setEnvironmentOsFamily "alpine"
     OS_VERSION="3" runTestForTag "alpine-3"
 
-    waitForTestRun
+    #waitForTestRun
 
     ##########
     # PHP 7
@@ -424,7 +424,7 @@ initEnvironment
     setEnvironmentOsFamily "alpine"
     OS_VERSION="3" runTestForTag "alpine-3"
 
-    waitForTestRun
+    #waitForTestRun
 
     ##########
     # PHP 7
@@ -532,7 +532,7 @@ initEnvironment
     setEnvironmentOsFamily "alpine"
     OS_VERSION="3" runTestForTag "alpine-3"
 
-    waitForTestRun
+    #waitForTestRun
 
     ##########
     # PHP 7
@@ -583,7 +583,7 @@ initEnvironment
     setEnvironmentOsFamily "alpine"
     OS_VERSION="3" runTestForTag "alpine-3"
 
-    waitForTestRun
+    #waitForTestRun
 
     ##########
     # PHP 7
@@ -633,7 +633,7 @@ initEnvironment
     setEnvironmentOsFamily "alpine"
     OS_VERSION="3" runTestForTag "alpine-3"
 
-    waitForTestRun
+    #waitForTestRun
 
     ##########
     # PHP 7
@@ -685,7 +685,7 @@ initEnvironment
     setEnvironmentOsFamily "alpine"
     OS_VERSION="3" runTestForTag "alpine-3"
 
-    waitForTestRun
+    #waitForTestRun
 
     ##########
     # PHP 7

From 7140e6e156b4007216dc1ea86feb77b33fa17ce2 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Thu, 23 Jun 2016 19:43:36 +0200
Subject: [PATCH 07/13] Rename mail-catcher to mail-sandbox

mail-catcher is the wrong name
---
 .../dockerfiles/{mail-catcher.rst => mail-sandbox.rst}          | 0
 documentation/docs/content/DockerImages/index.rst               | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename documentation/docs/content/DockerImages/dockerfiles/{mail-catcher.rst => mail-sandbox.rst} (100%)

diff --git a/documentation/docs/content/DockerImages/dockerfiles/mail-catcher.rst b/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst
similarity index 100%
rename from documentation/docs/content/DockerImages/dockerfiles/mail-catcher.rst
rename to documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst
diff --git a/documentation/docs/content/DockerImages/index.rst b/documentation/docs/content/DockerImages/index.rst
index 924ce9311..d7542598e 100644
--- a/documentation/docs/content/DockerImages/index.rst
+++ b/documentation/docs/content/DockerImages/index.rst
@@ -20,7 +20,7 @@ Docker images
    dockerfiles/hhvm
    dockerfiles/hhvm-apache
    dockerfiles/hhvm-nginx
-   dockerfiles/mail-catcher
+   dockerfiles/mail-sandbox
    dockerfiles/nginx
    dockerfiles/php
    dockerfiles/php-apache

From 337e29655300edb2778893c128049d2249f3e710 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Thu, 23 Jun 2016 20:33:00 +0200
Subject: [PATCH 08/13] Add apache-dev and nginx-dev

Move files from php-apache-dev to apache-dev
Move files from php-nginx-dev to nginx-dev
Fixes #104
---
 Makefile                                      |  8 ++-
 bin/provision.sh                              | 16 ++++++
 docker/apache-dev/README.md                   | 44 ++++++++++++++
 docker/apache-dev/alpine-3/Dockerfile         | 25 ++++++++
 docker/apache-dev/alpine-3/Dockerfile.jinja2  | 11 ++++
 .../bin/service.d/httpd.d/12-development.sh   |  0
 .../conf/etc/httpd/conf.d/02-dev.conf         |  0
 .../conf/etc/httpd}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf |  0
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 docker/apache-dev/centos-7/Dockerfile         | 25 ++++++++
 docker/apache-dev/centos-7/Dockerfile.jinja2  | 11 ++++
 .../bin/service.d/httpd.d/12-development.sh   |  0
 .../conf/etc/httpd/conf.d/02-dev.conf         |  0
 .../conf/etc/httpd}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf |  0
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 docker/apache-dev/debian-7/Dockerfile         | 25 ++++++++
 docker/apache-dev/debian-7/Dockerfile.jinja2  | 11 ++++
 .../bin/service.d/httpd.d/12-development.sh   |  0
 .../conf/etc/httpd/conf.d/02-dev.conf         |  0
 .../conf/etc/httpd}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf |  0
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 docker/apache-dev/debian-8/Dockerfile         | 25 ++++++++
 docker/apache-dev/debian-8/Dockerfile.jinja2  | 11 ++++
 .../bin/service.d/httpd.d/12-development.sh   |  0
 .../conf/etc/httpd/conf.d/02-dev.conf         |  0
 .../conf/etc/httpd}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf |  0
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 docker/apache-dev/debian-9/Dockerfile         | 25 ++++++++
 docker/apache-dev/debian-9/Dockerfile.jinja2  | 11 ++++
 .../bin/service.d/httpd.d/12-development.sh   |  0
 .../conf/etc/httpd/conf.d/02-dev.conf         |  0
 .../conf/etc/httpd}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf |  0
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 docker/apache-dev/ubuntu-12.04/Dockerfile     | 25 ++++++++
 .../apache-dev/ubuntu-12.04/Dockerfile.jinja2 | 11 ++++
 .../bin/service.d/httpd.d/12-development.sh   |  0
 .../conf/etc/httpd/conf.d/02-dev.conf         |  0
 .../conf/etc/httpd}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf |  0
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 docker/apache-dev/ubuntu-14.04/Dockerfile     | 25 ++++++++
 .../apache-dev/ubuntu-14.04/Dockerfile.jinja2 | 11 ++++
 .../bin/service.d/httpd.d/12-development.sh   |  0
 .../conf/etc/httpd/conf.d/02-dev.conf         |  0
 .../conf/etc/httpd}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf |  0
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 docker/apache-dev/ubuntu-15.04/Dockerfile     | 25 ++++++++
 .../apache-dev/ubuntu-15.04/Dockerfile.jinja2 | 11 ++++
 .../bin/service.d/httpd.d/12-development.sh   |  0
 .../conf/etc/httpd/conf.d/02-dev.conf         |  0
 .../conf/etc/httpd}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf |  0
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 docker/apache-dev/ubuntu-15.10/Dockerfile     | 25 ++++++++
 .../apache-dev/ubuntu-15.10/Dockerfile.jinja2 | 11 ++++
 .../bin/service.d/httpd.d/12-development.sh   |  0
 .../conf/etc/httpd/conf.d/02-dev.conf         |  0
 .../conf/etc/httpd}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf |  0
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 docker/apache-dev/ubuntu-16.04/Dockerfile     | 25 ++++++++
 .../apache-dev/ubuntu-16.04/Dockerfile.jinja2 | 11 ++++
 .../bin/service.d/httpd.d/12-development.sh   |  0
 .../conf/etc/httpd/conf.d/02-dev.conf         |  0
 .../conf/etc/httpd}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf |  0
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 docker/nginx-dev/README.md                    | 55 ++++++++++++++++++
 docker/nginx-dev/alpine-3/Dockerfile          | 25 ++++++++
 docker/nginx-dev/alpine-3/Dockerfile.jinja2   | 11 ++++
 .../bin/service.d/nginx.d/12-development.sh   |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  0
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  0
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev}/tasks/bootstrap.yml  |  1 -
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 docker/nginx-dev/centos-7/Dockerfile          | 25 ++++++++
 docker/nginx-dev/centos-7/Dockerfile.jinja2   | 11 ++++
 .../bin/service.d/nginx.d/12-development.sh   |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  0
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  0
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev}/tasks/bootstrap.yml  |  1 -
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 docker/nginx-dev/debian-7/Dockerfile          | 25 ++++++++
 docker/nginx-dev/debian-7/Dockerfile.jinja2   | 11 ++++
 .../bin/service.d/nginx.d/12-development.sh   |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  0
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  0
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev}/tasks/bootstrap.yml  |  1 -
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 docker/nginx-dev/debian-8/Dockerfile          | 25 ++++++++
 docker/nginx-dev/debian-8/Dockerfile.jinja2   | 11 ++++
 .../bin/service.d/nginx.d/12-development.sh   |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  0
 .../conf/etc/nginx}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  0
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev}/tasks/bootstrap.yml  |  1 -
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 docker/nginx-dev/debian-9/Dockerfile          | 25 ++++++++
 docker/nginx-dev/debian-9/Dockerfile.jinja2   | 11 ++++
 .../bin/service.d/nginx.d/12-development.sh   |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  0
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  0
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 docker/nginx-dev/ubuntu-12.04/Dockerfile      | 25 ++++++++
 .../nginx-dev/ubuntu-12.04/Dockerfile.jinja2  | 11 ++++
 .../bin/service.d/nginx.d/12-development.sh   |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  0
 .../conf/etc/nginx}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  0
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 docker/nginx-dev/ubuntu-14.04/Dockerfile      | 25 ++++++++
 .../nginx-dev/ubuntu-14.04/Dockerfile.jinja2  | 11 ++++
 .../bin/service.d/nginx.d/12-development.sh   |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  0
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  0
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 docker/nginx-dev/ubuntu-15.04/Dockerfile      | 25 ++++++++
 .../nginx-dev/ubuntu-15.04/Dockerfile.jinja2  | 11 ++++
 .../bin/service.d/nginx.d/12-development.sh   |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  0
 .../conf/etc/nginx}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  0
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 docker/nginx-dev/ubuntu-15.10/Dockerfile      | 25 ++++++++
 .../nginx-dev/ubuntu-15.10/Dockerfile.jinja2  | 11 ++++
 .../bin/service.d/nginx.d/12-development.sh   |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  0
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  0
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 docker/nginx-dev/ubuntu-16.04/Dockerfile      | 25 ++++++++
 .../nginx-dev/ubuntu-16.04/Dockerfile.jinja2  | 11 ++++
 .../bin/service.d/nginx.d/12-development.sh   |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  0
 .../conf/etc/nginx}/vhost.common.d/.gitkeep   |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  0
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../php-apache-dev/alpine-3-php7/Dockerfile   |  2 +-
 .../alpine-3-php7/Dockerfile.jinja2           |  2 +-
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 docker/php-apache-dev/alpine-3/Dockerfile     |  2 +-
 .../php-apache-dev/alpine-3/Dockerfile.jinja2 |  2 +-
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../php-apache-dev/centos-7-php56/Dockerfile  |  2 +-
 .../centos-7-php56/Dockerfile.jinja2          |  2 +-
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 docker/php-apache-dev/centos-7/Dockerfile     |  2 +-
 .../php-apache-dev/centos-7/Dockerfile.jinja2 |  2 +-
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 docker/php-apache-dev/debian-7/Dockerfile     |  2 +-
 .../php-apache-dev/debian-7/Dockerfile.jinja2 |  2 +-
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../php-apache-dev/debian-8-php7/Dockerfile   |  2 +-
 .../debian-8-php7/Dockerfile.jinja2           |  2 +-
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 docker/php-apache-dev/debian-8/Dockerfile     |  2 +-
 .../php-apache-dev/debian-8/Dockerfile.jinja2 |  2 +-
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 docker/php-apache-dev/debian-9/Dockerfile     |  2 +-
 .../php-apache-dev/debian-9/Dockerfile.jinja2 |  2 +-
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 docker/php-apache-dev/ubuntu-12.04/Dockerfile |  2 +-
 .../ubuntu-12.04/Dockerfile.jinja2            |  2 +-
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 docker/php-apache-dev/ubuntu-14.04/Dockerfile |  2 +-
 .../ubuntu-14.04/Dockerfile.jinja2            |  2 +-
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 docker/php-apache-dev/ubuntu-15.04/Dockerfile |  2 +-
 .../ubuntu-15.04/Dockerfile.jinja2            |  2 +-
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 docker/php-apache-dev/ubuntu-15.10/Dockerfile |  2 +-
 .../ubuntu-15.10/Dockerfile.jinja2            |  2 +-
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 docker/php-apache-dev/ubuntu-16.04/Dockerfile |  2 +-
 .../ubuntu-16.04/Dockerfile.jinja2            |  2 +-
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../conf/etc/nginx/conf.d/02-dev.conf         |  1 -
 .../conf/etc/nginx/vhost.common.d/.gitkeep    |  0
 .../conf/etc/nginx/vhost.common.d/02-dev.conf |  4 --
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 docker/php-nginx-dev/alpine-3-php7/Dockerfile |  2 +-
 .../alpine-3-php7/Dockerfile.jinja2           |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 docker/php-nginx-dev/alpine-3/Dockerfile      |  2 +-
 .../php-nginx-dev/alpine-3/Dockerfile.jinja2  |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 .../php-nginx-dev/centos-7-php56/Dockerfile   |  2 +-
 .../centos-7-php56/Dockerfile.jinja2          |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 docker/php-nginx-dev/centos-7/Dockerfile      |  2 +-
 .../php-nginx-dev/centos-7/Dockerfile.jinja2  |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 docker/php-nginx-dev/debian-7/Dockerfile      |  2 +-
 .../php-nginx-dev/debian-7/Dockerfile.jinja2  |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 docker/php-nginx-dev/debian-8-php7/Dockerfile |  2 +-
 .../debian-8-php7/Dockerfile.jinja2           |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 docker/php-nginx-dev/debian-8/Dockerfile      |  2 +-
 .../php-nginx-dev/debian-8/Dockerfile.jinja2  |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 docker/php-nginx-dev/debian-9/Dockerfile      |  2 +-
 .../php-nginx-dev/debian-9/Dockerfile.jinja2  |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 docker/php-nginx-dev/ubuntu-12.04/Dockerfile  |  2 +-
 .../ubuntu-12.04/Dockerfile.jinja2            |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 docker/php-nginx-dev/ubuntu-14.04/Dockerfile  |  2 +-
 .../ubuntu-14.04/Dockerfile.jinja2            |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 docker/php-nginx-dev/ubuntu-15.04/Dockerfile  |  2 +-
 .../ubuntu-15.04/Dockerfile.jinja2            |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 docker/php-nginx-dev/ubuntu-15.10/Dockerfile  |  2 +-
 .../ubuntu-15.10/Dockerfile.jinja2            |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 docker/php-nginx-dev/ubuntu-16.04/Dockerfile  |  2 +-
 .../ubuntu-16.04/Dockerfile.jinja2            |  2 +-
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../conf/etc/httpd/conf.d/02-dev.conf         |  6 --
 .../conf/etc/httpd/vhost.common.d/.gitkeep    |  0
 .../conf/etc/httpd/vhost.common.d/02-dev.conf | 10 ----
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 .../bin/service.d/httpd.d/12-development.sh   |  0
 .../general}/etc/httpd/conf.d/02-dev.conf     |  0
 .../etc/httpd}/vhost.common.d/.gitkeep        |  0
 .../etc/httpd/vhost.common.d/02-dev.conf      |  0
 .../webdevops-apache-dev}/defaults/main.yml   |  0
 .../webdevops-apache-dev/tasks/bootstrap.yml  |  2 +
 .../webdevops-apache-dev}/tasks/main.yml      |  0
 .../bin/service.d/nginx.d/12-development.sh   |  0
 .../general}/etc/nginx/conf.d/02-dev.conf     |  0
 .../etc/nginx}/vhost.common.d/.gitkeep        |  0
 .../etc/nginx/vhost.common.d/02-dev.conf      |  0
 .../webdevops-nginx-dev}/defaults/main.yml    |  0
 .../webdevops-nginx-dev/tasks/bootstrap.yml   |  3 +
 .../tasks/bootstrap/nginx.yml                 |  0
 .../roles/webdevops-nginx-dev}/tasks/main.yml |  0
 .../bin/service.d/httpd.d/12-development.sh   |  1 -
 .../bin/service.d/nginx.d/12-development.sh   |  1 -
 .../general/etc/httpd/conf.d/02-dev.conf      |  6 --
 .../general/etc/httpd/vhost.common.d/.gitkeep |  0
 .../etc/httpd/vhost.common.d/02-dev.conf      | 10 ----
 .../general/etc/nginx/conf.d/02-dev.conf      |  1 -
 .../general/etc/nginx/vhost.common.d/.gitkeep |  0
 .../etc/nginx/vhost.common.d/02-dev.conf      |  4 --
 .../defaults/main.yml                         |  6 --
 .../tasks/bootstrap.yml                       |  3 -
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-apache-dev/tasks/main.yml   |  5 --
 .../webdevops-php-nginx-dev/defaults/main.yml |  6 --
 .../tasks/bootstrap.yml                       |  4 --
 .../tasks/bootstrap/nginx.yml                 |  9 ---
 .../tasks/bootstrap/php-fpm.yml               |  9 ---
 .../webdevops-php-nginx-dev/tasks/main.yml    |  5 --
 template/Dockerfile/images/apache-dev.jinja2  |  7 +++
 template/Dockerfile/images/nginx-dev.jinja2   |  7 +++
 template/Dockerfile/layout.jinja2             |  2 +
 test/run.sh                                   | 57 +++++++++++++++++++
 720 files changed, 1075 insertions(+), 1905 deletions(-)
 create mode 100644 docker/apache-dev/README.md
 create mode 100644 docker/apache-dev/alpine-3/Dockerfile
 create mode 100644 docker/apache-dev/alpine-3/Dockerfile.jinja2
 rename docker/{php-dev/alpine-3-php7 => apache-dev/alpine-3}/conf/bin/service.d/httpd.d/12-development.sh (100%)
 rename docker/{php-dev/alpine-3-php7 => apache-dev/alpine-3}/conf/etc/httpd/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/alpine-3-php7/conf/etc/nginx => apache-dev/alpine-3/conf/etc/httpd}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-dev/alpine-3-php7 => apache-dev/alpine-3}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev => apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev => apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 create mode 100644 docker/apache-dev/centos-7/Dockerfile
 create mode 100644 docker/apache-dev/centos-7/Dockerfile.jinja2
 rename docker/{php-dev/alpine-3 => apache-dev/centos-7}/conf/bin/service.d/httpd.d/12-development.sh (100%)
 rename docker/{php-dev/alpine-3 => apache-dev/centos-7}/conf/etc/httpd/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/alpine-3/conf/etc/nginx => apache-dev/centos-7/conf/etc/httpd}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-dev/alpine-3 => apache-dev/centos-7}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev => apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev => apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 create mode 100644 docker/apache-dev/debian-7/Dockerfile
 create mode 100644 docker/apache-dev/debian-7/Dockerfile.jinja2
 rename docker/{php-dev/centos-7-php56 => apache-dev/debian-7}/conf/bin/service.d/httpd.d/12-development.sh (100%)
 rename docker/{php-dev/centos-7-php56 => apache-dev/debian-7}/conf/etc/httpd/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/centos-7-php56/conf/etc/nginx => apache-dev/debian-7/conf/etc/httpd}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-dev/centos-7-php56 => apache-dev/debian-7}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev => apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev => apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 create mode 100644 docker/apache-dev/debian-8/Dockerfile
 create mode 100644 docker/apache-dev/debian-8/Dockerfile.jinja2
 rename docker/{php-dev/centos-7 => apache-dev/debian-8}/conf/bin/service.d/httpd.d/12-development.sh (100%)
 rename docker/{php-dev/centos-7 => apache-dev/debian-8}/conf/etc/httpd/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/centos-7/conf/etc/nginx => apache-dev/debian-8/conf/etc/httpd}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-dev/centos-7 => apache-dev/debian-8}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev => apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev => apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 create mode 100644 docker/apache-dev/debian-9/Dockerfile
 create mode 100644 docker/apache-dev/debian-9/Dockerfile.jinja2
 rename docker/{php-dev/debian-7 => apache-dev/debian-9}/conf/bin/service.d/httpd.d/12-development.sh (100%)
 rename docker/{php-dev/debian-7 => apache-dev/debian-9}/conf/etc/httpd/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/debian-7/conf/etc/nginx => apache-dev/debian-9/conf/etc/httpd}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-dev/debian-7 => apache-dev/debian-9}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev => apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev => apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 create mode 100644 docker/apache-dev/ubuntu-12.04/Dockerfile
 create mode 100644 docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2
 rename docker/{php-dev/debian-8-php7 => apache-dev/ubuntu-12.04}/conf/bin/service.d/httpd.d/12-development.sh (100%)
 rename docker/{php-dev/debian-8-php7 => apache-dev/ubuntu-12.04}/conf/etc/httpd/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/debian-8-php7/conf/etc/nginx => apache-dev/ubuntu-12.04/conf/etc/httpd}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-dev/debian-8-php7 => apache-dev/ubuntu-12.04}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev => apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev => apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 create mode 100644 docker/apache-dev/ubuntu-14.04/Dockerfile
 create mode 100644 docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2
 rename docker/{php-dev/debian-8 => apache-dev/ubuntu-14.04}/conf/bin/service.d/httpd.d/12-development.sh (100%)
 rename docker/{php-dev/debian-8 => apache-dev/ubuntu-14.04}/conf/etc/httpd/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/debian-8/conf/etc/nginx => apache-dev/ubuntu-14.04/conf/etc/httpd}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-dev/debian-8 => apache-dev/ubuntu-14.04}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev => apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev => apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 create mode 100644 docker/apache-dev/ubuntu-15.04/Dockerfile
 create mode 100644 docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2
 rename docker/{php-dev/debian-9 => apache-dev/ubuntu-15.04}/conf/bin/service.d/httpd.d/12-development.sh (100%)
 rename docker/{php-dev/debian-9 => apache-dev/ubuntu-15.04}/conf/etc/httpd/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/debian-9/conf/etc/nginx => apache-dev/ubuntu-15.04/conf/etc/httpd}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-dev/debian-9 => apache-dev/ubuntu-15.04}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev => apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev => apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 create mode 100644 docker/apache-dev/ubuntu-15.10/Dockerfile
 create mode 100644 docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2
 rename docker/{php-dev/ubuntu-12.04 => apache-dev/ubuntu-15.10}/conf/bin/service.d/httpd.d/12-development.sh (100%)
 rename docker/{php-dev/ubuntu-12.04 => apache-dev/ubuntu-15.10}/conf/etc/httpd/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/ubuntu-12.04/conf/etc/nginx => apache-dev/ubuntu-15.10/conf/etc/httpd}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-dev/ubuntu-12.04 => apache-dev/ubuntu-15.10}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev => apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev => apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 create mode 100644 docker/apache-dev/ubuntu-16.04/Dockerfile
 create mode 100644 docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2
 rename docker/{php-dev/ubuntu-14.04 => apache-dev/ubuntu-16.04}/conf/bin/service.d/httpd.d/12-development.sh (100%)
 rename docker/{php-dev/ubuntu-14.04 => apache-dev/ubuntu-16.04}/conf/etc/httpd/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/ubuntu-14.04/conf/etc/nginx => apache-dev/ubuntu-16.04/conf/etc/httpd}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-dev/ubuntu-14.04 => apache-dev/ubuntu-16.04}/conf/etc/httpd/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev => apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev => apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 create mode 100644 docker/nginx-dev/README.md
 create mode 100644 docker/nginx-dev/alpine-3/Dockerfile
 create mode 100644 docker/nginx-dev/alpine-3/Dockerfile.jinja2
 rename docker/{php-apache-dev/alpine-3-php7 => nginx-dev/alpine-3}/conf/bin/service.d/nginx.d/12-development.sh (100%)
 rename docker/{php-apache-dev/alpine-3-php7 => nginx-dev/alpine-3}/conf/etc/nginx/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/ubuntu-15.04 => nginx-dev/alpine-3}/conf/etc/nginx/vhost.common.d/.gitkeep (100%)
 rename docker/{php-apache-dev/alpine-3-php7 => nginx-dev/alpine-3}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev => nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 rename docker/{php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap.yml (52%)
 rename docker/{php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev => nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 create mode 100644 docker/nginx-dev/centos-7/Dockerfile
 create mode 100644 docker/nginx-dev/centos-7/Dockerfile.jinja2
 rename docker/{php-apache-dev/alpine-3 => nginx-dev/centos-7}/conf/bin/service.d/nginx.d/12-development.sh (100%)
 rename docker/{php-apache-dev/alpine-3 => nginx-dev/centos-7}/conf/etc/nginx/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/ubuntu-15.10 => nginx-dev/centos-7}/conf/etc/nginx/vhost.common.d/.gitkeep (100%)
 rename docker/{php-apache-dev/alpine-3 => nginx-dev/centos-7}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 rename docker/{php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap.yml (52%)
 rename docker/{php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 create mode 100644 docker/nginx-dev/debian-7/Dockerfile
 create mode 100644 docker/nginx-dev/debian-7/Dockerfile.jinja2
 rename docker/{php-apache-dev/centos-7-php56 => nginx-dev/debian-7}/conf/bin/service.d/nginx.d/12-development.sh (100%)
 rename docker/{php-apache-dev/centos-7-php56 => nginx-dev/debian-7}/conf/etc/nginx/conf.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/ubuntu-16.04 => nginx-dev/debian-7}/conf/etc/nginx/vhost.common.d/.gitkeep (100%)
 rename docker/{php-apache-dev/centos-7-php56 => nginx-dev/debian-7}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev => nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 rename docker/{php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap.yml (52%)
 rename docker/{php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev => nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 create mode 100644 docker/nginx-dev/debian-8/Dockerfile
 create mode 100644 docker/nginx-dev/debian-8/Dockerfile.jinja2
 rename docker/{php-apache-dev/centos-7 => nginx-dev/debian-8}/conf/bin/service.d/nginx.d/12-development.sh (100%)
 rename docker/{php-apache-dev/centos-7 => nginx-dev/debian-8}/conf/etc/nginx/conf.d/02-dev.conf (100%)
 rename docker/{php-dev/alpine-3-php7/conf/etc/httpd => nginx-dev/debian-8/conf/etc/nginx}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-apache-dev/centos-7 => nginx-dev/debian-8}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 rename docker/{php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap.yml (52%)
 rename docker/{php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 create mode 100644 docker/nginx-dev/debian-9/Dockerfile
 create mode 100644 docker/nginx-dev/debian-9/Dockerfile.jinja2
 rename docker/{php-apache-dev/debian-7 => nginx-dev/debian-9}/conf/bin/service.d/nginx.d/12-development.sh (100%)
 rename docker/{php-apache-dev/debian-7 => nginx-dev/debian-9}/conf/etc/nginx/conf.d/02-dev.conf (100%)
 rename docker/{php-dev/alpine-3-php7 => nginx-dev/debian-9}/conf/etc/nginx/vhost.common.d/.gitkeep (100%)
 rename docker/{php-apache-dev/debian-7 => nginx-dev/debian-9}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev => nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev => nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 create mode 100644 docker/nginx-dev/ubuntu-12.04/Dockerfile
 create mode 100644 docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2
 rename docker/{php-apache-dev/debian-8-php7 => nginx-dev/ubuntu-12.04}/conf/bin/service.d/nginx.d/12-development.sh (100%)
 rename docker/{php-apache-dev/debian-8-php7 => nginx-dev/ubuntu-12.04}/conf/etc/nginx/conf.d/02-dev.conf (100%)
 rename docker/{php-dev/alpine-3/conf/etc/httpd => nginx-dev/ubuntu-12.04/conf/etc/nginx}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-apache-dev/debian-8-php7 => nginx-dev/ubuntu-12.04}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 create mode 100644 docker/nginx-dev/ubuntu-14.04/Dockerfile
 create mode 100644 docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2
 rename docker/{php-apache-dev/debian-8 => nginx-dev/ubuntu-14.04}/conf/bin/service.d/nginx.d/12-development.sh (100%)
 rename docker/{php-apache-dev/debian-8 => nginx-dev/ubuntu-14.04}/conf/etc/nginx/conf.d/02-dev.conf (100%)
 rename docker/{php-dev/alpine-3 => nginx-dev/ubuntu-14.04}/conf/etc/nginx/vhost.common.d/.gitkeep (100%)
 rename docker/{php-apache-dev/debian-8 => nginx-dev/ubuntu-14.04}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev => nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev => nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 create mode 100644 docker/nginx-dev/ubuntu-15.04/Dockerfile
 create mode 100644 docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2
 rename docker/{php-apache-dev/debian-9 => nginx-dev/ubuntu-15.04}/conf/bin/service.d/nginx.d/12-development.sh (100%)
 rename docker/{php-apache-dev/debian-9 => nginx-dev/ubuntu-15.04}/conf/etc/nginx/conf.d/02-dev.conf (100%)
 rename docker/{php-dev/centos-7-php56/conf/etc/httpd => nginx-dev/ubuntu-15.04/conf/etc/nginx}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-apache-dev/debian-9 => nginx-dev/ubuntu-15.04}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 create mode 100644 docker/nginx-dev/ubuntu-15.10/Dockerfile
 create mode 100644 docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2
 rename docker/{php-apache-dev/ubuntu-12.04 => nginx-dev/ubuntu-15.10}/conf/bin/service.d/nginx.d/12-development.sh (100%)
 rename docker/{php-apache-dev/ubuntu-12.04 => nginx-dev/ubuntu-15.10}/conf/etc/nginx/conf.d/02-dev.conf (100%)
 rename docker/{php-dev/centos-7-php56 => nginx-dev/ubuntu-15.10}/conf/etc/nginx/vhost.common.d/.gitkeep (100%)
 rename docker/{php-apache-dev/ubuntu-12.04 => nginx-dev/ubuntu-15.10}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev => nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev => nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 create mode 100644 docker/nginx-dev/ubuntu-16.04/Dockerfile
 create mode 100644 docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2
 rename docker/{php-apache-dev/ubuntu-14.04 => nginx-dev/ubuntu-16.04}/conf/bin/service.d/nginx.d/12-development.sh (100%)
 rename docker/{php-apache-dev/ubuntu-14.04 => nginx-dev/ubuntu-16.04}/conf/etc/nginx/conf.d/02-dev.conf (100%)
 rename docker/{php-dev/centos-7/conf/etc/httpd => nginx-dev/ubuntu-16.04/conf/etc/nginx}/vhost.common.d/.gitkeep (100%)
 rename docker/{php-apache-dev/ubuntu-14.04 => nginx-dev/ubuntu-16.04}/conf/etc/nginx/vhost.common.d/02-dev.conf (100%)
 rename docker/{php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev => nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 rename docker/php-apache-dev/{ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev => alpine-3-php7/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/php-apache-dev/{ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev => alpine-3-php7/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 rename docker/php-apache-dev/{ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev => alpine-3/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/php-apache-dev/{ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev => alpine-3/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 rename docker/php-apache-dev/{ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev => centos-7-php56/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/php-apache-dev/{ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev => centos-7-php56/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 rename docker/php-apache-dev/{ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev => centos-7/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/php-apache-dev/{ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev => centos-7/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 rename docker/php-apache-dev/{ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev => debian-7/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/php-apache-dev/{ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev => debian-7/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 rename docker/php-apache-dev/{ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev => debian-8-php7/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/php-apache-dev/{ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev => debian-8-php7/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 rename docker/{php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev => php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev => php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 rename docker/{php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev => php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev => php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 rename docker/{php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev => php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev => php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 rename docker/{php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev => php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev => php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 rename docker/{php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev => php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev => php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf
 rename docker/{php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev => php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev => php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf
 rename docker/{php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev => php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename docker/{php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev => php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/alpine-3-php7/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev => php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev => php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev => php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev => php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev => php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev => php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev => php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev => php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev => php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev => php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev => php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev => php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf
 rename docker/{php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename docker/{php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename docker/{php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev => php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 rename {docker/php-dev/ubuntu-15.04/conf => provisioning/apache-dev/general}/bin/service.d/httpd.d/12-development.sh (100%)
 rename {docker/php-dev/ubuntu-15.04/conf => provisioning/apache-dev/general}/etc/httpd/conf.d/02-dev.conf (100%)
 rename {docker/php-dev/centos-7/conf/etc/nginx => provisioning/apache-dev/general/etc/httpd}/vhost.common.d/.gitkeep (100%)
 rename {docker/php-dev/ubuntu-15.04/conf => provisioning/apache-dev/general}/etc/httpd/vhost.common.d/02-dev.conf (100%)
 rename {docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev => provisioning/apache-dev/general/provision/roles/webdevops-apache-dev}/defaults/main.yml (100%)
 create mode 100644 provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
 rename {docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev => provisioning/apache-dev/general/provision/roles/webdevops-apache-dev}/tasks/main.yml (100%)
 rename {docker/php-apache-dev/ubuntu-15.04/conf => provisioning/nginx-dev/general}/bin/service.d/nginx.d/12-development.sh (100%)
 rename {docker/php-apache-dev/ubuntu-15.04/conf => provisioning/nginx-dev/general}/etc/nginx/conf.d/02-dev.conf (100%)
 rename {docker/php-dev/debian-7/conf/etc/httpd => provisioning/nginx-dev/general/etc/nginx}/vhost.common.d/.gitkeep (100%)
 rename {docker/php-apache-dev/ubuntu-15.04/conf => provisioning/nginx-dev/general}/etc/nginx/vhost.common.d/02-dev.conf (100%)
 rename {docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev => provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev}/defaults/main.yml (100%)
 create mode 100644 provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
 rename {docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev => provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev}/tasks/bootstrap/nginx.yml (100%)
 rename {docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev => provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev}/tasks/main.yml (100%)
 delete mode 100644 provisioning/php-dev/general/bin/service.d/httpd.d/12-development.sh
 delete mode 100644 provisioning/php-dev/general/bin/service.d/nginx.d/12-development.sh
 delete mode 100644 provisioning/php-dev/general/etc/httpd/conf.d/02-dev.conf
 delete mode 100644 provisioning/php-dev/general/etc/httpd/vhost.common.d/.gitkeep
 delete mode 100644 provisioning/php-dev/general/etc/httpd/vhost.common.d/02-dev.conf
 delete mode 100644 provisioning/php-dev/general/etc/nginx/conf.d/02-dev.conf
 delete mode 100644 provisioning/php-dev/general/etc/nginx/vhost.common.d/.gitkeep
 delete mode 100644 provisioning/php-dev/general/etc/nginx/vhost.common.d/02-dev.conf
 delete mode 100644 provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/defaults/main.yml
 delete mode 100644 provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
 delete mode 100644 provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/main.yml
 delete mode 100644 provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
 delete mode 100644 provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
 delete mode 100644 provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
 delete mode 100644 provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
 delete mode 100644 provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
 create mode 100644 template/Dockerfile/images/apache-dev.jinja2
 create mode 100644 template/Dockerfile/images/nginx-dev.jinja2

diff --git a/Makefile b/Makefile
index abe9caa95..f27826cb3 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ php:       webdevops/php webdevops/php-apache webdevops/php-nginx
 php-dev:   webdevops/php-dev webdevops/php-apache-dev webdevops/php-nginx-dev
 hhvm:      webdevops/hhvm webdevops/hhvm-apache webdevops/hhvm-nginx
 
-web:       webdevops/apache webdevops/nginx webdevops/varnish
+web:       webdevops/apache webdevops/apache-dev webdevops/nginx webdevops/nginx-dev webdevops/varnish
 
 applications: webdevops/typo3 webdevops/piwik
 
@@ -100,9 +100,15 @@ webdevops/php-dev:
 webdevops/apache:
 	bash bin/build.sh apache "${DOCKER_REPOSITORY}/apache" "${DOCKER_TAG_LATEST}"
 
+webdevops/apache-dev:
+	bash bin/build.sh apache-dev "${DOCKER_REPOSITORY}/apache-dev" "${DOCKER_TAG_LATEST}"
+
 webdevops/nginx:
 	bash bin/build.sh nginx "${DOCKER_REPOSITORY}/nginx" "${DOCKER_TAG_LATEST}"
 
+webdevops/nginx-dev:
+	bash bin/build.sh nginx-dev "${DOCKER_REPOSITORY}/nginx-dev" "${DOCKER_TAG_LATEST}"
+
 webdevops/php-apache:
 	bash bin/build.sh php-apache "${DOCKER_REPOSITORY}/php-apache" "${DOCKER_TAG_LATEST}"
 
diff --git a/bin/provision.sh b/bin/provision.sh
index ef6625ed2..398674ff7 100755
--- a/bin/provision.sh
+++ b/bin/provision.sh
@@ -254,6 +254,13 @@ function header() {
     deployConfiguration apache/alpine   apache  'alpine-*'
 }
 
+## Build apache-dev
+[[ $(checkBuildTarget apache-dev) ]] && {
+    header "apache-dev"
+    clearConfiguration  apache-dev '*'
+    deployConfiguration apache-dev/general  apache-dev  '*'
+}
+
 ## Build nginx
 [[ $(checkBuildTarget nginx) ]] && {
     header "nginx"
@@ -263,6 +270,13 @@ function header() {
     deployConfiguration nginx/alpine   nginx  'alpine-*'
 }
 
+## Build nginx-dev
+[[ $(checkBuildTarget nginx) ]] && {
+    header "nginx-dev"
+    clearConfiguration  nginx-dev '*'
+    deployConfiguration nginx-dev/general  nginx-dev  '*'
+}
+
 ## Build hhvm
 [[ $(checkBuildTarget hhvm) ]] && {
     header "hhvm"
@@ -338,6 +352,7 @@ function header() {
     deployConfiguration apache/alpine       php-apache-dev  'alpine-*'
     deployConfiguration php-apache/general  php-apache-dev  '*'
     deployConfiguration php-dev/general     php-apache-dev  '*'
+    deployConfiguration apache-dev/general  php-apache-dev  '*'
 }
 
 ## Build php-nginx-dev
@@ -349,6 +364,7 @@ function header() {
     deployConfiguration nginx/alpine       php-nginx-dev  'alpine-*'
     deployConfiguration php-nginx/general  php-nginx-dev  '*'
     deployConfiguration php-dev/general    php-nginx-dev  '*'
+    deployConfiguration nginx-dev/general  php-nginx-dev '*'
 }
 
 ## Build postfix
diff --git a/docker/apache-dev/README.md b/docker/apache-dev/README.md
new file mode 100644
index 000000000..a69490f05
--- /dev/null
+++ b/docker/apache-dev/README.md
@@ -0,0 +1,44 @@
+# Apache webserver Docker container
+
+Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/)
+
+## Environment variables
+
+Variable               | Description
+---------------------- | ------------------------------------------------------------------------------
+`CLI_SCRIPT`           | Predefined CLI script for service
+`APPLICATION_UID`      | PHP-FPM UID (Effective user ID)
+`APPLICATION_GID`      | PHP-FPM GID (Effective group ID)
+`WEB_DOCUMENT_ROOT`    | Document root for Apache HTTPD
+`WEB_DOCUMENT_INDEX`   | Document index (eg. `index.php`) for Apache HTTPD
+`WEB_ALIAS_DOMAIN`     | Alias domains (eg. `*.vm`) for Apache HTTPD
+
+## Filesystem layout
+
+Directory                       | Description
+------------------------------- | ------------------------------------------------------------------------------
+`/opt/docker/etc/httpd`         | Apache configuration
+`/opt/docker/etc/httpd/ssl`     | Apache ssl configuration with example server.crt, server.csr, server.key
+
+File                                          | Description
+--------------------------------------------- | ------------------------------------------------------------------------------
+`/opt/docker/etc/httpd/main.conf`             | Main include file (will include `global.conf`, `php.conf` and `vhost.conf`) 
+`/opt/docker/etc/httpd/global.conf`           | Global apache configuration options
+`/opt/docker/etc/httpd/conf.d/*.conf`         | Global apache configuration directory (will be included)
+`/opt/docker/etc/httpd/php.conf`              | PHP configuration (connection to FPM)
+`/opt/docker/etc/httpd/vhost.common.d/*.conf` | Vhost common directory (will be included)
+`/opt/docker/etc/httpd/vhost.conf`            | Default vhost
+`/opt/docker/etc/httpd/vhost.ssl.conf`        | Default ssl configuration for vhost
+
+
+## Container info
+
+Image                               | Info                                                                       
+----------------------------------- | ----------------------------------------------------------------------------------
+webdevops/apache:latest             | [![](https://badge.imagelayers.io/webdevops/apache:latest.svg)](https://imagelayers.io/?images=webdevops/apache:latest 'Get your own badge on imagelayers.io')
+webdevops/apache:ubuntu-14.04       | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-14.04.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-14.04 'Get your own badge on imagelayers.io')
+webdevops/apache:ubuntu-15.04       | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-15.04.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-15.04 'Get your own badge on imagelayers.io')
+webdevops/apache:ubuntu-15.10       | [![](https://badge.imagelayers.io/webdevops/apache:ubuntu-15.10.svg)](https://imagelayers.io/?images=webdevops/apache:ubuntu-15.14 'Get your own badge on imagelayers.io')
+webdevops/apache:centos-7           | [![](https://badge.imagelayers.io/webdevops/apache:centos-7.svg)](https://imagelayers.io/?images=webdevops/apache:centos-7 'Get your own badge on imagelayers.io')
+webdevops/apache:debian-7           | [![](https://badge.imagelayers.io/webdevops/apache:debian-7.svg)](https://imagelayers.io/?images=webdevops/apache:debian-7 'Get your own badge on imagelayers.io')
+webdevops/apache:debian-8           | [![](https://badge.imagelayers.io/webdevops/apache:debian-8.svg)](https://imagelayers.io/?images=webdevops/apache:debian-8 'Get your own badge on imagelayers.io')
diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile
new file mode 100644
index 000000000..5dcb18499
--- /dev/null
+++ b/docker/apache-dev/alpine-3/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:alpine-3
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:alpine-3
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/apache-dev/alpine-3/Dockerfile.jinja2 b/docker/apache-dev/alpine-3/Dockerfile.jinja2
new file mode 100644
index 000000000..4f8c82060
--- /dev/null
+++ b/docker/apache-dev/alpine-3/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("apache", "alpine-3") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh
similarity index 100%
rename from docker/php-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh
rename to docker/apache-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh
diff --git a/docker/php-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf
rename to docker/apache-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep
diff --git a/docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf
rename to docker/apache-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile
new file mode 100644
index 000000000..91fcbc1b9
--- /dev/null
+++ b/docker/apache-dev/centos-7/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:centos-7
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:centos-7
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/apache-dev/centos-7/Dockerfile.jinja2 b/docker/apache-dev/centos-7/Dockerfile.jinja2
new file mode 100644
index 000000000..2df2e82e9
--- /dev/null
+++ b/docker/apache-dev/centos-7/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("apache", "centos-7") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh
similarity index 100%
rename from docker/php-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh
rename to docker/apache-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh
diff --git a/docker/php-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf
rename to docker/apache-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep
diff --git a/docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf
rename to docker/apache-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile
new file mode 100644
index 000000000..d773f5322
--- /dev/null
+++ b/docker/apache-dev/debian-7/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:debian-7
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:debian-7
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/apache-dev/debian-7/Dockerfile.jinja2 b/docker/apache-dev/debian-7/Dockerfile.jinja2
new file mode 100644
index 000000000..170f1fd82
--- /dev/null
+++ b/docker/apache-dev/debian-7/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("apache", "debian-7") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh
similarity index 100%
rename from docker/php-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh
rename to docker/apache-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh
diff --git a/docker/php-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf
rename to docker/apache-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep
diff --git a/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf
rename to docker/apache-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile
new file mode 100644
index 000000000..a325ec229
--- /dev/null
+++ b/docker/apache-dev/debian-8/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:debian-8
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:debian-8
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/apache-dev/debian-8/Dockerfile.jinja2 b/docker/apache-dev/debian-8/Dockerfile.jinja2
new file mode 100644
index 000000000..417d75e1e
--- /dev/null
+++ b/docker/apache-dev/debian-8/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("apache", "debian-8") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh
similarity index 100%
rename from docker/php-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh
rename to docker/apache-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh
diff --git a/docker/php-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf
rename to docker/apache-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep
diff --git a/docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf
rename to docker/apache-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile
new file mode 100644
index 000000000..7d1008341
--- /dev/null
+++ b/docker/apache-dev/debian-9/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:debian-9
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:debian-9
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/apache-dev/debian-9/Dockerfile.jinja2 b/docker/apache-dev/debian-9/Dockerfile.jinja2
new file mode 100644
index 000000000..703871b7e
--- /dev/null
+++ b/docker/apache-dev/debian-9/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("apache", "debian-9") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh
similarity index 100%
rename from docker/php-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh
rename to docker/apache-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh
diff --git a/docker/php-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf
rename to docker/apache-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep
diff --git a/docker/php-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf
rename to docker/apache-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile
new file mode 100644
index 000000000..5f160e141
--- /dev/null
+++ b/docker/apache-dev/ubuntu-12.04/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:ubuntu-12.04
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:ubuntu-12.04
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2
new file mode 100644
index 000000000..1ebf21f16
--- /dev/null
+++ b/docker/apache-dev/ubuntu-12.04/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("apache", "ubuntu-12.04") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh
similarity index 100%
rename from docker/php-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh
rename to docker/apache-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh
diff --git a/docker/php-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf
rename to docker/apache-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep
diff --git a/docker/php-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf
rename to docker/apache-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile
new file mode 100644
index 000000000..716e1901e
--- /dev/null
+++ b/docker/apache-dev/ubuntu-14.04/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:ubuntu-14.04
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:ubuntu-14.04
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2
new file mode 100644
index 000000000..640029ebe
--- /dev/null
+++ b/docker/apache-dev/ubuntu-14.04/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("apache", "ubuntu-14.04") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh
similarity index 100%
rename from docker/php-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh
rename to docker/apache-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh
diff --git a/docker/php-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf
rename to docker/apache-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep
diff --git a/docker/php-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf
rename to docker/apache-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile
new file mode 100644
index 000000000..d1d2024e3
--- /dev/null
+++ b/docker/apache-dev/ubuntu-15.04/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:ubuntu-15.04
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:ubuntu-15.04
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2
new file mode 100644
index 000000000..9dc653089
--- /dev/null
+++ b/docker/apache-dev/ubuntu-15.04/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("apache", "ubuntu-15.04") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh
similarity index 100%
rename from docker/php-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh
rename to docker/apache-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh
diff --git a/docker/php-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf
rename to docker/apache-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep
diff --git a/docker/php-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf
rename to docker/apache-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile
new file mode 100644
index 000000000..1b095f809
--- /dev/null
+++ b/docker/apache-dev/ubuntu-15.10/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:ubuntu-15.10
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:ubuntu-15.10
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2
new file mode 100644
index 000000000..20742a279
--- /dev/null
+++ b/docker/apache-dev/ubuntu-15.10/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("apache", "ubuntu-15.10") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh
similarity index 100%
rename from docker/php-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh
rename to docker/apache-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh
diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf
rename to docker/apache-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep
diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf
rename to docker/apache-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile
new file mode 100644
index 000000000..934514e8e
--- /dev/null
+++ b/docker/apache-dev/ubuntu-16.04/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/apache-dev:ubuntu-16.04
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/apache:ubuntu-16.04
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2
new file mode 100644
index 000000000..248fcb5ad
--- /dev/null
+++ b/docker/apache-dev/ubuntu-16.04/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("apache", "ubuntu-16.04") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ apachedev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh
similarity index 100%
rename from docker/php-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh
rename to docker/apache-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh
diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf
rename to docker/apache-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep
diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf
rename to docker/apache-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/nginx-dev/README.md b/docker/nginx-dev/README.md
new file mode 100644
index 000000000..5e192e900
--- /dev/null
+++ b/docker/nginx-dev/README.md
@@ -0,0 +1,55 @@
+# Nginx webserver Docker container
+
+Automated build and tested by [WebDevOps Build Server](https://build.webdevops.io/)
+
+Container                           | Distribution name                                                                 
+----------------------------------- | -------------------
+`webdevops/nginx:ubuntu-12.04`      | precise            
+`webdevops/nginx:ubuntu-14.04`      | trusty (LTS)       
+`webdevops/nginx:ubuntu-15.04`      | vivid              
+`webdevops/nginx:ubuntu-15.10`      | wily               
+`webdevops/nginx:debian-7`          | wheezy            
+`webdevops/nginx:debian-8`          | jessie            
+`webdevops/nginx:centos-7`          |                    
+
+
+## Environment variables
+
+Variable               | Description
+---------------------- | ------------------------------------------------------------------------------
+`CLI_SCRIPT`           | Predefined CLI script for service
+`APPLICATION_UID`      | PHP-FPM UID (Effective user ID)
+`APPLICATION_GID`      | PHP-FPM GID (Effective group ID)
+`WEB_DOCUMENT_ROOT`    | Document root for Nginx
+`WEB_DOCUMENT_INDEX`   | Document index (eg. `index.php`) for Nginx
+`WEB_ALIAS_DOMAIN`     | Alias domains (eg. `*.vm`) for Nginx
+
+## Filesystem layout
+
+Directory                       | Description
+------------------------------- | ------------------------------------------------------------------------------
+`/opt/docker/etc/nginx`         | Nginx configuration
+`/opt/docker/etc/nginx/ssl`     | Nginx ssl configuration with example server.crt, server.csr, server.key
+
+File                                          | Description
+--------------------------------------------- | ------------------------------------------------------------------------------
+`/opt/docker/etc/nginx/main.conf`             | Main include file (will include `global.conf`, `php.conf` and `vhost.conf`) 
+`/opt/docker/etc/nginx/global.conf`           | Global nginx configuration options
+`/opt/docker/etc/nginx/conf.d/*.conf`         | Global apache configuration directory (will be included)
+`/opt/docker/etc/nginx/php.conf`              | PHP configuration (connection to FPM)
+`/opt/docker/etc/httpd/vhost.common.d/*.conf` | Vhost common directory (will be included)
+`/opt/docker/etc/nginx/vhost.conf`            | Default vhost
+`/opt/docker/etc/nginx/vhost.ssl.conf`        | Default ssl configuration for vhost
+
+
+## Container info
+
+Image                               | Info                                                                       
+----------------------------------- | ----------------------------------------------------------------------------------
+webdevops/nginx:latest              | [![](https://badge.imagelayers.io/webdevops/nginx:latest.svg)](https://imagelayers.io/?images=webdevops/nginx:latest 'Get your own badge on imagelayers.io')
+webdevops/nginx:ubuntu-14.04        | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-14.04.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-14.04 'Get your own badge on imagelayers.io')
+webdevops/nginx:ubuntu-15.04        | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-15.04.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-15.04 'Get your own badge on imagelayers.io')
+webdevops/nginx:ubuntu-15.10        | [![](https://badge.imagelayers.io/webdevops/nginx:ubuntu-15.10.svg)](https://imagelayers.io/?images=webdevops/nginx:ubuntu-15.14 'Get your own badge on imagelayers.io')
+webdevops/nginx:centos-7            | [![](https://badge.imagelayers.io/webdevops/nginx:centos-7.svg)](https://imagelayers.io/?images=webdevops/nginx:centos-7 'Get your own badge on imagelayers.io')
+webdevops/nginx:debian-7            | [![](https://badge.imagelayers.io/webdevops/nginx:debian-7.svg)](https://imagelayers.io/?images=webdevops/nginx:debian-7 'Get your own badge on imagelayers.io')
+webdevops/nginx:debian-8            | [![](https://badge.imagelayers.io/webdevops/nginx:debian-8.svg)](https://imagelayers.io/?images=webdevops/nginx:debian-8 'Get your own badge on imagelayers.io')
diff --git a/docker/nginx-dev/alpine-3/Dockerfile b/docker/nginx-dev/alpine-3/Dockerfile
new file mode 100644
index 000000000..303dd8b10
--- /dev/null
+++ b/docker/nginx-dev/alpine-3/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/nginx-dev:alpine-3
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/nginx:alpine-3
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/nginx-dev/alpine-3/Dockerfile.jinja2 b/docker/nginx-dev/alpine-3/Dockerfile.jinja2
new file mode 100644
index 000000000..344d02a74
--- /dev/null
+++ b/docker/nginx-dev/alpine-3/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("nginx", "alpine-3") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ nginxdev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh
similarity index 100%
rename from docker/php-apache-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh
rename to docker/nginx-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/conf.d/02-dev.conf
rename to docker/nginx-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf
rename to docker/nginx-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
similarity index 52%
rename from docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
rename to docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
index de7e76c72..3e783736c 100644
--- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ b/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -1,4 +1,3 @@
 ---
 
 - include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile
new file mode 100644
index 000000000..f3deb5ae9
--- /dev/null
+++ b/docker/nginx-dev/centos-7/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/nginx-dev:centos-7
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/nginx:centos-7
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/nginx-dev/centos-7/Dockerfile.jinja2 b/docker/nginx-dev/centos-7/Dockerfile.jinja2
new file mode 100644
index 000000000..8cb9dab6c
--- /dev/null
+++ b/docker/nginx-dev/centos-7/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("nginx", "centos-7") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ nginxdev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh
similarity index 100%
rename from docker/php-apache-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh
rename to docker/nginx-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh
diff --git a/docker/php-apache-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf
rename to docker/nginx-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep
diff --git a/docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf
rename to docker/nginx-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
similarity index 52%
rename from docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
rename to docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
index de7e76c72..3e783736c 100644
--- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ b/docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -1,4 +1,3 @@
 ---
 
 - include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile
new file mode 100644
index 000000000..e9678fd46
--- /dev/null
+++ b/docker/nginx-dev/debian-7/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/nginx-dev:debian-7
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/nginx:debian-7
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/nginx-dev/debian-7/Dockerfile.jinja2 b/docker/nginx-dev/debian-7/Dockerfile.jinja2
new file mode 100644
index 000000000..9709b08fb
--- /dev/null
+++ b/docker/nginx-dev/debian-7/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("nginx", "debian-7") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ nginxdev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh
similarity index 100%
rename from docker/php-apache-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh
rename to docker/nginx-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh
diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf
rename to docker/nginx-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep
diff --git a/docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf
rename to docker/nginx-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
similarity index 52%
rename from docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
rename to docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
index de7e76c72..3e783736c 100644
--- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ b/docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -1,4 +1,3 @@
 ---
 
 - include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile
new file mode 100644
index 000000000..3f29f7a84
--- /dev/null
+++ b/docker/nginx-dev/debian-8/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/nginx-dev:debian-8
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/nginx:debian-8
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/nginx-dev/debian-8/Dockerfile.jinja2 b/docker/nginx-dev/debian-8/Dockerfile.jinja2
new file mode 100644
index 000000000..363713e03
--- /dev/null
+++ b/docker/nginx-dev/debian-8/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("nginx", "debian-8") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ nginxdev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh
similarity index 100%
rename from docker/php-apache-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh
rename to docker/nginx-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh
diff --git a/docker/php-apache-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf
rename to docker/nginx-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf
diff --git a/docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep
rename to docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep
diff --git a/docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf
rename to docker/nginx-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
similarity index 52%
rename from docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
rename to docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
index de7e76c72..3e783736c 100644
--- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ b/docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -1,4 +1,3 @@
 ---
 
 - include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile
new file mode 100644
index 000000000..137261800
--- /dev/null
+++ b/docker/nginx-dev/debian-9/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/nginx-dev:debian-9
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/nginx:debian-9
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/nginx-dev/debian-9/Dockerfile.jinja2 b/docker/nginx-dev/debian-9/Dockerfile.jinja2
new file mode 100644
index 000000000..144cd8143
--- /dev/null
+++ b/docker/nginx-dev/debian-9/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("nginx", "debian-9") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ nginxdev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh
similarity index 100%
rename from docker/php-apache-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh
rename to docker/nginx-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh
diff --git a/docker/php-apache-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf
rename to docker/nginx-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf
diff --git a/docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep
diff --git a/docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf
rename to docker/nginx-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile
new file mode 100644
index 000000000..71419adf9
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/nginx-dev:ubuntu-12.04
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/nginx:ubuntu-12.04
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2
new file mode 100644
index 000000000..33f2d2bb2
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("nginx", "ubuntu-12.04") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ nginxdev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh
similarity index 100%
rename from docker/php-apache-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh
rename to docker/nginx-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh
diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf
rename to docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf
diff --git a/docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep
rename to docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep
diff --git a/docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf
rename to docker/nginx-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile
new file mode 100644
index 000000000..524f9bf26
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/nginx-dev:ubuntu-14.04
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/nginx:ubuntu-14.04
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2
new file mode 100644
index 000000000..fa47fee73
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("nginx", "ubuntu-14.04") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ nginxdev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh
similarity index 100%
rename from docker/php-apache-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh
rename to docker/nginx-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh
diff --git a/docker/php-apache-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf
rename to docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf
diff --git a/docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep
diff --git a/docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf
rename to docker/nginx-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile
new file mode 100644
index 000000000..c383bafc7
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/nginx-dev:ubuntu-15.04
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/nginx:ubuntu-15.04
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2
new file mode 100644
index 000000000..a787e39b1
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("nginx", "ubuntu-15.04") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ nginxdev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh
similarity index 100%
rename from docker/php-apache-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh
rename to docker/nginx-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh
diff --git a/docker/php-apache-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf
rename to docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf
diff --git a/docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep
rename to docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep
diff --git a/docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf
rename to docker/nginx-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile
new file mode 100644
index 000000000..68f1072d9
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/nginx-dev:ubuntu-15.10
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/nginx:ubuntu-15.10
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2
new file mode 100644
index 000000000..8a1395919
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("nginx", "ubuntu-15.10") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ nginxdev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh
similarity index 100%
rename from docker/php-apache-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh
rename to docker/nginx-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf
rename to docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf
diff --git a/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/.gitkeep
rename to docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf
rename to docker/nginx-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile
new file mode 100644
index 000000000..06c219535
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile
@@ -0,0 +1,25 @@
+#+++++++++++++++++++++++++++++++++++++++
+# Dockerfile for webdevops/nginx-dev:ubuntu-16.04
+#    -- automatically generated  --
+#+++++++++++++++++++++++++++++++++++++++
+
+FROM webdevops/nginx:ubuntu-16.04
+
+MAINTAINER info@webdevops.io
+LABEL vendor=WebDevOps.io
+LABEL io.webdevops.layout=8
+LABEL io.webdevops.version=0.52.0
+
+ENV WEB_DOCUMENT_ROOT  /app
+ENV WEB_DOCUMENT_INDEX index.php
+ENV WEB_ALIAS_DOMAIN   *.vm
+
+COPY conf/ /opt/docker/
+
+# Install apache
+RUN echo \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx-dev \
+    && /opt/docker/bin/bootstrap.sh
+
+
+EXPOSE 80 443
diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2
new file mode 100644
index 000000000..e667c951d
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile.jinja2
@@ -0,0 +1,11 @@
+{{ docker.from("nginx", "ubuntu-16.04") }}
+
+{{ docker.version() }}
+
+{{ environment.web() }}
+
+{{ docker.copy('conf/', '/opt/docker/') }}
+
+{{ nginxdev.general() }}
+
+{{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh
similarity index 100%
rename from docker/php-apache-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh
rename to docker/nginx-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf
rename to docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf
diff --git a/docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep
rename to docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf
rename to docker/nginx-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile
index c73af9478..7023fea69 100644
--- a/docker/php-apache-dev/alpine-3-php7/Dockerfile
+++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile
@@ -28,7 +28,7 @@ RUN /usr/local/bin/apk-install \
 		s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
 		s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
 		' /etc/apache2/httpd.conf \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2
index bd51f1683..15cae3af1 100644
--- a/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2
+++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.alpine('php-apache php-apache-dev') }}
+{{ apache.alpine('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine-3/Dockerfile
index e059ad224..ccabe7df3 100644
--- a/docker/php-apache-dev/alpine-3/Dockerfile
+++ b/docker/php-apache-dev/alpine-3/Dockerfile
@@ -28,7 +28,7 @@ RUN /usr/local/bin/apk-install \
 		s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
 		s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
 		' /etc/apache2/httpd.conf \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/alpine-3/Dockerfile.jinja2 b/docker/php-apache-dev/alpine-3/Dockerfile.jinja2
index f9ed8c68c..ad3887881 100644
--- a/docker/php-apache-dev/alpine-3/Dockerfile.jinja2
+++ b/docker/php-apache-dev/alpine-3/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.alpine('php-apache php-apache-dev') }}
+{{ apache.alpine('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile
index b2695ed82..7d5e3b760 100644
--- a/docker/php-apache-dev/centos-7-php56/Dockerfile
+++ b/docker/php-apache-dev/centos-7-php56/Dockerfile
@@ -26,7 +26,7 @@ RUN /usr/local/bin/yum-install \
 		s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
 		s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
 		' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2
index 151a772da..af1a8b55f 100644
--- a/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2
+++ b/docker/php-apache-dev/centos-7-php56/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.centos('php-apache php-apache-dev') }}
+{{ apache.centos('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile
index 66a6ec2ba..1a81d04b9 100644
--- a/docker/php-apache-dev/centos-7/Dockerfile
+++ b/docker/php-apache-dev/centos-7/Dockerfile
@@ -26,7 +26,7 @@ RUN /usr/local/bin/yum-install \
 		s!^(\s*CustomLog)\s+\S+!\1 /proc/self/fd/1!g; \
 		s!^(\s*ErrorLog)\s+\S+!\1 /proc/self/fd/2!g; \
 		' /etc/httpd/conf/httpd.conf /etc/httpd/conf.d/ssl.conf \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/centos-7/Dockerfile.jinja2 b/docker/php-apache-dev/centos-7/Dockerfile.jinja2
index a2353ffca..2664b8a7f 100644
--- a/docker/php-apache-dev/centos-7/Dockerfile.jinja2
+++ b/docker/php-apache-dev/centos-7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.centos('php-apache php-apache-dev') }}
+{{ apache.centos('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile
index 9b94a5aea..e6d9e0b24 100644
--- a/docker/php-apache-dev/debian-7/Dockerfile
+++ b/docker/php-apache-dev/debian-7/Dockerfile
@@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \
 		' /etc/apache2/apache2.conf \
 	&& rm -f /etc/apache2/sites-enabled/* \
 	&& a2enmod actions fastcgi ssl rewrite headers expires \
-	&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+	&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/debian-7/Dockerfile.jinja2 b/docker/php-apache-dev/debian-7/Dockerfile.jinja2
index 1fedec9f2..0d1962b46 100644
--- a/docker/php-apache-dev/debian-7/Dockerfile.jinja2
+++ b/docker/php-apache-dev/debian-7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.debian8('php-apache php-apache-dev') }}
+{{ apache.debian8('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile
index eadb943cb..6bfb3cadc 100644
--- a/docker/php-apache-dev/debian-8-php7/Dockerfile
+++ b/docker/php-apache-dev/debian-8-php7/Dockerfile
@@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \
 		' /etc/apache2/apache2.conf \
 	&& rm -f /etc/apache2/sites-enabled/* \
 	&& a2enmod actions fastcgi ssl rewrite headers expires \
-	&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+	&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2
index dc9a56563..7a5665dfe 100644
--- a/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2
+++ b/docker/php-apache-dev/debian-8-php7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.debian8('php-apache php-apache-dev') }}
+{{ apache.debian8('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile
index cfec5af47..6757389e9 100644
--- a/docker/php-apache-dev/debian-8/Dockerfile
+++ b/docker/php-apache-dev/debian-8/Dockerfile
@@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \
 		' /etc/apache2/apache2.conf \
 	&& rm -f /etc/apache2/sites-enabled/* \
 	&& a2enmod actions fastcgi ssl rewrite headers expires \
-	&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+	&& /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/debian-8/Dockerfile.jinja2 b/docker/php-apache-dev/debian-8/Dockerfile.jinja2
index 00d798e30..a10176230 100644
--- a/docker/php-apache-dev/debian-8/Dockerfile.jinja2
+++ b/docker/php-apache-dev/debian-8/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.debian8('php-apache php-apache-dev') }}
+{{ apache.debian8('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile
index 5cdd4c515..97a0a147f 100644
--- a/docker/php-apache-dev/debian-9/Dockerfile
+++ b/docker/php-apache-dev/debian-9/Dockerfile
@@ -28,7 +28,7 @@ RUN /usr/local/bin/apt-install \
 		' /etc/apache2/apache2.conf \
 	&& rm -f /etc/apache2/sites-enabled/* \
 	&& a2enmod actions fastcgi ssl rewrite headers expires \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/debian-9/Dockerfile.jinja2 b/docker/php-apache-dev/debian-9/Dockerfile.jinja2
index d9612680c..8022b5217 100644
--- a/docker/php-apache-dev/debian-9/Dockerfile.jinja2
+++ b/docker/php-apache-dev/debian-9/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.debian9('php-apache php-apache-dev') }}
+{{ apache.debian9('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile
index 61c095087..f0a28b25a 100644
--- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile
+++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile
@@ -30,7 +30,7 @@ RUN /usr/local/bin/apt-install \
 	&& rm -f /etc/apache2/sites-enabled/* \
 	&& a2enmod actions fastcgi ssl rewrite headers version expires \
 	&& mkdir -p /var/lock/apache2 \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2
index a116dbe32..eba51bb0d 100644
--- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2
+++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.ubuntu12('php-apache php-apache-dev') }}
+{{ apache.ubuntu12('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile
index 7c391536c..61f306dd8 100644
--- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile
+++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile
@@ -30,7 +30,7 @@ RUN /usr/local/bin/apt-install \
 	&& rm -f /etc/apache2/sites-enabled/* \
 	&& a2enmod actions fastcgi ssl rewrite headers expires \
 	&& mkdir -p /var/lock/apache2 \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2
index c00ac58d4..380fe27fd 100644
--- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2
+++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.ubuntu14('php-apache php-apache-dev') }}
+{{ apache.ubuntu14('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile
index 156540630..aaaed9e93 100644
--- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile
+++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile
@@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \
 	&& rm -f /etc/apache2/sites-enabled/* \
 	&& ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \
 	&& a2enmod actions fastcgi ssl rewrite headers expires \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2
index 3fba515c0..13ad3a716 100644
--- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2
+++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.ubuntu15('php-apache php-apache-dev') }}
+{{ apache.ubuntu15('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile
index ad169a3c2..5e96d6f7a 100644
--- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile
+++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile
@@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \
 	&& rm -f /etc/apache2/sites-enabled/* \
 	&& ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \
 	&& a2enmod actions fastcgi ssl rewrite headers expires \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2
index eb20bbf9c..9e87a8712 100644
--- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2
+++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.ubuntu16('php-apache php-apache-dev') }}
+{{ apache.ubuntu16('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-apache-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-apache-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile
index eb299d16e..ee6a5a232 100644
--- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile
+++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile
@@ -29,7 +29,7 @@ RUN /usr/local/bin/apt-install \
 	&& rm -f /etc/apache2/sites-enabled/* \
 	&& ln -sf /opt/docker/etc/httpd/main.conf /etc/apache2/sites-enabled/10-docker.conf \
 	&& a2enmod actions fastcgi ssl rewrite headers expires \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-php-apache-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-apache --role webdevops-php-apache --role webdevops-apache-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2
index d39068333..80d1e45f2 100644
--- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2
+++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ apache.ubuntu16('php-apache php-apache-dev') }}
+{{ apache.ubuntu16('php-apache apache-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-apache-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-apache-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/alpine-3-php7/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/alpine-3-php7/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/alpine-3-php7/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/alpine-3-php7/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/alpine-3-php7/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/alpine-3/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/alpine-3/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/alpine-3/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/centos-7-php56/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/centos-7-php56/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/centos-7-php56/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/centos-7/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/centos-7/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/debian-7/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/debian-7/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/debian-7/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/debian-8-php7/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/debian-8-php7/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/debian-8-php7/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/debian-8/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/debian-8/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/debian-8/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/debian-9/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/debian-9/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/debian-9/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/ubuntu-12.04/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/ubuntu-12.04/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/ubuntu-12.04/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/ubuntu-14.04/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/ubuntu-14.04/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/ubuntu-14.04/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh b/docker/php-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf b/docker/php-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep b/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile
index 606f5a78f..e34f744ca 100644
--- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile
+++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install nginx
 RUN /usr/local/bin/apk-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2
index e062086a1..27cd51b68 100644
--- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.alpine('php-nginx php-nginx-dev') }}
+{{ nginx.alpine('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/alpine-3-php7/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/alpine-3-php7/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile
index 8605ac465..f67b6060f 100644
--- a/docker/php-nginx-dev/alpine-3/Dockerfile
+++ b/docker/php-nginx-dev/alpine-3/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install nginx
 RUN /usr/local/bin/apk-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2 b/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2
index 5fb85a652..2df7f1460 100644
--- a/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/alpine-3/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.alpine('php-nginx php-nginx-dev') }}
+{{ nginx.alpine('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/alpine-3/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/alpine-3/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/alpine-3/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile
index ffecae252..12ac4abe2 100644
--- a/docker/php-nginx-dev/centos-7-php56/Dockerfile
+++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install tools
 RUN /usr/local/bin/yum-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2
index d144187cc..9d535c69f 100644
--- a/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.centos('php-nginx php-nginx-dev') }}
+{{ nginx.centos('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/centos-7-php56/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/centos-7-php56/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-apache-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile
index e570d3f29..b724bbcf6 100644
--- a/docker/php-nginx-dev/centos-7/Dockerfile
+++ b/docker/php-nginx-dev/centos-7/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install tools
 RUN /usr/local/bin/yum-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2 b/docker/php-nginx-dev/centos-7/Dockerfile.jinja2
index 8a07aa3fa..3a9fa481e 100644
--- a/docker/php-nginx-dev/centos-7/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/centos-7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.centos('php-nginx php-nginx-dev') }}
+{{ nginx.centos('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/centos-7/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/centos-7/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/centos-7/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-dev/alpine-3-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile
index 24c4b9a0f..82bb789ba 100644
--- a/docker/php-nginx-dev/debian-7/Dockerfile
+++ b/docker/php-nginx-dev/debian-7/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install nginx
 RUN /usr/local/bin/apt-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-7/Dockerfile.jinja2
index e5e71298c..7d0cd668a 100644
--- a/docker/php-nginx-dev/debian-7/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/debian-7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.debian('php-nginx php-nginx-dev') }}
+{{ nginx.debian('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/debian-7/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/debian-7/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/debian-7/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-dev/alpine-3/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile
index d0ff3efbf..4d73a7f3e 100644
--- a/docker/php-nginx-dev/debian-8-php7/Dockerfile
+++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install nginx
 RUN /usr/local/bin/apt-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2
index 0bf81dfb7..1bf5b7799 100644
--- a/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.debian('php-nginx php-nginx-dev') }}
+{{ nginx.debian('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/debian-8-php7/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/debian-8-php7/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-dev/centos-7-php56/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile
index 090902422..c1e6efa26 100644
--- a/docker/php-nginx-dev/debian-8/Dockerfile
+++ b/docker/php-nginx-dev/debian-8/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install nginx
 RUN /usr/local/bin/apt-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-8/Dockerfile.jinja2
index ce643a693..edac4ecfb 100644
--- a/docker/php-nginx-dev/debian-8/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/debian-8/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.debian('php-nginx php-nginx-dev') }}
+{{ nginx.debian('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/debian-8/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/debian-8/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/debian-8/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-dev/centos-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile
index e24faf6b1..ca5b5e8ac 100644
--- a/docker/php-nginx-dev/debian-9/Dockerfile
+++ b/docker/php-nginx-dev/debian-9/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install nginx
 RUN /usr/local/bin/apt-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2 b/docker/php-nginx-dev/debian-9/Dockerfile.jinja2
index 6c09b612b..cc082226b 100644
--- a/docker/php-nginx-dev/debian-9/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/debian-9/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.debian('php-nginx php-nginx-dev') }}
+{{ nginx.debian('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/debian-9/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/debian-9/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/debian-9/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-dev/debian-7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile
index 57f80a42f..b5e7930dc 100644
--- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile
+++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install nginx
 RUN /usr/local/bin/apt-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2
index 01d7cc434..db8fbf89d 100644
--- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.ubuntu('php-nginx php-nginx-dev') }}
+{{ nginx.ubuntu('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-dev/debian-8-php7/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile
index 7a92237d4..c22b962e4 100644
--- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile
+++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install nginx
 RUN /usr/local/bin/apt-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2
index 8ba962027..89a6f2df1 100644
--- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.ubuntu('php-nginx php-nginx-dev') }}
+{{ nginx.ubuntu('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-dev/debian-8/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile
index 77c1df42b..ea183986e 100644
--- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile
+++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install nginx
 RUN /usr/local/bin/apt-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2
index 5bb91375e..e031bcae2 100644
--- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.ubuntu('php-nginx php-nginx-dev') }}
+{{ nginx.ubuntu('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-dev/debian-9/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile
index ac2e1b0b3..14d6c9f17 100644
--- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile
+++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install nginx
 RUN /usr/local/bin/apt-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2
index db007f921..9e2e811f8 100644
--- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.ubuntu('php-nginx php-nginx-dev') }}
+{{ nginx.ubuntu('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-dev/ubuntu-12.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/ubuntu-15.10/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile
index 03a7ff370..0134c1e81 100644
--- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile
+++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile
@@ -21,7 +21,7 @@ COPY conf/ /opt/docker/
 # Install nginx
 RUN /usr/local/bin/apt-install \
         nginx \
-    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-php-nginx-dev \
+    && /opt/docker/bin/provision run --tag bootstrap --role webdevops-nginx --role webdevops-php-nginx --role webdevops-nginx-dev \
     && /opt/docker/bin/bootstrap.sh
 
 
diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2 b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2
index 50f8b08a7..db07f583a 100644
--- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2
+++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile.jinja2
@@ -8,6 +8,6 @@
 
 {{ docker.copy('conf/', '/opt/docker/') }}
 
-{{ nginx.ubuntu('php-nginx php-nginx-dev') }}
+{{ nginx.ubuntu('php-nginx nginx-dev') }}
 
 {{ docker.expose('80 443') }}
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh b/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/ubuntu-14.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/docker/php-nginx-dev/ubuntu-16.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/docker/php-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh b/provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh
similarity index 100%
rename from docker/php-dev/ubuntu-15.04/conf/bin/service.d/httpd.d/12-development.sh
rename to provisioning/apache-dev/general/bin/service.d/httpd.d/12-development.sh
diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf b/provisioning/apache-dev/general/etc/httpd/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/ubuntu-15.04/conf/etc/httpd/conf.d/02-dev.conf
rename to provisioning/apache-dev/general/etc/httpd/conf.d/02-dev.conf
diff --git a/docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep b/provisioning/apache-dev/general/etc/httpd/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-dev/centos-7/conf/etc/nginx/vhost.common.d/.gitkeep
rename to provisioning/apache-dev/general/etc/httpd/vhost.common.d/.gitkeep
diff --git a/docker/php-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf b/provisioning/apache-dev/general/etc/httpd/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-dev/ubuntu-15.04/conf/etc/httpd/vhost.common.d/02-dev.conf
rename to provisioning/apache-dev/general/etc/httpd/vhost.common.d/02-dev.conf
diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/defaults/main.yml
rename to provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/defaults/main.yml
diff --git a/provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml b/provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..cd21505a4
--- /dev/null
+++ b/provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/tasks/bootstrap.yml
@@ -0,0 +1,2 @@
+---
+
diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-apache-dev/tasks/main.yml
rename to provisioning/apache-dev/general/provision/roles/webdevops-apache-dev/tasks/main.yml
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh b/provisioning/nginx-dev/general/bin/service.d/nginx.d/12-development.sh
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.04/conf/bin/service.d/nginx.d/12-development.sh
rename to provisioning/nginx-dev/general/bin/service.d/nginx.d/12-development.sh
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf b/provisioning/nginx-dev/general/etc/nginx/conf.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/conf.d/02-dev.conf
rename to provisioning/nginx-dev/general/etc/nginx/conf.d/02-dev.conf
diff --git a/docker/php-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep b/provisioning/nginx-dev/general/etc/nginx/vhost.common.d/.gitkeep
similarity index 100%
rename from docker/php-dev/debian-7/conf/etc/httpd/vhost.common.d/.gitkeep
rename to provisioning/nginx-dev/general/etc/nginx/vhost.common.d/.gitkeep
diff --git a/docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf b/provisioning/nginx-dev/general/etc/nginx/vhost.common.d/02-dev.conf
similarity index 100%
rename from docker/php-apache-dev/ubuntu-15.04/conf/etc/nginx/vhost.common.d/02-dev.conf
rename to provisioning/nginx-dev/general/etc/nginx/vhost.common.d/02-dev.conf
diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/defaults/main.yml
similarity index 100%
rename from docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
rename to provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/defaults/main.yml
diff --git a/provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml b/provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
new file mode 100644
index 000000000..3e783736c
--- /dev/null
+++ b/provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/bootstrap.yml
@@ -0,0 +1,3 @@
+---
+
+- include: bootstrap/nginx.yml
diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
similarity index 100%
rename from docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
rename to provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/bootstrap/nginx.yml
diff --git a/docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/main.yml
similarity index 100%
rename from docker/php-dev/ubuntu-15.04/conf/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
rename to provisioning/nginx-dev/general/provision/roles/webdevops-nginx-dev/tasks/main.yml
diff --git a/provisioning/php-dev/general/bin/service.d/httpd.d/12-development.sh b/provisioning/php-dev/general/bin/service.d/httpd.d/12-development.sh
deleted file mode 100644
index a3d69cb39..000000000
--- a/provisioning/php-dev/general/bin/service.d/httpd.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/httpd/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/provisioning/php-dev/general/bin/service.d/nginx.d/12-development.sh b/provisioning/php-dev/general/bin/service.d/nginx.d/12-development.sh
deleted file mode 100644
index f1523ee02..000000000
--- a/provisioning/php-dev/general/bin/service.d/nginx.d/12-development.sh
+++ /dev/null
@@ -1 +0,0 @@
-find /opt/docker/etc/nginx/ -iname '*.conf' -print0 | xargs -0 -r rpl --quiet "<WEB_NO_CACHE_PATTERN>" "$WEB_NO_CACHE_PATTERN"
diff --git a/provisioning/php-dev/general/etc/httpd/conf.d/02-dev.conf b/provisioning/php-dev/general/etc/httpd/conf.d/02-dev.conf
deleted file mode 100644
index 98ffb37d4..000000000
--- a/provisioning/php-dev/general/etc/httpd/conf.d/02-dev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# EnableSendfile: Control whether the sendfile kernel support is
-# used to deliver files (assuming that the OS supports it).
-# The default is on; turn this off if you serve from NFS-mounted
-# filesystems. Please see
-# http://httpd.apache.org/docs/2.2/mod/core.html#enablesendfile
-EnableSendfile off
diff --git a/provisioning/php-dev/general/etc/httpd/vhost.common.d/.gitkeep b/provisioning/php-dev/general/etc/httpd/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/provisioning/php-dev/general/etc/httpd/vhost.common.d/02-dev.conf b/provisioning/php-dev/general/etc/httpd/vhost.common.d/02-dev.conf
deleted file mode 100644
index 54918ec2b..000000000
--- a/provisioning/php-dev/general/etc/httpd/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<FilesMatch "<WEB_NO_CACHE_PATTERN>">
-  FileETag None
-
-  <ifModule mod_headers.c>
-     Header unset ETag
-     Header set Cache-Control "max-age=0, no-cache, no-store, must-revalidate"
-     Header set Pragma "no-cache"
-     Header set Expires "Wed, 11 Jan 1984 05:00:00 GMT"
-  </ifModule>
-</FilesMatch>
diff --git a/provisioning/php-dev/general/etc/nginx/conf.d/02-dev.conf b/provisioning/php-dev/general/etc/nginx/conf.d/02-dev.conf
deleted file mode 100644
index fdffa2a0f..000000000
--- a/provisioning/php-dev/general/etc/nginx/conf.d/02-dev.conf
+++ /dev/null
@@ -1 +0,0 @@
-# placeholder
diff --git a/provisioning/php-dev/general/etc/nginx/vhost.common.d/.gitkeep b/provisioning/php-dev/general/etc/nginx/vhost.common.d/.gitkeep
deleted file mode 100644
index e69de29bb..000000000
diff --git a/provisioning/php-dev/general/etc/nginx/vhost.common.d/02-dev.conf b/provisioning/php-dev/general/etc/nginx/vhost.common.d/02-dev.conf
deleted file mode 100644
index a2b27dece..000000000
--- a/provisioning/php-dev/general/etc/nginx/vhost.common.d/02-dev.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-location ~* <WEB_NO_CACHE_PATTERN> {
-    expires    off;
-    add_header Cache-Control private;
-}
diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/defaults/main.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
deleted file mode 100644
index 580d28c3c..000000000
--- a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-
-- include: bootstrap/php-fpm.yml
diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/main.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/provisioning/php-dev/general/provision/roles/webdevops-php-apache-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/defaults/main.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
deleted file mode 100644
index 81f5b7efd..000000000
--- a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/defaults/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-
-APPLICATION_USER:  "{{ lookup('env','APPLICATION_USER') }}"
-APPLICATION_GROUP: "{{ lookup('env','APPLICATION_GROUP') }}"
-APPLICATION_UID:   "{{ lookup('env','APPLICATION_UID') }}"
-APPLICATION_GID:   "{{ lookup('env','APPLICATION_GID') }}"
diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
deleted file mode 100644
index de7e76c72..000000000
--- a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-
-- include: bootstrap/nginx.yml
-- include: bootstrap/php-fpm.yml
diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
deleted file mode 100644
index 8075b2d9d..000000000
--- a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/nginx.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Disable sendfile for nginx
-  lineinfile:
-    dest:   /etc/nginx/nginx.conf
-    regexp: '[\s;]*{{ item.key }}[\s]*'
-    line:   '{{ item.key }} {{ item.value }};'
-  with_items:
-   - { key: 'sendfile', value: "off" }
diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
deleted file mode 100644
index 947bfcfbb..000000000
--- a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/bootstrap/php-fpm.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-
-- name: Open php-fpm for external connections (eg. debuggers)
-  lineinfile:
-    dest:   '/opt/docker/etc/php/fpm/pool.d/application.conf'
-    regexp: '^[\s;]*{{ item.key }}[\s]*='
-    line:   '{{ item.key }} = {{ item.value }}'
-  with_items:
-   - { key: 'listen', value: "0.0.0.0:9000" }
diff --git a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/main.yml b/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
deleted file mode 100644
index 1806c1a8c..000000000
--- a/provisioning/php-dev/general/provision/roles/webdevops-php-nginx-dev/tasks/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-
-- include: bootstrap.yml
-  tags:
-    - bootstrap
diff --git a/template/Dockerfile/images/apache-dev.jinja2 b/template/Dockerfile/images/apache-dev.jinja2
new file mode 100644
index 000000000..31c788030
--- /dev/null
+++ b/template/Dockerfile/images/apache-dev.jinja2
@@ -0,0 +1,7 @@
+{% import 'Dockerfile/provision.jinja2' as provision %}
+
+{% macro general(role='') -%}
+# Install apache
+RUN echo \
+    {{ provision.runRoleInline('apache-dev', role) }}
+{%- endmacro %}
diff --git a/template/Dockerfile/images/nginx-dev.jinja2 b/template/Dockerfile/images/nginx-dev.jinja2
new file mode 100644
index 000000000..4c92aa67e
--- /dev/null
+++ b/template/Dockerfile/images/nginx-dev.jinja2
@@ -0,0 +1,7 @@
+{% import 'Dockerfile/provision.jinja2' as provision %}
+
+{% macro general(role='') -%}
+# Install apache
+RUN echo \
+    {{ provision.runRoleInline('nginx-dev', role) }}
+{%- endmacro %}
diff --git a/template/Dockerfile/layout.jinja2 b/template/Dockerfile/layout.jinja2
index 0c3023b67..f6527e1bf 100644
--- a/template/Dockerfile/layout.jinja2
+++ b/template/Dockerfile/layout.jinja2
@@ -6,7 +6,9 @@
 {% import 'Dockerfile/images/base.jinja2'               as base %}
 {% import 'Dockerfile/images/baseapp.jinja2'            as baseapp %}
 {% import 'Dockerfile/images/apache.jinja2'             as apache %}
+{% import 'Dockerfile/images/apache-dev.jinja2'         as apachedev %}
 {% import 'Dockerfile/images/nginx.jinja2'              as nginx %}
+{% import 'Dockerfile/images/nginx-dev.jinja2'          as nginxdev %}
 {% import 'Dockerfile/images/hhvm.jinja2'               as hhvm %}
 {% import 'Dockerfile/images/postfix.jinja2'            as postfix %}
 {% import 'Dockerfile/images/mail-sandbox.jinja2'       as mailsandbox %}
diff --git a/test/run.sh b/test/run.sh
index bd6592f0f..ad8bf7e43 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -475,6 +475,34 @@ initEnvironment
     waitForTestRun
 }
 
+#######################################
+# webdevops/apache-dev
+#######################################
+
+[[ $(checkTestTarget apache-dev) ]] && {
+    setupTestEnvironment "apache-dev"
+
+    OS_VERSION="12.04" runTestForTag "ubuntu-12.04"
+    OS_VERSION="14.04" runTestForTag "ubuntu-14.04"
+    OS_VERSION="15.04" runTestForTag "ubuntu-15.04"
+    OS_VERSION="15.10" runTestForTag "ubuntu-15.10"
+    OS_VERSION="16.04" runTestForTag "ubuntu-16.04"
+    OS_VERSION="$DOCKER_TAG_LATEST" runTestForTag "latest"
+
+    setEnvironmentOsFamily "redhat"
+    OS_VERSION="7" runTestForTag "centos-7"
+
+    setEnvironmentOsFamily "debian"
+    OS_VERSION="7" runTestForTag "debian-7"
+    OS_VERSION="8" runTestForTag "debian-8"
+    OS_VERSION="testing" runTestForTag "debian-9"
+
+    setEnvironmentOsFamily "alpine"
+    OS_VERSION="3" runTestForTag "alpine-3"
+
+    waitForTestRun
+}
+
 #######################################
 # webdevops/nginx
 #######################################
@@ -503,6 +531,35 @@ initEnvironment
     waitForTestRun
 }
 
+#######################################
+# webdevops/nginx-dev
+#######################################
+
+[[ $(checkTestTarget nginx-dev) ]] && {
+    setupTestEnvironment "nginx-dev"
+
+    OS_VERSION="12.04" runTestForTag "ubuntu-12.04"
+    OS_VERSION="14.04" runTestForTag "ubuntu-14.04"
+    OS_VERSION="15.04" runTestForTag "ubuntu-15.04"
+    OS_VERSION="15.10" runTestForTag "ubuntu-15.10"
+    OS_VERSION="16.04" runTestForTag "ubuntu-16.04"
+    OS_VERSION="$DOCKER_TAG_LATEST" runTestForTag "latest"
+
+    setEnvironmentOsFamily "redhat"
+    OS_VERSION="7" runTestForTag "centos-7"
+
+    setEnvironmentOsFamily "debian"
+    OS_VERSION="7" runTestForTag "debian-7"
+    OS_VERSION="8" runTestForTag "debian-8"
+    OS_VERSION="testing" runTestForTag "debian-9"
+
+    setEnvironmentOsFamily "alpine"
+    OS_VERSION="3" runTestForTag "alpine-3"
+
+    waitForTestRun
+}
+
+
 #######################################
 # webdevops/php-apache
 #######################################

From 1802fcc74c3ca8469d9efadebd8698d9273d5c32 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Thu, 23 Jun 2016 20:45:31 +0200
Subject: [PATCH 09/13] Update documentation

---
 .../DockerImages/dockerfiles/ansible.rst      |  5 ++++
 .../DockerImages/dockerfiles/apache-dev.rst   | 25 ++++++++++++++++++
 .../DockerImages/dockerfiles/apache.rst       |  4 +--
 .../DockerImages/dockerfiles/base-app.rst     |  6 +++++
 .../content/DockerImages/dockerfiles/base.rst |  6 +++++
 .../DockerImages/dockerfiles/bootstrap.rst    |  5 ++++
 .../include/environment-php-dev.rst           | 13 ++++++++++
 .../include/environment-web-dev.rst           |  2 --
 .../dockerfiles/include/image-tag-base.rst    | 13 ++++++++++
 .../dockerfiles/include/image-tag-php.rst     |  1 +
 .../include/info-web-development.rst          |  1 +
 .../DockerImages/dockerfiles/mail-sandbox.rst |  5 ++++
 .../DockerImages/dockerfiles/nginx-dev.rst    | 26 +++++++++++++++++++
 .../DockerImages/dockerfiles/nginx.rst        |  3 +--
 .../dockerfiles/php-apache-dev.rst            |  3 +--
 .../DockerImages/dockerfiles/php-apache.rst   |  1 -
 .../DockerImages/dockerfiles/php-dev.rst      |  4 +--
 .../dockerfiles/php-nginx-dev.rst             |  3 +--
 .../DockerImages/dockerfiles/php-nginx.rst    |  1 -
 .../content/DockerImages/dockerfiles/php.rst  |  1 -
 .../DockerImages/dockerfiles/postfix.rst      |  6 +++++
 .../DockerImages/dockerfiles/sphinx.rst       |  9 +++++++
 .../content/DockerImages/dockerfiles/ssh.rst  |  9 +++++++
 .../DockerImages/dockerfiles/varnish.rst      | 10 +++++++
 .../DockerImages/dockerfiles/vsftp.rst        | 10 +++++++
 .../docs/content/DockerImages/index.rst       |  2 ++
 documentation/docs/content/FAQ/index.rst      |  6 +++++
 .../docs/content/KnownIssues/index.rst        |  2 +-
 documentation/docs/index.rst                  |  1 +
 29 files changed, 167 insertions(+), 16 deletions(-)
 create mode 100644 documentation/docs/content/DockerImages/dockerfiles/apache-dev.rst
 create mode 100644 documentation/docs/content/DockerImages/dockerfiles/include/environment-php-dev.rst
 create mode 100644 documentation/docs/content/DockerImages/dockerfiles/include/image-tag-base.rst
 create mode 100644 documentation/docs/content/DockerImages/dockerfiles/include/info-web-development.rst
 create mode 100644 documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst
 create mode 100644 documentation/docs/content/FAQ/index.rst

diff --git a/documentation/docs/content/DockerImages/dockerfiles/ansible.rst b/documentation/docs/content/DockerImages/dockerfiles/ansible.rst
index 9b068000b..d2eea89ab 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/ansible.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/ansible.rst
@@ -3,3 +3,8 @@ webdevops/ansible
 =================
 
 All ``webdevops/ansible`` images are based on ``webvdevops/bootstrap`` without any changes.
+
+Docker image tags
+-----------------
+
+.. include:: include/image-tag-base.rst
diff --git a/documentation/docs/content/DockerImages/dockerfiles/apache-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/apache-dev.rst
new file mode 100644
index 000000000..a222fffc9
--- /dev/null
+++ b/documentation/docs/content/DockerImages/dockerfiles/apache-dev.rst
@@ -0,0 +1,25 @@
+====================
+webdevops/apache-dev
+====================
+
+These image extends ``webdevops/base`` with a apache daemon which is running on port 80 and 443
+
+.. include:: include/info-web-development.rst
+
+Docker image tags
+-----------------
+
+.. include:: include/image-tag-base.rst
+
+
+Environment variables
+---------------------
+
+.. include:: include/environment-base-app.rst
+.. include:: include/environment-web-dev.rst
+
+
+Docker image layout
+-------------------
+
+.. include:: include/layout-apache.rst
diff --git a/documentation/docs/content/DockerImages/dockerfiles/apache.rst b/documentation/docs/content/DockerImages/dockerfiles/apache.rst
index 02fefed4b..f7cd4fccc 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/apache.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/apache.rst
@@ -4,11 +4,11 @@ webdevops/apache
 
 These image extends ``webdevops/base`` with a apache daemon which is running on port 80 and 443
 
+
 Docker image tags
 -----------------
 
-
-
+.. include:: include/image-tag-base.rst
 
 
 Environment variables
diff --git a/documentation/docs/content/DockerImages/dockerfiles/base-app.rst b/documentation/docs/content/DockerImages/dockerfiles/base-app.rst
index 595de21a5..eabb507b9 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/base-app.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/base-app.rst
@@ -28,6 +28,12 @@ For an example docker service
 
 .. attention:: Alpine doesn't provide any locales so you have to find another method for using locales!
 
+Docker image tags
+-----------------
+
+.. include:: include/image-tag-base.rst
+
+
 Environment variables
 ---------------------
 
diff --git a/documentation/docs/content/DockerImages/dockerfiles/base.rst b/documentation/docs/content/DockerImages/dockerfiles/base.rst
index 12af94d57..98c6d3df0 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/base.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/base.rst
@@ -5,6 +5,12 @@ webdevops/base
 Our application base container contains some general tools, the provisioning system (Ansible), a preconfgured
 modular ``supervisord`` and a modular `entrypoint` script.
 
+Docker image tags
+-----------------
+
+.. include:: include/image-tag-base.rst
+
+
 Entrypoint
 ----------
 
diff --git a/documentation/docs/content/DockerImages/dockerfiles/bootstrap.rst b/documentation/docs/content/DockerImages/dockerfiles/bootstrap.rst
index 50dbaa94e..b9d5b5442 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/bootstrap.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/bootstrap.rst
@@ -5,6 +5,11 @@ webdevops/bootstrap
 Bootstrap images contains our baselayout (some basic scripts for secure and small package installations and handling) and a basic toolset.
 It will also install Ansible into the container for future provisioning of the container.
 
+Docker image tags
+-----------------
+
+.. include:: include/image-tag-base.rst
+
 
 Baselayout scripts
 ------------------
diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/environment-php-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/include/environment-php-dev.rst
new file mode 100644
index 000000000..267ca9ffe
--- /dev/null
+++ b/documentation/docs/content/DockerImages/dockerfiles/include/environment-php-dev.rst
@@ -0,0 +1,13 @@
+========================== ============================ ==============================================
+Environment variable       Description                  Default
+========================== ============================ ==============================================
+``WEB_DOCUMENT_ROOT``      Document root for webserver  ``/app``
+``WEB_DOCUMENT_INDEX``     Index document               ``index.php``
+``WEB_ALIAS_DOMAIN``       Domain aliases               ``*.vm``
+``WEB_PHP_SOCKET``         PHP-FPM socket address       ``127.0.0.1:9000`` (for php-* images)
+``WEB_NO_CACHE_PATTERN``   RegExp of files which should ``\.(css|js|gif|png|jpg|svg|json|xml)$``
+                           be delivered by webserver as
+                           non cacheable to browser
+``PHP_DEBUGGER``           Specifies which php debugger *empty* (eg. ``xdebug``, ``blackfire`` or
+                           should be active             ``none``)
+========================== ============================ ==============================================
diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst
index 267ca9ffe..36773e2df 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/include/environment-web-dev.rst
@@ -8,6 +8,4 @@ Environment variable       Description                  Default
 ``WEB_NO_CACHE_PATTERN``   RegExp of files which should ``\.(css|js|gif|png|jpg|svg|json|xml)$``
                            be delivered by webserver as
                            non cacheable to browser
-``PHP_DEBUGGER``           Specifies which php debugger *empty* (eg. ``xdebug``, ``blackfire`` or
-                           should be active             ``none``)
 ========================== ============================ ==============================================
diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-base.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-base.rst
new file mode 100644
index 000000000..d79ec5c04
--- /dev/null
+++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-base.rst
@@ -0,0 +1,13 @@
+====================== ==========================
+Tag                    Distribution name
+====================== ==========================
+``ubuntu-12.04``       precise
+``ubuntu-14.04``       trusty (LTS)
+``ubuntu-15.04``       vivid
+``ubuntu-15.10``       wily
+``ubuntu-16.04``       xenial (LTS)
+``debian-7``           wheezy
+``debian-8``           jessie
+``debian-9``           stretch
+``centos-7``
+====================== ==========================
diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst
index abbedcaee..b295a3401 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/include/image-tag-php.rst
@@ -11,4 +11,5 @@ Tag                    Distribution name          PHP Version
 ``debian-8-php7``      jessie with dotdeb         PHP 7.x (via sury)
 ``debian-9``           stretch                    PHP 7.0
 ``centos-7``                                      PHP 5.4
+``centos-7-php56``                                PHP 5.6
 ====================== ========================== ===============
diff --git a/documentation/docs/content/DockerImages/dockerfiles/include/info-web-development.rst b/documentation/docs/content/DockerImages/dockerfiles/include/info-web-development.rst
new file mode 100644
index 000000000..21eaa2a31
--- /dev/null
+++ b/documentation/docs/content/DockerImages/dockerfiles/include/info-web-development.rst
@@ -0,0 +1 @@
+.. attention:: Webserver is running development mode, assets and resource files will be send without caching to browser!
diff --git a/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst b/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst
index b3113dc2d..f8f525776 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/mail-sandbox.rst
@@ -9,6 +9,11 @@ This images catches all emails sent to it and stores them locally. These mails a
 Docker image tags
 -----------------
 
+====================== ==========================
+Tag                    Distribution name
+====================== ==========================
+``latest``             Ubuntu 16.04 xenial (LTS)
+====================== ==========================
 
 
 Environment variables
diff --git a/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst
new file mode 100644
index 000000000..397ea5e2d
--- /dev/null
+++ b/documentation/docs/content/DockerImages/dockerfiles/nginx-dev.rst
@@ -0,0 +1,26 @@
+===================
+webdevops/nginx-dev
+===================
+
+These image extends ``webdevops/base`` with a nginx daemon which is running on port 80 and 443
+
+.. include:: include/info-web-development.rst
+
+Docker image tags
+-----------------
+
+.. include:: include/image-tag-base.rst
+
+
+Environment variables
+---------------------
+
+.. include:: include/environment-base-app.rst
+.. include:: include/environment-web-dev.rst
+
+
+Docker image layout
+-------------------
+
+.. include:: include/layout-nginx.rst
+.. include:: include/layout-php.rst
diff --git a/documentation/docs/content/DockerImages/dockerfiles/nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/nginx.rst
index c35950262..c93f6a4d3 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/nginx.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/nginx.rst
@@ -7,8 +7,7 @@ These image extends ``webdevops/base`` with a nginx daemon which is running on p
 Docker image tags
 -----------------
 
-
-
+.. include:: include/image-tag-base.rst
 
 
 Environment variables
diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst
index b1a9e5edf..6b955904d 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/php-apache-dev.rst
@@ -9,7 +9,6 @@ These image extends ``webdevops/php-dev`` with a apache daemon which is running
 Docker image tags
 -----------------
 
-
 .. include:: include/image-tag-php.rst
 
 
@@ -17,7 +16,7 @@ Environment variables
 ---------------------
 
 .. include:: include/environment-base-app.rst
-.. include:: include/environment-web-dev.rst
+.. include:: include/environment-php-dev.rst
 
 
 Docker image layout
diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst b/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst
index daaa3da01..1dd0a7c3d 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/php-apache.rst
@@ -7,7 +7,6 @@ These image extends ``webdevops/php`` with a apache daemon which is running on p
 Docker image tags
 -----------------
 
-
 .. include:: include/image-tag-php.rst
 
 
diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst
index e02b2cb5e..fd7482075 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/php-dev.rst
@@ -9,14 +9,14 @@ These image extends ``webdevops/php`` with xdebug and development tools
 Docker image tags
 -----------------
 
-
 .. include:: include/image-tag-php.rst
 
+
 Environment variables
 ---------------------
 
 .. include:: include/environment-base-app.rst
-.. include:: include/environment-web-dev.rst
+.. include:: include/environment-php-dev.rst
 
 
 Docker image layout
diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst b/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst
index d1b9a17da..2884b2135 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/php-nginx-dev.rst
@@ -9,7 +9,6 @@ These image extends ``webdevops/php-dev`` with a nginx daemon which is running o
 Docker image tags
 -----------------
 
-
 .. include:: include/image-tag-php.rst
 
 
@@ -17,7 +16,7 @@ Environment variables
 ---------------------
 
 .. include:: include/environment-base-app.rst
-.. include:: include/environment-web-dev.rst
+.. include:: include/environment-php-dev.rst
 
 
 Docker image layout
diff --git a/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst b/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst
index ec55f98b0..3b1e74c5c 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/php-nginx.rst
@@ -7,7 +7,6 @@ These image extends ``webdevops/php`` with a nginx daemon which is running on po
 Docker image tags
 -----------------
 
-
 .. include:: include/image-tag-php.rst
 
 
diff --git a/documentation/docs/content/DockerImages/dockerfiles/php.rst b/documentation/docs/content/DockerImages/dockerfiles/php.rst
index 709f253d6..0b0c4f449 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/php.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/php.rst
@@ -7,7 +7,6 @@ The php images are based on ``webdevops/base-app`` with PHP cli and PHP-FPM. PHP
 Docker image tags
 -----------------
 
-
 .. include:: include/image-tag-php.rst
 
 Environment variables
diff --git a/documentation/docs/content/DockerImages/dockerfiles/postfix.rst b/documentation/docs/content/DockerImages/dockerfiles/postfix.rst
index 5dff6e327..918890ec3 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/postfix.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/postfix.rst
@@ -4,6 +4,12 @@ webdevops/postfix
 
 These image extends ``webdevops/base`` with a postfix daemon which is running on port 25
 
+Docker image tags
+-----------------
+
+.. include:: include/image-tag-base.rst
+
+
 Environment variables
 ---------------------
 
diff --git a/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst b/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst
index 0160428a6..473a8f3fe 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/sphinx.rst
@@ -4,6 +4,15 @@ webdevops/sphinx
 
 These image extends ``webdevops/bootstrap`` and provides a sphinx build system.
 
+Docker image tags
+-----------------
+
+====================== ==========================
+Tag                    Distribution name
+====================== ==========================
+``latest``             Alpine 3
+====================== ==========================
+
 
 Usage
 -----
diff --git a/documentation/docs/content/DockerImages/dockerfiles/ssh.rst b/documentation/docs/content/DockerImages/dockerfiles/ssh.rst
index 1761b8b70..952d28c3a 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/ssh.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/ssh.rst
@@ -3,3 +3,12 @@ webdevops/ssh
 =============
 
 These image extends ``webdevops/bootstrap`` and provides a standalone ssh server running on port 22.
+
+Docker image tags
+-----------------
+
+====================== ==========================
+Tag                    Distribution name
+====================== ==========================
+``latest``             Ubuntu 16.04 xenial (LTS)
+====================== ==========================
diff --git a/documentation/docs/content/DockerImages/dockerfiles/varnish.rst b/documentation/docs/content/DockerImages/dockerfiles/varnish.rst
index 698eccd64..f76ce3028 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/varnish.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/varnish.rst
@@ -5,6 +5,16 @@ webdevops/varnish
 These image extends ``webdevops/base`` and provides a standalone varnish server running on port 80.
 
 
+Docker image tags
+-----------------
+
+====================== ==========================
+Tag                    Distribution name
+====================== ==========================
+``latest``             Alpine 3
+====================== ==========================
+
+
 Environment variables
 ---------------------
 
diff --git a/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst b/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst
index 2542cbe04..976d38d6f 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/vsftp.rst
@@ -4,6 +4,16 @@ webdevops/vsftp
 
 These image extends ``webdevops/base`` and provides a standalone vsftp server running on port 20 and 21.
 
+Docker image tags
+-----------------
+
+====================== ==========================
+Tag                    Distribution name
+====================== ==========================
+``latest``             Ubuntu 16.04 xenial (LTS)
+====================== ==========================
+
+
 Environment variables
 ---------------------
 
diff --git a/documentation/docs/content/DockerImages/index.rst b/documentation/docs/content/DockerImages/index.rst
index d7542598e..fb926709c 100644
--- a/documentation/docs/content/DockerImages/index.rst
+++ b/documentation/docs/content/DockerImages/index.rst
@@ -14,6 +14,7 @@ Docker images
 
    dockerfiles/ansible
    dockerfiles/apache
+   dockerfiles/apache-dev
    dockerfiles/base
    dockerfiles/base-app
    dockerfiles/bootstrap
@@ -22,6 +23,7 @@ Docker images
    dockerfiles/hhvm-nginx
    dockerfiles/mail-sandbox
    dockerfiles/nginx
+   dockerfiles/nginx-dev
    dockerfiles/php
    dockerfiles/php-apache
    dockerfiles/php-apache-dev
diff --git a/documentation/docs/content/FAQ/index.rst b/documentation/docs/content/FAQ/index.rst
new file mode 100644
index 000000000..0a84c5931
--- /dev/null
+++ b/documentation/docs/content/FAQ/index.rst
@@ -0,0 +1,6 @@
+===
+FAQ
+===
+
+
+Placeholder
diff --git a/documentation/docs/content/KnownIssues/index.rst b/documentation/docs/content/KnownIssues/index.rst
index a0365a248..042203f69 100644
--- a/documentation/docs/content/KnownIssues/index.rst
+++ b/documentation/docs/content/KnownIssues/index.rst
@@ -36,6 +36,6 @@ webdevops/php...-dev:alpine-3
 - missing blackfire (not supported)
 
 webdevops/php...-dev:debian-8-php7
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 - missing xdebug
diff --git a/documentation/docs/index.rst b/documentation/docs/index.rst
index b6291cca4..f406685f4 100644
--- a/documentation/docs/index.rst
+++ b/documentation/docs/index.rst
@@ -29,3 +29,4 @@ Overview
    content/Customization/index
    content/BuildingProcess/index
    content/KnownIssues/index
+   content/FAQ/index

From 118867ac41a699e9e5ef672f7edbff0d41b69992 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Thu, 23 Jun 2016 20:46:25 +0200
Subject: [PATCH 10/13] Add tag list for storage

---
 .../docs/content/DockerImages/dockerfiles/storage.rst    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/documentation/docs/content/DockerImages/dockerfiles/storage.rst b/documentation/docs/content/DockerImages/dockerfiles/storage.rst
index f66bd0f55..e5b291e97 100644
--- a/documentation/docs/content/DockerImages/dockerfiles/storage.rst
+++ b/documentation/docs/content/DockerImages/dockerfiles/storage.rst
@@ -3,3 +3,12 @@ webdevops/storage
 =================
 
 These image extends ``busybox`` and provides ``/storage`` as volume to other containers.
+
+Docker image tags
+-----------------
+
+====================== ==========================
+Tag                    Distribution name
+====================== ==========================
+``latest``             Busybox
+====================== ==========================

From 240d1408c03a387ad0d4a3b68eb7270fadf58633 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Thu, 23 Jun 2016 21:03:19 +0200
Subject: [PATCH 11/13] Remove whoami call

Replace the whoami call with $UID variable
Fixes #102
---
 docker/base/alpine-3/conf/bin/entrypoint.sh            | 2 +-
 docker/base/centos-7/conf/bin/entrypoint.sh            | 2 +-
 docker/base/debian-7/conf/bin/entrypoint.sh            | 2 +-
 docker/base/debian-8/conf/bin/entrypoint.sh            | 2 +-
 docker/base/debian-9/conf/bin/entrypoint.sh            | 2 +-
 docker/base/ubuntu-12.04/conf/bin/entrypoint.sh        | 2 +-
 docker/base/ubuntu-14.04/conf/bin/entrypoint.sh        | 2 +-
 docker/base/ubuntu-15.04/conf/bin/entrypoint.sh        | 2 +-
 docker/base/ubuntu-15.10/conf/bin/entrypoint.sh        | 2 +-
 docker/base/ubuntu-16.04/conf/bin/entrypoint.sh        | 2 +-
 docker/samson-deployment/latest/conf/bin/entrypoint.sh | 2 +-
 provisioning/base/general/bin/entrypoint.sh            | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/docker/base/alpine-3/conf/bin/entrypoint.sh b/docker/base/alpine-3/conf/bin/entrypoint.sh
index f489687f5..b8a179e38 100644
--- a/docker/base/alpine-3/conf/bin/entrypoint.sh
+++ b/docker/base/alpine-3/conf/bin/entrypoint.sh
@@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-if [ "$(/usr/bin/whoami)" == "root" ]; then
+if [[ "$UID" -eq 0 ]]; then
     # Only run provision if user is root
 
     if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
diff --git a/docker/base/centos-7/conf/bin/entrypoint.sh b/docker/base/centos-7/conf/bin/entrypoint.sh
index f489687f5..b8a179e38 100644
--- a/docker/base/centos-7/conf/bin/entrypoint.sh
+++ b/docker/base/centos-7/conf/bin/entrypoint.sh
@@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-if [ "$(/usr/bin/whoami)" == "root" ]; then
+if [[ "$UID" -eq 0 ]]; then
     # Only run provision if user is root
 
     if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
diff --git a/docker/base/debian-7/conf/bin/entrypoint.sh b/docker/base/debian-7/conf/bin/entrypoint.sh
index f489687f5..b8a179e38 100644
--- a/docker/base/debian-7/conf/bin/entrypoint.sh
+++ b/docker/base/debian-7/conf/bin/entrypoint.sh
@@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-if [ "$(/usr/bin/whoami)" == "root" ]; then
+if [[ "$UID" -eq 0 ]]; then
     # Only run provision if user is root
 
     if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
diff --git a/docker/base/debian-8/conf/bin/entrypoint.sh b/docker/base/debian-8/conf/bin/entrypoint.sh
index f489687f5..b8a179e38 100644
--- a/docker/base/debian-8/conf/bin/entrypoint.sh
+++ b/docker/base/debian-8/conf/bin/entrypoint.sh
@@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-if [ "$(/usr/bin/whoami)" == "root" ]; then
+if [[ "$UID" -eq 0 ]]; then
     # Only run provision if user is root
 
     if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
diff --git a/docker/base/debian-9/conf/bin/entrypoint.sh b/docker/base/debian-9/conf/bin/entrypoint.sh
index f489687f5..b8a179e38 100644
--- a/docker/base/debian-9/conf/bin/entrypoint.sh
+++ b/docker/base/debian-9/conf/bin/entrypoint.sh
@@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-if [ "$(/usr/bin/whoami)" == "root" ]; then
+if [[ "$UID" -eq 0 ]]; then
     # Only run provision if user is root
 
     if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
diff --git a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh
index f489687f5..b8a179e38 100644
--- a/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh
+++ b/docker/base/ubuntu-12.04/conf/bin/entrypoint.sh
@@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-if [ "$(/usr/bin/whoami)" == "root" ]; then
+if [[ "$UID" -eq 0 ]]; then
     # Only run provision if user is root
 
     if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
diff --git a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh
index f489687f5..b8a179e38 100644
--- a/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh
+++ b/docker/base/ubuntu-14.04/conf/bin/entrypoint.sh
@@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-if [ "$(/usr/bin/whoami)" == "root" ]; then
+if [[ "$UID" -eq 0 ]]; then
     # Only run provision if user is root
 
     if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
diff --git a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh
index f489687f5..b8a179e38 100644
--- a/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh
+++ b/docker/base/ubuntu-15.04/conf/bin/entrypoint.sh
@@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-if [ "$(/usr/bin/whoami)" == "root" ]; then
+if [[ "$UID" -eq 0 ]]; then
     # Only run provision if user is root
 
     if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
diff --git a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh b/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh
index f489687f5..b8a179e38 100644
--- a/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh
+++ b/docker/base/ubuntu-15.10/conf/bin/entrypoint.sh
@@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-if [ "$(/usr/bin/whoami)" == "root" ]; then
+if [[ "$UID" -eq 0 ]]; then
     # Only run provision if user is root
 
     if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
diff --git a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh b/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh
index f489687f5..b8a179e38 100644
--- a/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh
+++ b/docker/base/ubuntu-16.04/conf/bin/entrypoint.sh
@@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-if [ "$(/usr/bin/whoami)" == "root" ]; then
+if [[ "$UID" -eq 0 ]]; then
     # Only run provision if user is root
 
     if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
diff --git a/docker/samson-deployment/latest/conf/bin/entrypoint.sh b/docker/samson-deployment/latest/conf/bin/entrypoint.sh
index f489687f5..b8a179e38 100644
--- a/docker/samson-deployment/latest/conf/bin/entrypoint.sh
+++ b/docker/samson-deployment/latest/conf/bin/entrypoint.sh
@@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-if [ "$(/usr/bin/whoami)" == "root" ]; then
+if [[ "$UID" -eq 0 ]]; then
     # Only run provision if user is root
 
     if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then
diff --git a/provisioning/base/general/bin/entrypoint.sh b/provisioning/base/general/bin/entrypoint.sh
index f489687f5..b8a179e38 100644
--- a/provisioning/base/general/bin/entrypoint.sh
+++ b/provisioning/base/general/bin/entrypoint.sh
@@ -13,7 +13,7 @@ TASK="$(echo $1| sed 's/[^-_a-zA-Z0-9]*//g')"
 
 source /opt/docker/bin/config.sh
 
-if [ "$(/usr/bin/whoami)" == "root" ]; then
+if [[ "$UID" -eq 0 ]]; then
     # Only run provision if user is root
 
     if [ "$TASK" == "supervisord" -o "$TASK" == "noop" ]; then

From fac472724afc7fd4280758344f5dd23f40cd6ec2 Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Thu, 23 Jun 2016 21:06:21 +0200
Subject: [PATCH 12/13] Fix pecl for alpine (with workaround)

Fixes #78
---
 docker/php/alpine-3-php7/Dockerfile    | 2 ++
 docker/php/alpine-3/Dockerfile         | 2 ++
 template/Dockerfile/images/php5.jinja2 | 2 ++
 template/Dockerfile/images/php7.jinja2 | 2 ++
 4 files changed, 8 insertions(+)

diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile
index cb2224dc7..5889d4e27 100644
--- a/docker/php/alpine-3-php7/Dockerfile
+++ b/docker/php/alpine-3-php7/Dockerfile
@@ -76,6 +76,8 @@ RUN /usr/local/bin/apk-install \
     && pear upgrade-all \
     && pear config-set auto_discover 1 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
+    # PECL workaround, see webdevops/Dockerfile#78
+    && sed -i "s/ -n / /" $(which pecl) \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile
index 76a94f8c8..e5caeae1d 100644
--- a/docker/php/alpine-3/Dockerfile
+++ b/docker/php/alpine-3/Dockerfile
@@ -70,6 +70,8 @@ RUN /usr/local/bin/apk-install \
     && pear upgrade-all \
     && pear config-set auto_discover 1 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
+    # PECL workaround, see webdevops/Dockerfile#78
+    && sed -i "s/ -n / /" $(which pecl) \
     && /opt/docker/bin/provision run --tag bootstrap --role webdevops-php \
     && /opt/docker/bin/bootstrap.sh
 
diff --git a/template/Dockerfile/images/php5.jinja2 b/template/Dockerfile/images/php5.jinja2
index 53f80d26c..4f2461b96 100644
--- a/template/Dockerfile/images/php5.jinja2
+++ b/template/Dockerfile/images/php5.jinja2
@@ -55,6 +55,8 @@ RUN /usr/local/bin/apk-install \
     && pear upgrade-all \
     && pear config-set auto_discover 1 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
+    # PECL workaround, see webdevops/Dockerfile#78
+    && sed -i "s/ -n / /" $(which pecl) \
     {{ provision.runRoleInline('php', role) }}
 {%- endmacro %}
 
diff --git a/template/Dockerfile/images/php7.jinja2 b/template/Dockerfile/images/php7.jinja2
index 8fb21b869..11cd31dce 100644
--- a/template/Dockerfile/images/php7.jinja2
+++ b/template/Dockerfile/images/php7.jinja2
@@ -61,6 +61,8 @@ RUN /usr/local/bin/apk-install \
     && pear upgrade-all \
     && pear config-set auto_discover 1 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
+    # PECL workaround, see webdevops/Dockerfile#78
+    && sed -i "s/ -n / /" $(which pecl) \
     {{ provision.runRoleInline('php', role) }}
 {%- endmacro %}
 

From f8f393c94be84cbdd3b6b4fc88dd7c3e87f06dec Mon Sep 17 00:00:00 2001
From: Markus Blaschke <mblaschke82@gmail.com>
Date: Thu, 23 Jun 2016 21:37:22 +0200
Subject: [PATCH 13/13] Version bump

---
 CHANGELOG.md                                    | 9 +++++++++
 docker/ansible/alpine-3/Dockerfile              | 2 +-
 docker/ansible/centos-7/Dockerfile              | 2 +-
 docker/ansible/debian-7/Dockerfile              | 2 +-
 docker/ansible/debian-8/Dockerfile              | 2 +-
 docker/ansible/debian-9/Dockerfile              | 2 +-
 docker/ansible/ubuntu-12.04/Dockerfile          | 2 +-
 docker/ansible/ubuntu-14.04/Dockerfile          | 2 +-
 docker/ansible/ubuntu-15.04/Dockerfile          | 2 +-
 docker/ansible/ubuntu-15.10/Dockerfile          | 2 +-
 docker/ansible/ubuntu-16.04/Dockerfile          | 2 +-
 docker/apache-dev/alpine-3/Dockerfile           | 2 +-
 docker/apache-dev/centos-7/Dockerfile           | 2 +-
 docker/apache-dev/debian-7/Dockerfile           | 2 +-
 docker/apache-dev/debian-8/Dockerfile           | 2 +-
 docker/apache-dev/debian-9/Dockerfile           | 2 +-
 docker/apache-dev/ubuntu-12.04/Dockerfile       | 2 +-
 docker/apache-dev/ubuntu-14.04/Dockerfile       | 2 +-
 docker/apache-dev/ubuntu-15.04/Dockerfile       | 2 +-
 docker/apache-dev/ubuntu-15.10/Dockerfile       | 2 +-
 docker/apache-dev/ubuntu-16.04/Dockerfile       | 2 +-
 docker/apache/alpine-3/Dockerfile               | 2 +-
 docker/apache/centos-7/Dockerfile               | 2 +-
 docker/apache/debian-7/Dockerfile               | 2 +-
 docker/apache/debian-8/Dockerfile               | 2 +-
 docker/apache/debian-9/Dockerfile               | 2 +-
 docker/apache/ubuntu-12.04/Dockerfile           | 2 +-
 docker/apache/ubuntu-14.04/Dockerfile           | 2 +-
 docker/apache/ubuntu-15.04/Dockerfile           | 2 +-
 docker/apache/ubuntu-15.10/Dockerfile           | 2 +-
 docker/apache/ubuntu-16.04/Dockerfile           | 2 +-
 docker/base-app/alpine-3/Dockerfile             | 2 +-
 docker/base-app/centos-7/Dockerfile             | 2 +-
 docker/base-app/debian-7/Dockerfile             | 2 +-
 docker/base-app/debian-8/Dockerfile             | 2 +-
 docker/base-app/debian-9/Dockerfile             | 2 +-
 docker/base-app/ubuntu-12.04/Dockerfile         | 2 +-
 docker/base-app/ubuntu-14.04/Dockerfile         | 2 +-
 docker/base-app/ubuntu-15.04/Dockerfile         | 2 +-
 docker/base-app/ubuntu-15.10/Dockerfile         | 2 +-
 docker/base-app/ubuntu-16.04/Dockerfile         | 2 +-
 docker/base/alpine-3/Dockerfile                 | 2 +-
 docker/base/centos-7/Dockerfile                 | 2 +-
 docker/base/debian-7/Dockerfile                 | 2 +-
 docker/base/debian-8/Dockerfile                 | 2 +-
 docker/base/debian-9/Dockerfile                 | 2 +-
 docker/base/ubuntu-12.04/Dockerfile             | 2 +-
 docker/base/ubuntu-14.04/Dockerfile             | 2 +-
 docker/base/ubuntu-15.04/Dockerfile             | 2 +-
 docker/base/ubuntu-15.10/Dockerfile             | 2 +-
 docker/base/ubuntu-16.04/Dockerfile             | 2 +-
 docker/bootstrap/alpine-3/Dockerfile            | 2 +-
 docker/bootstrap/centos-7/Dockerfile            | 2 +-
 docker/bootstrap/debian-7/Dockerfile            | 2 +-
 docker/bootstrap/debian-8/Dockerfile            | 2 +-
 docker/bootstrap/debian-9/Dockerfile            | 2 +-
 docker/bootstrap/ubuntu-12.04/Dockerfile        | 2 +-
 docker/bootstrap/ubuntu-14.04/Dockerfile        | 2 +-
 docker/bootstrap/ubuntu-15.04/Dockerfile        | 2 +-
 docker/bootstrap/ubuntu-15.10/Dockerfile        | 2 +-
 docker/bootstrap/ubuntu-16.04/Dockerfile        | 2 +-
 docker/hhvm-apache/ubuntu-14.04/Dockerfile      | 2 +-
 docker/hhvm-apache/ubuntu-16.04/Dockerfile      | 2 +-
 docker/hhvm-nginx/ubuntu-14.04/Dockerfile       | 2 +-
 docker/hhvm-nginx/ubuntu-16.04/Dockerfile       | 2 +-
 docker/hhvm/ubuntu-14.04/Dockerfile             | 2 +-
 docker/hhvm/ubuntu-16.04/Dockerfile             | 2 +-
 docker/mail-sandbox/latest/Dockerfile           | 2 +-
 docker/nginx-dev/alpine-3/Dockerfile            | 2 +-
 docker/nginx-dev/centos-7/Dockerfile            | 2 +-
 docker/nginx-dev/debian-7/Dockerfile            | 2 +-
 docker/nginx-dev/debian-8/Dockerfile            | 2 +-
 docker/nginx-dev/debian-9/Dockerfile            | 2 +-
 docker/nginx-dev/ubuntu-12.04/Dockerfile        | 2 +-
 docker/nginx-dev/ubuntu-14.04/Dockerfile        | 2 +-
 docker/nginx-dev/ubuntu-15.04/Dockerfile        | 2 +-
 docker/nginx-dev/ubuntu-15.10/Dockerfile        | 2 +-
 docker/nginx-dev/ubuntu-16.04/Dockerfile        | 2 +-
 docker/nginx/alpine-3/Dockerfile                | 2 +-
 docker/nginx/centos-7/Dockerfile                | 2 +-
 docker/nginx/debian-7/Dockerfile                | 2 +-
 docker/nginx/debian-8/Dockerfile                | 2 +-
 docker/nginx/debian-9/Dockerfile                | 2 +-
 docker/nginx/ubuntu-12.04/Dockerfile            | 2 +-
 docker/nginx/ubuntu-14.04/Dockerfile            | 2 +-
 docker/nginx/ubuntu-15.04/Dockerfile            | 2 +-
 docker/nginx/ubuntu-15.10/Dockerfile            | 2 +-
 docker/nginx/ubuntu-16.04/Dockerfile            | 2 +-
 docker/php-apache-dev/alpine-3-php7/Dockerfile  | 2 +-
 docker/php-apache-dev/alpine-3/Dockerfile       | 2 +-
 docker/php-apache-dev/centos-7-php56/Dockerfile | 2 +-
 docker/php-apache-dev/centos-7/Dockerfile       | 2 +-
 docker/php-apache-dev/debian-7/Dockerfile       | 2 +-
 docker/php-apache-dev/debian-8-php7/Dockerfile  | 2 +-
 docker/php-apache-dev/debian-8/Dockerfile       | 2 +-
 docker/php-apache-dev/debian-9/Dockerfile       | 2 +-
 docker/php-apache-dev/ubuntu-12.04/Dockerfile   | 2 +-
 docker/php-apache-dev/ubuntu-14.04/Dockerfile   | 2 +-
 docker/php-apache-dev/ubuntu-15.04/Dockerfile   | 2 +-
 docker/php-apache-dev/ubuntu-15.10/Dockerfile   | 2 +-
 docker/php-apache-dev/ubuntu-16.04/Dockerfile   | 2 +-
 docker/php-apache/alpine-3-php7/Dockerfile      | 2 +-
 docker/php-apache/alpine-3/Dockerfile           | 2 +-
 docker/php-apache/centos-7-php56/Dockerfile     | 2 +-
 docker/php-apache/centos-7/Dockerfile           | 2 +-
 docker/php-apache/debian-7/Dockerfile           | 2 +-
 docker/php-apache/debian-8-php7/Dockerfile      | 2 +-
 docker/php-apache/debian-8/Dockerfile           | 2 +-
 docker/php-apache/debian-9/Dockerfile           | 2 +-
 docker/php-apache/ubuntu-12.04/Dockerfile       | 2 +-
 docker/php-apache/ubuntu-14.04/Dockerfile       | 2 +-
 docker/php-apache/ubuntu-15.04/Dockerfile       | 2 +-
 docker/php-apache/ubuntu-15.10/Dockerfile       | 2 +-
 docker/php-apache/ubuntu-16.04/Dockerfile       | 2 +-
 docker/php-dev/alpine-3-php7/Dockerfile         | 2 +-
 docker/php-dev/alpine-3/Dockerfile              | 2 +-
 docker/php-dev/centos-7-php56/Dockerfile        | 2 +-
 docker/php-dev/centos-7/Dockerfile              | 2 +-
 docker/php-dev/debian-7/Dockerfile              | 2 +-
 docker/php-dev/debian-8-php7/Dockerfile         | 2 +-
 docker/php-dev/debian-8/Dockerfile              | 2 +-
 docker/php-dev/debian-9/Dockerfile              | 2 +-
 docker/php-dev/ubuntu-12.04/Dockerfile          | 2 +-
 docker/php-dev/ubuntu-14.04/Dockerfile          | 2 +-
 docker/php-dev/ubuntu-15.04/Dockerfile          | 2 +-
 docker/php-dev/ubuntu-15.10/Dockerfile          | 2 +-
 docker/php-dev/ubuntu-16.04/Dockerfile          | 2 +-
 docker/php-nginx-dev/alpine-3-php7/Dockerfile   | 2 +-
 docker/php-nginx-dev/alpine-3/Dockerfile        | 2 +-
 docker/php-nginx-dev/centos-7-php56/Dockerfile  | 2 +-
 docker/php-nginx-dev/centos-7/Dockerfile        | 2 +-
 docker/php-nginx-dev/debian-7/Dockerfile        | 2 +-
 docker/php-nginx-dev/debian-8-php7/Dockerfile   | 2 +-
 docker/php-nginx-dev/debian-8/Dockerfile        | 2 +-
 docker/php-nginx-dev/debian-9/Dockerfile        | 2 +-
 docker/php-nginx-dev/ubuntu-12.04/Dockerfile    | 2 +-
 docker/php-nginx-dev/ubuntu-14.04/Dockerfile    | 2 +-
 docker/php-nginx-dev/ubuntu-15.04/Dockerfile    | 2 +-
 docker/php-nginx-dev/ubuntu-15.10/Dockerfile    | 2 +-
 docker/php-nginx-dev/ubuntu-16.04/Dockerfile    | 2 +-
 docker/php-nginx/alpine-3-php7/Dockerfile       | 2 +-
 docker/php-nginx/alpine-3/Dockerfile            | 2 +-
 docker/php-nginx/centos-7-php56/Dockerfile      | 2 +-
 docker/php-nginx/centos-7/Dockerfile            | 2 +-
 docker/php-nginx/debian-7/Dockerfile            | 2 +-
 docker/php-nginx/debian-8-php7/Dockerfile       | 2 +-
 docker/php-nginx/debian-8/Dockerfile            | 2 +-
 docker/php-nginx/debian-9/Dockerfile            | 2 +-
 docker/php-nginx/ubuntu-12.04/Dockerfile        | 2 +-
 docker/php-nginx/ubuntu-14.04/Dockerfile        | 2 +-
 docker/php-nginx/ubuntu-15.04/Dockerfile        | 2 +-
 docker/php-nginx/ubuntu-15.10/Dockerfile        | 2 +-
 docker/php-nginx/ubuntu-16.04/Dockerfile        | 2 +-
 docker/php/alpine-3-php7/Dockerfile             | 2 +-
 docker/php/alpine-3/Dockerfile                  | 2 +-
 docker/php/centos-7-php56/Dockerfile            | 2 +-
 docker/php/centos-7/Dockerfile                  | 2 +-
 docker/php/debian-7/Dockerfile                  | 2 +-
 docker/php/debian-8-php7/Dockerfile             | 2 +-
 docker/php/debian-8/Dockerfile                  | 2 +-
 docker/php/debian-9/Dockerfile                  | 2 +-
 docker/php/ubuntu-12.04/Dockerfile              | 2 +-
 docker/php/ubuntu-14.04/Dockerfile              | 2 +-
 docker/php/ubuntu-15.04/Dockerfile              | 2 +-
 docker/php/ubuntu-15.10/Dockerfile              | 2 +-
 docker/php/ubuntu-16.04/Dockerfile              | 2 +-
 docker/piwik/ubuntu-14.04/Dockerfile            | 2 +-
 docker/postfix/latest/Dockerfile                | 2 +-
 docker/samson-deployment/latest/Dockerfile      | 2 +-
 docker/sphinx/latest/Dockerfile                 | 2 +-
 docker/ssh/latest/Dockerfile                    | 2 +-
 docker/storage/latest/Dockerfile                | 2 +-
 docker/typo3/ubuntu-14.04/Dockerfile            | 2 +-
 docker/varnish/latest/Dockerfile                | 2 +-
 docker/vsftp/latest/Dockerfile                  | 2 +-
 template/Dockerfile/docker.jinja2               | 2 +-
 176 files changed, 184 insertions(+), 175 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc18e0994..326e081e9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,15 @@ This project adheres to [WebDevOps.io Dockerfile](https://github.com/webdevops/D
 
 ## [1.0.0] - upcoming
 
+## [0.53.0] - 2016-06-23
+- Added apache-dev and nginx-dev
+- Restructed php-*dev provision
+- Removed whoami call
+- Removed provision from `make all` and `make build` 
+- Removed --force from apk-install
+- Fixed pecl for alpine images
+- Updated documentation and tests 
+
 ## [0.52.0] - 2016-06-20
 - Added tag centos-7-php56 for php images
 - Added POSTFIX_MYNETWORKS and POSTFIX_RELAYHOST environment variables
diff --git a/docker/ansible/alpine-3/Dockerfile b/docker/ansible/alpine-3/Dockerfile
index b48ef9a30..60e832753 100644
--- a/docker/ansible/alpine-3/Dockerfile
+++ b/docker/ansible/alpine-3/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
diff --git a/docker/ansible/centos-7/Dockerfile b/docker/ansible/centos-7/Dockerfile
index 126b4dda5..6e0b42c4c 100644
--- a/docker/ansible/centos-7/Dockerfile
+++ b/docker/ansible/centos-7/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
diff --git a/docker/ansible/debian-7/Dockerfile b/docker/ansible/debian-7/Dockerfile
index 9717f76e7..ca797b19e 100644
--- a/docker/ansible/debian-7/Dockerfile
+++ b/docker/ansible/debian-7/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
diff --git a/docker/ansible/debian-8/Dockerfile b/docker/ansible/debian-8/Dockerfile
index 347296936..f9af8c944 100644
--- a/docker/ansible/debian-8/Dockerfile
+++ b/docker/ansible/debian-8/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
diff --git a/docker/ansible/debian-9/Dockerfile b/docker/ansible/debian-9/Dockerfile
index d560995aa..6153e7fc3 100644
--- a/docker/ansible/debian-9/Dockerfile
+++ b/docker/ansible/debian-9/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
diff --git a/docker/ansible/ubuntu-12.04/Dockerfile b/docker/ansible/ubuntu-12.04/Dockerfile
index e7a86ad01..1a81117cf 100644
--- a/docker/ansible/ubuntu-12.04/Dockerfile
+++ b/docker/ansible/ubuntu-12.04/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
diff --git a/docker/ansible/ubuntu-14.04/Dockerfile b/docker/ansible/ubuntu-14.04/Dockerfile
index ee8bdc7fc..418d3ef28 100644
--- a/docker/ansible/ubuntu-14.04/Dockerfile
+++ b/docker/ansible/ubuntu-14.04/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
diff --git a/docker/ansible/ubuntu-15.04/Dockerfile b/docker/ansible/ubuntu-15.04/Dockerfile
index 6f593c1e0..205a37cfb 100644
--- a/docker/ansible/ubuntu-15.04/Dockerfile
+++ b/docker/ansible/ubuntu-15.04/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
diff --git a/docker/ansible/ubuntu-15.10/Dockerfile b/docker/ansible/ubuntu-15.10/Dockerfile
index 75a2b05c7..bd68a6feb 100644
--- a/docker/ansible/ubuntu-15.10/Dockerfile
+++ b/docker/ansible/ubuntu-15.10/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
diff --git a/docker/ansible/ubuntu-16.04/Dockerfile b/docker/ansible/ubuntu-16.04/Dockerfile
index 67ff32201..ea2e82bf7 100644
--- a/docker/ansible/ubuntu-16.04/Dockerfile
+++ b/docker/ansible/ubuntu-16.04/Dockerfile
@@ -8,4 +8,4 @@ FROM webdevops/bootstrap:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
diff --git a/docker/apache-dev/alpine-3/Dockerfile b/docker/apache-dev/alpine-3/Dockerfile
index 5dcb18499..97f7a1a07 100644
--- a/docker/apache-dev/alpine-3/Dockerfile
+++ b/docker/apache-dev/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache-dev/centos-7/Dockerfile b/docker/apache-dev/centos-7/Dockerfile
index 91fcbc1b9..1bb965226 100644
--- a/docker/apache-dev/centos-7/Dockerfile
+++ b/docker/apache-dev/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache-dev/debian-7/Dockerfile b/docker/apache-dev/debian-7/Dockerfile
index d773f5322..a93fa0d4f 100644
--- a/docker/apache-dev/debian-7/Dockerfile
+++ b/docker/apache-dev/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache-dev/debian-8/Dockerfile b/docker/apache-dev/debian-8/Dockerfile
index a325ec229..bb9af5d5a 100644
--- a/docker/apache-dev/debian-8/Dockerfile
+++ b/docker/apache-dev/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache-dev/debian-9/Dockerfile b/docker/apache-dev/debian-9/Dockerfile
index 7d1008341..9bd49d309 100644
--- a/docker/apache-dev/debian-9/Dockerfile
+++ b/docker/apache-dev/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache-dev/ubuntu-12.04/Dockerfile b/docker/apache-dev/ubuntu-12.04/Dockerfile
index 5f160e141..db0754375 100644
--- a/docker/apache-dev/ubuntu-12.04/Dockerfile
+++ b/docker/apache-dev/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache-dev/ubuntu-14.04/Dockerfile b/docker/apache-dev/ubuntu-14.04/Dockerfile
index 716e1901e..45b0d4601 100644
--- a/docker/apache-dev/ubuntu-14.04/Dockerfile
+++ b/docker/apache-dev/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache-dev/ubuntu-15.04/Dockerfile b/docker/apache-dev/ubuntu-15.04/Dockerfile
index d1d2024e3..a722fdeda 100644
--- a/docker/apache-dev/ubuntu-15.04/Dockerfile
+++ b/docker/apache-dev/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache-dev/ubuntu-15.10/Dockerfile b/docker/apache-dev/ubuntu-15.10/Dockerfile
index 1b095f809..216172f4f 100644
--- a/docker/apache-dev/ubuntu-15.10/Dockerfile
+++ b/docker/apache-dev/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache-dev/ubuntu-16.04/Dockerfile b/docker/apache-dev/ubuntu-16.04/Dockerfile
index 934514e8e..592bbc7e1 100644
--- a/docker/apache-dev/ubuntu-16.04/Dockerfile
+++ b/docker/apache-dev/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/apache:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache/alpine-3/Dockerfile b/docker/apache/alpine-3/Dockerfile
index aef7b0433..f1bb9cd4e 100644
--- a/docker/apache/alpine-3/Dockerfile
+++ b/docker/apache/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache/centos-7/Dockerfile b/docker/apache/centos-7/Dockerfile
index 61dd2886e..e012ac6b4 100644
--- a/docker/apache/centos-7/Dockerfile
+++ b/docker/apache/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache/debian-7/Dockerfile b/docker/apache/debian-7/Dockerfile
index 3d6cf4c66..d5c13fb47 100644
--- a/docker/apache/debian-7/Dockerfile
+++ b/docker/apache/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache/debian-8/Dockerfile b/docker/apache/debian-8/Dockerfile
index e2e328f30..a5ae5d5e9 100644
--- a/docker/apache/debian-8/Dockerfile
+++ b/docker/apache/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache/debian-9/Dockerfile b/docker/apache/debian-9/Dockerfile
index 921b6bc65..507ed9aa3 100644
--- a/docker/apache/debian-9/Dockerfile
+++ b/docker/apache/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache/ubuntu-12.04/Dockerfile b/docker/apache/ubuntu-12.04/Dockerfile
index 240511ede..b19989a7d 100644
--- a/docker/apache/ubuntu-12.04/Dockerfile
+++ b/docker/apache/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache/ubuntu-14.04/Dockerfile b/docker/apache/ubuntu-14.04/Dockerfile
index 360453c71..fbdabbbeb 100644
--- a/docker/apache/ubuntu-14.04/Dockerfile
+++ b/docker/apache/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache/ubuntu-15.04/Dockerfile b/docker/apache/ubuntu-15.04/Dockerfile
index b4658cb76..991794957 100644
--- a/docker/apache/ubuntu-15.04/Dockerfile
+++ b/docker/apache/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache/ubuntu-15.10/Dockerfile b/docker/apache/ubuntu-15.10/Dockerfile
index c1d00786d..2fab8495f 100644
--- a/docker/apache/ubuntu-15.10/Dockerfile
+++ b/docker/apache/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/apache/ubuntu-16.04/Dockerfile b/docker/apache/ubuntu-16.04/Dockerfile
index 7384816ae..b2fe284ea 100644
--- a/docker/apache/ubuntu-16.04/Dockerfile
+++ b/docker/apache/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/base-app/alpine-3/Dockerfile b/docker/base-app/alpine-3/Dockerfile
index 034264a0a..23d870ff2 100644
--- a/docker/base-app/alpine-3/Dockerfile
+++ b/docker/base-app/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application
diff --git a/docker/base-app/centos-7/Dockerfile b/docker/base-app/centos-7/Dockerfile
index 5f223b9eb..bfe1a4f94 100644
--- a/docker/base-app/centos-7/Dockerfile
+++ b/docker/base-app/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application
diff --git a/docker/base-app/debian-7/Dockerfile b/docker/base-app/debian-7/Dockerfile
index 236d639c7..357ee82f1 100644
--- a/docker/base-app/debian-7/Dockerfile
+++ b/docker/base-app/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application
diff --git a/docker/base-app/debian-8/Dockerfile b/docker/base-app/debian-8/Dockerfile
index 11d1b1d14..22e741588 100644
--- a/docker/base-app/debian-8/Dockerfile
+++ b/docker/base-app/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application
diff --git a/docker/base-app/debian-9/Dockerfile b/docker/base-app/debian-9/Dockerfile
index 9aea4e5f5..757bf3960 100644
--- a/docker/base-app/debian-9/Dockerfile
+++ b/docker/base-app/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application
diff --git a/docker/base-app/ubuntu-12.04/Dockerfile b/docker/base-app/ubuntu-12.04/Dockerfile
index 39e01645a..5d548bf8a 100644
--- a/docker/base-app/ubuntu-12.04/Dockerfile
+++ b/docker/base-app/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application
diff --git a/docker/base-app/ubuntu-14.04/Dockerfile b/docker/base-app/ubuntu-14.04/Dockerfile
index ed365b422..6e5e92733 100644
--- a/docker/base-app/ubuntu-14.04/Dockerfile
+++ b/docker/base-app/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application
diff --git a/docker/base-app/ubuntu-15.04/Dockerfile b/docker/base-app/ubuntu-15.04/Dockerfile
index 645631828..009ef4ba5 100644
--- a/docker/base-app/ubuntu-15.04/Dockerfile
+++ b/docker/base-app/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application
diff --git a/docker/base-app/ubuntu-15.10/Dockerfile b/docker/base-app/ubuntu-15.10/Dockerfile
index 60c62fb5b..fd741083c 100644
--- a/docker/base-app/ubuntu-15.10/Dockerfile
+++ b/docker/base-app/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application
diff --git a/docker/base-app/ubuntu-16.04/Dockerfile b/docker/base-app/ubuntu-16.04/Dockerfile
index 4f9681ee0..36fe35604 100644
--- a/docker/base-app/ubuntu-16.04/Dockerfile
+++ b/docker/base-app/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV APPLICATION_USER  application
 ENV APPLICATION_GROUP application
diff --git a/docker/base/alpine-3/Dockerfile b/docker/base/alpine-3/Dockerfile
index ef0bb2181..1eb43e044 100644
--- a/docker/base/alpine-3/Dockerfile
+++ b/docker/base/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV DOCKER_CONF_HOME /opt/docker/
 
diff --git a/docker/base/centos-7/Dockerfile b/docker/base/centos-7/Dockerfile
index 132708f9e..ab0cc0255 100644
--- a/docker/base/centos-7/Dockerfile
+++ b/docker/base/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV DOCKER_CONF_HOME /opt/docker/
 
diff --git a/docker/base/debian-7/Dockerfile b/docker/base/debian-7/Dockerfile
index 1ce51491d..c3c164a8c 100644
--- a/docker/base/debian-7/Dockerfile
+++ b/docker/base/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV DOCKER_CONF_HOME /opt/docker/
 
diff --git a/docker/base/debian-8/Dockerfile b/docker/base/debian-8/Dockerfile
index 1a951ac37..54d717676 100644
--- a/docker/base/debian-8/Dockerfile
+++ b/docker/base/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV DOCKER_CONF_HOME /opt/docker/
 
diff --git a/docker/base/debian-9/Dockerfile b/docker/base/debian-9/Dockerfile
index a855f3d34..5feba82f2 100644
--- a/docker/base/debian-9/Dockerfile
+++ b/docker/base/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV DOCKER_CONF_HOME /opt/docker/
 
diff --git a/docker/base/ubuntu-12.04/Dockerfile b/docker/base/ubuntu-12.04/Dockerfile
index 423bfb265..31b10a0e5 100644
--- a/docker/base/ubuntu-12.04/Dockerfile
+++ b/docker/base/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV DOCKER_CONF_HOME /opt/docker/
 
diff --git a/docker/base/ubuntu-14.04/Dockerfile b/docker/base/ubuntu-14.04/Dockerfile
index c59d71fcb..f8c7e6c87 100644
--- a/docker/base/ubuntu-14.04/Dockerfile
+++ b/docker/base/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV DOCKER_CONF_HOME /opt/docker/
 
diff --git a/docker/base/ubuntu-15.04/Dockerfile b/docker/base/ubuntu-15.04/Dockerfile
index 52877fb67..c58a11192 100644
--- a/docker/base/ubuntu-15.04/Dockerfile
+++ b/docker/base/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV DOCKER_CONF_HOME /opt/docker/
 
diff --git a/docker/base/ubuntu-15.10/Dockerfile b/docker/base/ubuntu-15.10/Dockerfile
index eb49e23c2..1e686c680 100644
--- a/docker/base/ubuntu-15.10/Dockerfile
+++ b/docker/base/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV DOCKER_CONF_HOME /opt/docker/
 
diff --git a/docker/base/ubuntu-16.04/Dockerfile b/docker/base/ubuntu-16.04/Dockerfile
index ec73b3f51..5e3ac78c8 100644
--- a/docker/base/ubuntu-16.04/Dockerfile
+++ b/docker/base/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV DOCKER_CONF_HOME /opt/docker/
 
diff --git a/docker/bootstrap/alpine-3/Dockerfile b/docker/bootstrap/alpine-3/Dockerfile
index e8e64e8c2..1b1283342 100644
--- a/docker/bootstrap/alpine-3/Dockerfile
+++ b/docker/bootstrap/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM alpine:3.3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 # Ensure UTF-8
 ENV LANG       en_US.UTF-8
diff --git a/docker/bootstrap/centos-7/Dockerfile b/docker/bootstrap/centos-7/Dockerfile
index d2e1636bc..11a78d6bd 100644
--- a/docker/bootstrap/centos-7/Dockerfile
+++ b/docker/bootstrap/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM centos:7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 # Ensure UTF-8
 ENV LANG       en_US.UTF-8
diff --git a/docker/bootstrap/debian-7/Dockerfile b/docker/bootstrap/debian-7/Dockerfile
index c7d91fe9c..1cbf0ae7a 100644
--- a/docker/bootstrap/debian-7/Dockerfile
+++ b/docker/bootstrap/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM debian:7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 # Ensure UTF-8
 ENV LANG       en_US.UTF-8
diff --git a/docker/bootstrap/debian-8/Dockerfile b/docker/bootstrap/debian-8/Dockerfile
index 27c67f3cc..7ecde3dcb 100644
--- a/docker/bootstrap/debian-8/Dockerfile
+++ b/docker/bootstrap/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM debian:8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 # Ensure UTF-8
 ENV LANG       en_US.UTF-8
diff --git a/docker/bootstrap/debian-9/Dockerfile b/docker/bootstrap/debian-9/Dockerfile
index 33ab007f2..028563795 100644
--- a/docker/bootstrap/debian-9/Dockerfile
+++ b/docker/bootstrap/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM debian:stretch
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 # Ensure UTF-8
 ENV LANG       en_US.UTF-8
diff --git a/docker/bootstrap/ubuntu-12.04/Dockerfile b/docker/bootstrap/ubuntu-12.04/Dockerfile
index c006acba9..8bf4811e5 100644
--- a/docker/bootstrap/ubuntu-12.04/Dockerfile
+++ b/docker/bootstrap/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM ubuntu:12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 # Ensure UTF-8
 ENV LANG       en_US.UTF-8
diff --git a/docker/bootstrap/ubuntu-14.04/Dockerfile b/docker/bootstrap/ubuntu-14.04/Dockerfile
index 0d98a4ba8..84b05a297 100644
--- a/docker/bootstrap/ubuntu-14.04/Dockerfile
+++ b/docker/bootstrap/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM ubuntu:14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 # Ensure UTF-8
 ENV LANG       en_US.UTF-8
diff --git a/docker/bootstrap/ubuntu-15.04/Dockerfile b/docker/bootstrap/ubuntu-15.04/Dockerfile
index 4b8d36db3..7377826e8 100644
--- a/docker/bootstrap/ubuntu-15.04/Dockerfile
+++ b/docker/bootstrap/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM ubuntu:15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 # Ensure UTF-8
 ENV LANG       en_US.UTF-8
diff --git a/docker/bootstrap/ubuntu-15.10/Dockerfile b/docker/bootstrap/ubuntu-15.10/Dockerfile
index 52a173165..d24a0c26d 100644
--- a/docker/bootstrap/ubuntu-15.10/Dockerfile
+++ b/docker/bootstrap/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM ubuntu:15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 # Ensure UTF-8
 ENV LANG       en_US.UTF-8
diff --git a/docker/bootstrap/ubuntu-16.04/Dockerfile b/docker/bootstrap/ubuntu-16.04/Dockerfile
index b23e927ea..ff464ce88 100644
--- a/docker/bootstrap/ubuntu-16.04/Dockerfile
+++ b/docker/bootstrap/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM ubuntu:16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 # Ensure UTF-8
 ENV LANG       en_US.UTF-8
diff --git a/docker/hhvm-apache/ubuntu-14.04/Dockerfile b/docker/hhvm-apache/ubuntu-14.04/Dockerfile
index f588a7779..72af9a209 100644
--- a/docker/hhvm-apache/ubuntu-14.04/Dockerfile
+++ b/docker/hhvm-apache/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/hhvm-apache/ubuntu-16.04/Dockerfile b/docker/hhvm-apache/ubuntu-16.04/Dockerfile
index bc08cd21f..966ae3c17 100644
--- a/docker/hhvm-apache/ubuntu-16.04/Dockerfile
+++ b/docker/hhvm-apache/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile
index b25debc11..0c2da55a9 100644
--- a/docker/hhvm-nginx/ubuntu-14.04/Dockerfile
+++ b/docker/hhvm-nginx/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile
index 4bb7d54b2..4d427e506 100644
--- a/docker/hhvm-nginx/ubuntu-16.04/Dockerfile
+++ b/docker/hhvm-nginx/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/hhvm:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/hhvm/ubuntu-14.04/Dockerfile b/docker/hhvm/ubuntu-14.04/Dockerfile
index c88686ab3..79db787ad 100644
--- a/docker/hhvm/ubuntu-14.04/Dockerfile
+++ b/docker/hhvm/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/hhvm/ubuntu-16.04/Dockerfile b/docker/hhvm/ubuntu-16.04/Dockerfile
index 02081d7ce..45c0a55a3 100644
--- a/docker/hhvm/ubuntu-16.04/Dockerfile
+++ b/docker/hhvm/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/mail-sandbox/latest/Dockerfile b/docker/mail-sandbox/latest/Dockerfile
index a3511e19e..80806aeca 100644
--- a/docker/mail-sandbox/latest/Dockerfile
+++ b/docker/mail-sandbox/latest/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/postfix:latest
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV MAILBOX_USERNAME "sandbox"
 ENV MAILBOX_PASSWORD "mail"
diff --git a/docker/nginx-dev/alpine-3/Dockerfile b/docker/nginx-dev/alpine-3/Dockerfile
index 303dd8b10..5eafaf5ef 100644
--- a/docker/nginx-dev/alpine-3/Dockerfile
+++ b/docker/nginx-dev/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/nginx:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx-dev/centos-7/Dockerfile b/docker/nginx-dev/centos-7/Dockerfile
index f3deb5ae9..0e92082dd 100644
--- a/docker/nginx-dev/centos-7/Dockerfile
+++ b/docker/nginx-dev/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/nginx:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx-dev/debian-7/Dockerfile b/docker/nginx-dev/debian-7/Dockerfile
index e9678fd46..24066d52f 100644
--- a/docker/nginx-dev/debian-7/Dockerfile
+++ b/docker/nginx-dev/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx-dev/debian-8/Dockerfile b/docker/nginx-dev/debian-8/Dockerfile
index 3f29f7a84..550862f32 100644
--- a/docker/nginx-dev/debian-8/Dockerfile
+++ b/docker/nginx-dev/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx-dev/debian-9/Dockerfile b/docker/nginx-dev/debian-9/Dockerfile
index 137261800..3efd710d8 100644
--- a/docker/nginx-dev/debian-9/Dockerfile
+++ b/docker/nginx-dev/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/nginx:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx-dev/ubuntu-12.04/Dockerfile b/docker/nginx-dev/ubuntu-12.04/Dockerfile
index 71419adf9..ba5c9ee12 100644
--- a/docker/nginx-dev/ubuntu-12.04/Dockerfile
+++ b/docker/nginx-dev/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx-dev/ubuntu-14.04/Dockerfile b/docker/nginx-dev/ubuntu-14.04/Dockerfile
index 524f9bf26..d9511ad31 100644
--- a/docker/nginx-dev/ubuntu-14.04/Dockerfile
+++ b/docker/nginx-dev/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx-dev/ubuntu-15.04/Dockerfile b/docker/nginx-dev/ubuntu-15.04/Dockerfile
index c383bafc7..5af8c5d13 100644
--- a/docker/nginx-dev/ubuntu-15.04/Dockerfile
+++ b/docker/nginx-dev/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx-dev/ubuntu-15.10/Dockerfile b/docker/nginx-dev/ubuntu-15.10/Dockerfile
index 68f1072d9..1eadb84d2 100644
--- a/docker/nginx-dev/ubuntu-15.10/Dockerfile
+++ b/docker/nginx-dev/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx-dev/ubuntu-16.04/Dockerfile b/docker/nginx-dev/ubuntu-16.04/Dockerfile
index 06c219535..dd007ce52 100644
--- a/docker/nginx-dev/ubuntu-16.04/Dockerfile
+++ b/docker/nginx-dev/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/nginx:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx/alpine-3/Dockerfile b/docker/nginx/alpine-3/Dockerfile
index de84b57a5..8fada7311 100644
--- a/docker/nginx/alpine-3/Dockerfile
+++ b/docker/nginx/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx/centos-7/Dockerfile b/docker/nginx/centos-7/Dockerfile
index 925a82013..b0473fd19 100644
--- a/docker/nginx/centos-7/Dockerfile
+++ b/docker/nginx/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx/debian-7/Dockerfile b/docker/nginx/debian-7/Dockerfile
index cf3fdbcfc..5f06dae44 100644
--- a/docker/nginx/debian-7/Dockerfile
+++ b/docker/nginx/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx/debian-8/Dockerfile b/docker/nginx/debian-8/Dockerfile
index ab010eab0..ca48146d3 100644
--- a/docker/nginx/debian-8/Dockerfile
+++ b/docker/nginx/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx/debian-9/Dockerfile b/docker/nginx/debian-9/Dockerfile
index 92db33b58..1b05692bc 100644
--- a/docker/nginx/debian-9/Dockerfile
+++ b/docker/nginx/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx/ubuntu-12.04/Dockerfile b/docker/nginx/ubuntu-12.04/Dockerfile
index 3ae43469b..dac849bed 100644
--- a/docker/nginx/ubuntu-12.04/Dockerfile
+++ b/docker/nginx/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx/ubuntu-14.04/Dockerfile b/docker/nginx/ubuntu-14.04/Dockerfile
index 186d1d83f..cd5e78091 100644
--- a/docker/nginx/ubuntu-14.04/Dockerfile
+++ b/docker/nginx/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx/ubuntu-15.04/Dockerfile b/docker/nginx/ubuntu-15.04/Dockerfile
index 76cda0c78..3f11a092e 100644
--- a/docker/nginx/ubuntu-15.04/Dockerfile
+++ b/docker/nginx/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx/ubuntu-15.10/Dockerfile b/docker/nginx/ubuntu-15.10/Dockerfile
index 480d106eb..75aa03b48 100644
--- a/docker/nginx/ubuntu-15.10/Dockerfile
+++ b/docker/nginx/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/nginx/ubuntu-16.04/Dockerfile b/docker/nginx/ubuntu-16.04/Dockerfile
index 0831bb9c4..0e9617efb 100644
--- a/docker/nginx/ubuntu-16.04/Dockerfile
+++ b/docker/nginx/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/alpine-3-php7/Dockerfile b/docker/php-apache-dev/alpine-3-php7/Dockerfile
index 7023fea69..4fc17efb1 100644
--- a/docker/php-apache-dev/alpine-3-php7/Dockerfile
+++ b/docker/php-apache-dev/alpine-3-php7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/alpine-3/Dockerfile b/docker/php-apache-dev/alpine-3/Dockerfile
index ccabe7df3..5f7c6e364 100644
--- a/docker/php-apache-dev/alpine-3/Dockerfile
+++ b/docker/php-apache-dev/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/centos-7-php56/Dockerfile b/docker/php-apache-dev/centos-7-php56/Dockerfile
index 7d5e3b760..9ffa53568 100644
--- a/docker/php-apache-dev/centos-7-php56/Dockerfile
+++ b/docker/php-apache-dev/centos-7-php56/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/centos-7/Dockerfile b/docker/php-apache-dev/centos-7/Dockerfile
index 1a81d04b9..61a3c3846 100644
--- a/docker/php-apache-dev/centos-7/Dockerfile
+++ b/docker/php-apache-dev/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/debian-7/Dockerfile b/docker/php-apache-dev/debian-7/Dockerfile
index e6d9e0b24..0cd77055c 100644
--- a/docker/php-apache-dev/debian-7/Dockerfile
+++ b/docker/php-apache-dev/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/debian-8-php7/Dockerfile b/docker/php-apache-dev/debian-8-php7/Dockerfile
index 6bfb3cadc..d4b931f64 100644
--- a/docker/php-apache-dev/debian-8-php7/Dockerfile
+++ b/docker/php-apache-dev/debian-8-php7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/debian-8/Dockerfile b/docker/php-apache-dev/debian-8/Dockerfile
index 6757389e9..3a8fd9f4f 100644
--- a/docker/php-apache-dev/debian-8/Dockerfile
+++ b/docker/php-apache-dev/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/debian-9/Dockerfile b/docker/php-apache-dev/debian-9/Dockerfile
index 97a0a147f..f7fb5c277 100644
--- a/docker/php-apache-dev/debian-9/Dockerfile
+++ b/docker/php-apache-dev/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/ubuntu-12.04/Dockerfile b/docker/php-apache-dev/ubuntu-12.04/Dockerfile
index f0a28b25a..dc8e41e61 100644
--- a/docker/php-apache-dev/ubuntu-12.04/Dockerfile
+++ b/docker/php-apache-dev/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/ubuntu-14.04/Dockerfile b/docker/php-apache-dev/ubuntu-14.04/Dockerfile
index 61f306dd8..eb45877ee 100644
--- a/docker/php-apache-dev/ubuntu-14.04/Dockerfile
+++ b/docker/php-apache-dev/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/ubuntu-15.04/Dockerfile b/docker/php-apache-dev/ubuntu-15.04/Dockerfile
index aaaed9e93..1e588a0bd 100644
--- a/docker/php-apache-dev/ubuntu-15.04/Dockerfile
+++ b/docker/php-apache-dev/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/ubuntu-15.10/Dockerfile b/docker/php-apache-dev/ubuntu-15.10/Dockerfile
index 5e96d6f7a..5d4f8c39d 100644
--- a/docker/php-apache-dev/ubuntu-15.10/Dockerfile
+++ b/docker/php-apache-dev/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache-dev/ubuntu-16.04/Dockerfile b/docker/php-apache-dev/ubuntu-16.04/Dockerfile
index ee6a5a232..755dee89c 100644
--- a/docker/php-apache-dev/ubuntu-16.04/Dockerfile
+++ b/docker/php-apache-dev/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/alpine-3-php7/Dockerfile b/docker/php-apache/alpine-3-php7/Dockerfile
index 953eea2af..837d12766 100644
--- a/docker/php-apache/alpine-3-php7/Dockerfile
+++ b/docker/php-apache/alpine-3-php7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/alpine-3/Dockerfile b/docker/php-apache/alpine-3/Dockerfile
index ac6ee1b60..07226ae38 100644
--- a/docker/php-apache/alpine-3/Dockerfile
+++ b/docker/php-apache/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/centos-7-php56/Dockerfile b/docker/php-apache/centos-7-php56/Dockerfile
index 086a5ac4f..99f2a8898 100644
--- a/docker/php-apache/centos-7-php56/Dockerfile
+++ b/docker/php-apache/centos-7-php56/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/centos-7/Dockerfile b/docker/php-apache/centos-7/Dockerfile
index 5c8a60ec7..3a5e341be 100644
--- a/docker/php-apache/centos-7/Dockerfile
+++ b/docker/php-apache/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/debian-7/Dockerfile b/docker/php-apache/debian-7/Dockerfile
index 29325af7c..dc31ed7df 100644
--- a/docker/php-apache/debian-7/Dockerfile
+++ b/docker/php-apache/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/debian-8-php7/Dockerfile b/docker/php-apache/debian-8-php7/Dockerfile
index 194bae0c0..8fad28f2e 100644
--- a/docker/php-apache/debian-8-php7/Dockerfile
+++ b/docker/php-apache/debian-8-php7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/debian-8/Dockerfile b/docker/php-apache/debian-8/Dockerfile
index 77ae8c9da..fa8e693c4 100644
--- a/docker/php-apache/debian-8/Dockerfile
+++ b/docker/php-apache/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/debian-9/Dockerfile b/docker/php-apache/debian-9/Dockerfile
index 42b2ad5d3..cc860da76 100644
--- a/docker/php-apache/debian-9/Dockerfile
+++ b/docker/php-apache/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/ubuntu-12.04/Dockerfile b/docker/php-apache/ubuntu-12.04/Dockerfile
index b9833546c..134b4cc9a 100644
--- a/docker/php-apache/ubuntu-12.04/Dockerfile
+++ b/docker/php-apache/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/ubuntu-14.04/Dockerfile b/docker/php-apache/ubuntu-14.04/Dockerfile
index 31f9aaf90..ec68346d1 100644
--- a/docker/php-apache/ubuntu-14.04/Dockerfile
+++ b/docker/php-apache/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/ubuntu-15.04/Dockerfile b/docker/php-apache/ubuntu-15.04/Dockerfile
index 8fc8d3199..177484ddd 100644
--- a/docker/php-apache/ubuntu-15.04/Dockerfile
+++ b/docker/php-apache/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/ubuntu-15.10/Dockerfile b/docker/php-apache/ubuntu-15.10/Dockerfile
index 648e613ee..79332da7e 100644
--- a/docker/php-apache/ubuntu-15.10/Dockerfile
+++ b/docker/php-apache/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-apache/ubuntu-16.04/Dockerfile b/docker/php-apache/ubuntu-16.04/Dockerfile
index 4d096af9e..4ca4bb494 100644
--- a/docker/php-apache/ubuntu-16.04/Dockerfile
+++ b/docker/php-apache/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-dev/alpine-3-php7/Dockerfile b/docker/php-dev/alpine-3-php7/Dockerfile
index 3dc3e2ab9..c8aac2b7f 100644
--- a/docker/php-dev/alpine-3-php7/Dockerfile
+++ b/docker/php-dev/alpine-3-php7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/alpine-3/Dockerfile b/docker/php-dev/alpine-3/Dockerfile
index 8d34c5176..d6bdc859e 100644
--- a/docker/php-dev/alpine-3/Dockerfile
+++ b/docker/php-dev/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/centos-7-php56/Dockerfile b/docker/php-dev/centos-7-php56/Dockerfile
index e4977a6f3..bce27f112 100644
--- a/docker/php-dev/centos-7-php56/Dockerfile
+++ b/docker/php-dev/centos-7-php56/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/centos-7/Dockerfile b/docker/php-dev/centos-7/Dockerfile
index 5d0f403be..8dace42e0 100644
--- a/docker/php-dev/centos-7/Dockerfile
+++ b/docker/php-dev/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/debian-7/Dockerfile b/docker/php-dev/debian-7/Dockerfile
index c7a4371e2..72489ebaa 100644
--- a/docker/php-dev/debian-7/Dockerfile
+++ b/docker/php-dev/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/debian-8-php7/Dockerfile b/docker/php-dev/debian-8-php7/Dockerfile
index 511f42614..76861c037 100644
--- a/docker/php-dev/debian-8-php7/Dockerfile
+++ b/docker/php-dev/debian-8-php7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/debian-8/Dockerfile b/docker/php-dev/debian-8/Dockerfile
index b0b015e39..2b7c24232 100644
--- a/docker/php-dev/debian-8/Dockerfile
+++ b/docker/php-dev/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/debian-9/Dockerfile b/docker/php-dev/debian-9/Dockerfile
index 3c46b281a..83e3e0daf 100644
--- a/docker/php-dev/debian-9/Dockerfile
+++ b/docker/php-dev/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/ubuntu-12.04/Dockerfile b/docker/php-dev/ubuntu-12.04/Dockerfile
index 175d81126..5633b733c 100644
--- a/docker/php-dev/ubuntu-12.04/Dockerfile
+++ b/docker/php-dev/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/ubuntu-14.04/Dockerfile b/docker/php-dev/ubuntu-14.04/Dockerfile
index 6f9a14d68..b62f28c9f 100644
--- a/docker/php-dev/ubuntu-14.04/Dockerfile
+++ b/docker/php-dev/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/ubuntu-15.04/Dockerfile b/docker/php-dev/ubuntu-15.04/Dockerfile
index 5bfa6831f..ecef17ef1 100644
--- a/docker/php-dev/ubuntu-15.04/Dockerfile
+++ b/docker/php-dev/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/ubuntu-15.10/Dockerfile b/docker/php-dev/ubuntu-15.10/Dockerfile
index 2d8c78f7e..d1e80c2ff 100644
--- a/docker/php-dev/ubuntu-15.10/Dockerfile
+++ b/docker/php-dev/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-dev/ubuntu-16.04/Dockerfile b/docker/php-dev/ubuntu-16.04/Dockerfile
index 27cb39726..69b102342 100644
--- a/docker/php-dev/ubuntu-16.04/Dockerfile
+++ b/docker/php-dev/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/php-nginx-dev/alpine-3-php7/Dockerfile b/docker/php-nginx-dev/alpine-3-php7/Dockerfile
index e34f744ca..7db5e205d 100644
--- a/docker/php-nginx-dev/alpine-3-php7/Dockerfile
+++ b/docker/php-nginx-dev/alpine-3-php7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3-php7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx-dev/alpine-3/Dockerfile b/docker/php-nginx-dev/alpine-3/Dockerfile
index f67b6060f..497ca6bd1 100644
--- a/docker/php-nginx-dev/alpine-3/Dockerfile
+++ b/docker/php-nginx-dev/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx-dev/centos-7-php56/Dockerfile b/docker/php-nginx-dev/centos-7-php56/Dockerfile
index 12ac4abe2..895148816 100644
--- a/docker/php-nginx-dev/centos-7-php56/Dockerfile
+++ b/docker/php-nginx-dev/centos-7-php56/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7-php56
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx-dev/centos-7/Dockerfile b/docker/php-nginx-dev/centos-7/Dockerfile
index b724bbcf6..49701f02c 100644
--- a/docker/php-nginx-dev/centos-7/Dockerfile
+++ b/docker/php-nginx-dev/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx-dev/debian-7/Dockerfile b/docker/php-nginx-dev/debian-7/Dockerfile
index 82bb789ba..d63386756 100644
--- a/docker/php-nginx-dev/debian-7/Dockerfile
+++ b/docker/php-nginx-dev/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx-dev/debian-8-php7/Dockerfile b/docker/php-nginx-dev/debian-8-php7/Dockerfile
index 4d73a7f3e..0a9a1566e 100644
--- a/docker/php-nginx-dev/debian-8-php7/Dockerfile
+++ b/docker/php-nginx-dev/debian-8-php7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8-php7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx-dev/debian-8/Dockerfile b/docker/php-nginx-dev/debian-8/Dockerfile
index c1e6efa26..db01819b1 100644
--- a/docker/php-nginx-dev/debian-8/Dockerfile
+++ b/docker/php-nginx-dev/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx-dev/debian-9/Dockerfile b/docker/php-nginx-dev/debian-9/Dockerfile
index ca5b5e8ac..dae698513 100644
--- a/docker/php-nginx-dev/debian-9/Dockerfile
+++ b/docker/php-nginx-dev/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile
index b5e7930dc..ea0192d0e 100644
--- a/docker/php-nginx-dev/ubuntu-12.04/Dockerfile
+++ b/docker/php-nginx-dev/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile
index c22b962e4..fa90df977 100644
--- a/docker/php-nginx-dev/ubuntu-14.04/Dockerfile
+++ b/docker/php-nginx-dev/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile
index ea183986e..8e74bc3ae 100644
--- a/docker/php-nginx-dev/ubuntu-15.04/Dockerfile
+++ b/docker/php-nginx-dev/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile
index 14d6c9f17..f1c4e655f 100644
--- a/docker/php-nginx-dev/ubuntu-15.10/Dockerfile
+++ b/docker/php-nginx-dev/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile
index 0134c1e81..568a7312c 100644
--- a/docker/php-nginx-dev/ubuntu-16.04/Dockerfile
+++ b/docker/php-nginx-dev/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-dev:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/alpine-3-php7/Dockerfile b/docker/php-nginx/alpine-3-php7/Dockerfile
index bb5cc235a..4ba90e2ff 100644
--- a/docker/php-nginx/alpine-3-php7/Dockerfile
+++ b/docker/php-nginx/alpine-3-php7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3-php7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/alpine-3/Dockerfile b/docker/php-nginx/alpine-3/Dockerfile
index 66ec37f71..884a084f1 100644
--- a/docker/php-nginx/alpine-3/Dockerfile
+++ b/docker/php-nginx/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/centos-7-php56/Dockerfile b/docker/php-nginx/centos-7-php56/Dockerfile
index c455f5ae1..7c3f73b98 100644
--- a/docker/php-nginx/centos-7-php56/Dockerfile
+++ b/docker/php-nginx/centos-7-php56/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:centos-7-php56
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/centos-7/Dockerfile b/docker/php-nginx/centos-7/Dockerfile
index 8f7ff5a7b..8596f014d 100644
--- a/docker/php-nginx/centos-7/Dockerfile
+++ b/docker/php-nginx/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/debian-7/Dockerfile b/docker/php-nginx/debian-7/Dockerfile
index b61db5b39..6b475297d 100644
--- a/docker/php-nginx/debian-7/Dockerfile
+++ b/docker/php-nginx/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/debian-8-php7/Dockerfile b/docker/php-nginx/debian-8-php7/Dockerfile
index 75be817a1..469073a38 100644
--- a/docker/php-nginx/debian-8-php7/Dockerfile
+++ b/docker/php-nginx/debian-8-php7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:debian-8-php7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/debian-8/Dockerfile b/docker/php-nginx/debian-8/Dockerfile
index 1fa80664e..af8a8018b 100644
--- a/docker/php-nginx/debian-8/Dockerfile
+++ b/docker/php-nginx/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/debian-9/Dockerfile b/docker/php-nginx/debian-9/Dockerfile
index 4f98a2f77..8ae035179 100644
--- a/docker/php-nginx/debian-9/Dockerfile
+++ b/docker/php-nginx/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/ubuntu-12.04/Dockerfile b/docker/php-nginx/ubuntu-12.04/Dockerfile
index 5b122179f..1f25f02c7 100644
--- a/docker/php-nginx/ubuntu-12.04/Dockerfile
+++ b/docker/php-nginx/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/ubuntu-14.04/Dockerfile b/docker/php-nginx/ubuntu-14.04/Dockerfile
index fba1250f3..c907b7e59 100644
--- a/docker/php-nginx/ubuntu-14.04/Dockerfile
+++ b/docker/php-nginx/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/ubuntu-15.04/Dockerfile b/docker/php-nginx/ubuntu-15.04/Dockerfile
index f203823c7..9c689bbc6 100644
--- a/docker/php-nginx/ubuntu-15.04/Dockerfile
+++ b/docker/php-nginx/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/ubuntu-15.10/Dockerfile b/docker/php-nginx/ubuntu-15.10/Dockerfile
index 1203e5a8b..088f86b51 100644
--- a/docker/php-nginx/ubuntu-15.10/Dockerfile
+++ b/docker/php-nginx/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php-nginx/ubuntu-16.04/Dockerfile b/docker/php-nginx/ubuntu-16.04/Dockerfile
index 1ab1c1a2c..5ded5f6ae 100644
--- a/docker/php-nginx/ubuntu-16.04/Dockerfile
+++ b/docker/php-nginx/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/alpine-3-php7/Dockerfile b/docker/php/alpine-3-php7/Dockerfile
index 5889d4e27..2a00673a9 100644
--- a/docker/php/alpine-3-php7/Dockerfile
+++ b/docker/php/alpine-3-php7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/alpine-3/Dockerfile b/docker/php/alpine-3/Dockerfile
index e5caeae1d..7d09fd17e 100644
--- a/docker/php/alpine-3/Dockerfile
+++ b/docker/php/alpine-3/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile
index d16d63cdb..0d01af29e 100644
--- a/docker/php/centos-7-php56/Dockerfile
+++ b/docker/php/centos-7-php56/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile
index f83bb2633..91995c111 100644
--- a/docker/php/centos-7/Dockerfile
+++ b/docker/php/centos-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:centos-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile
index 23eb9cf4e..950e4df19 100644
--- a/docker/php/debian-7/Dockerfile
+++ b/docker/php/debian-7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-7
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile
index 4f7e54693..4f22b3daf 100644
--- a/docker/php/debian-8-php7/Dockerfile
+++ b/docker/php/debian-8-php7/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile
index b929a0aa1..7903c93e9 100644
--- a/docker/php/debian-8/Dockerfile
+++ b/docker/php/debian-8/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-8
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile
index 1282191f4..aa257fae1 100644
--- a/docker/php/debian-9/Dockerfile
+++ b/docker/php/debian-9/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:debian-9
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile
index cf90db949..8b3b59fd0 100644
--- a/docker/php/ubuntu-12.04/Dockerfile
+++ b/docker/php/ubuntu-12.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-12.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile
index 94d80749d..6e0c3a230 100644
--- a/docker/php/ubuntu-14.04/Dockerfile
+++ b/docker/php/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile
index 4d8ca9194..15d586c5c 100644
--- a/docker/php/ubuntu-15.04/Dockerfile
+++ b/docker/php/ubuntu-15.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile
index 521831bab..2cf56cd68 100644
--- a/docker/php/ubuntu-15.10/Dockerfile
+++ b/docker/php/ubuntu-15.10/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-15.10
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile
index f3b2f642c..9e898ca70 100644
--- a/docker/php/ubuntu-16.04/Dockerfile
+++ b/docker/php/ubuntu-16.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:ubuntu-16.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app
 ENV WEB_DOCUMENT_INDEX index.php
diff --git a/docker/piwik/ubuntu-14.04/Dockerfile b/docker/piwik/ubuntu-14.04/Dockerfile
index e70b38d1f..9a5de62c5 100644
--- a/docker/piwik/ubuntu-14.04/Dockerfile
+++ b/docker/piwik/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-nginx:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT  /app/piwik/
 ENV PIWIK_URL          http://example.com/
diff --git a/docker/postfix/latest/Dockerfile b/docker/postfix/latest/Dockerfile
index 9a394cdab..bf6fd030c 100644
--- a/docker/postfix/latest/Dockerfile
+++ b/docker/postfix/latest/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:latest
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 COPY conf/ /opt/docker/
 
diff --git a/docker/samson-deployment/latest/Dockerfile b/docker/samson-deployment/latest/Dockerfile
index d49a4e352..0a9a1cc25 100644
--- a/docker/samson-deployment/latest/Dockerfile
+++ b/docker/samson-deployment/latest/Dockerfile
@@ -8,7 +8,7 @@ FROM zendesk/samson:latest
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 
 ###############################################################################
diff --git a/docker/sphinx/latest/Dockerfile b/docker/sphinx/latest/Dockerfile
index 6859f7344..a09d6690e 100644
--- a/docker/sphinx/latest/Dockerfile
+++ b/docker/sphinx/latest/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/bootstrap:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 RUN /usr/local/bin/apk-install \
     # General sphinx
diff --git a/docker/ssh/latest/Dockerfile b/docker/ssh/latest/Dockerfile
index 031601219..3f8e2232c 100644
--- a/docker/ssh/latest/Dockerfile
+++ b/docker/ssh/latest/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base-app:latest
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 RUN /opt/docker/bin/control.sh service.enable ssh
 
diff --git a/docker/storage/latest/Dockerfile b/docker/storage/latest/Dockerfile
index 6affa3a95..f49ba5bb2 100644
--- a/docker/storage/latest/Dockerfile
+++ b/docker/storage/latest/Dockerfile
@@ -8,7 +8,7 @@ FROM busybox:latest
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 RUN mkdir /storage/ \
     && chmod 777 /storage/
diff --git a/docker/typo3/ubuntu-14.04/Dockerfile b/docker/typo3/ubuntu-14.04/Dockerfile
index d80066324..9c3f58845 100644
--- a/docker/typo3/ubuntu-14.04/Dockerfile
+++ b/docker/typo3/ubuntu-14.04/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/php-apache:ubuntu-14.04
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV WEB_DOCUMENT_ROOT /app/web/
 
diff --git a/docker/varnish/latest/Dockerfile b/docker/varnish/latest/Dockerfile
index 9a34791c8..1df291520 100644
--- a/docker/varnish/latest/Dockerfile
+++ b/docker/varnish/latest/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:alpine-3
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV VARNISH_PORT    80
 
diff --git a/docker/vsftp/latest/Dockerfile b/docker/vsftp/latest/Dockerfile
index 0e57137e3..a9462a09c 100644
--- a/docker/vsftp/latest/Dockerfile
+++ b/docker/vsftp/latest/Dockerfile
@@ -8,7 +8,7 @@ FROM webdevops/base:latest
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 
 ENV FTP_USER     application
 ENV FTP_PASSWORD application
diff --git a/template/Dockerfile/docker.jinja2 b/template/Dockerfile/docker.jinja2
index db2c0b7c7..c34c818e1 100644
--- a/template/Dockerfile/docker.jinja2
+++ b/template/Dockerfile/docker.jinja2
@@ -10,7 +10,7 @@ FROM {{ image }}:{{ tag }}
 MAINTAINER info@webdevops.io
 LABEL vendor=WebDevOps.io
 LABEL io.webdevops.layout=8
-LABEL io.webdevops.version=0.52.0
+LABEL io.webdevops.version=0.53.0
 {%- endmacro %}
 
 {%- macro add(source, target) -%}