diff --git a/support/Dockerfile.db b/support/Dockerfile.mariadb10
similarity index 100%
rename from support/Dockerfile.db
rename to support/Dockerfile.mariadb10
diff --git a/support/Dockerfile.web b/support/Dockerfile.php-apache
similarity index 100%
rename from support/Dockerfile.web
rename to support/Dockerfile.php-apache
diff --git a/support/Dockerfile.web+ic b/support/Dockerfile.php-apache+ic
similarity index 100%
rename from support/Dockerfile.web+ic
rename to support/Dockerfile.php-apache+ic
diff --git a/support/Dockerfile.cli b/support/Dockerfile.php-cli
similarity index 100%
rename from support/Dockerfile.cli
rename to support/Dockerfile.php-cli
diff --git a/support/Dockerfile.cli+ic b/support/Dockerfile.php-cli+ic
similarity index 100%
rename from support/Dockerfile.cli+ic
rename to support/Dockerfile.php-cli+ic
diff --git a/support/build b/support/build
index ecf88f6..c75ade0 100755
--- a/support/build
+++ b/support/build
@@ -2,8 +2,8 @@
 # -*- coding: utf-8 mode: sh -*- vim:sw=4:sts=4:et:ai:si:sta:fenc=utf-8
 MYDIR="$(cd "$(dirname -- "$0")"; pwd)"
 "$MYDIR/rundk" --bs --ue --ci || exit 1
-PROJDIR=; COMPOSERDIR=; COMPOSERPHAR=; VENDORDIR=; BUILDENV0=; BUILDENV=; BUILD_IMAGES=(web db); BUILD_FLAVOUR=; DIST=; IMAGENAME=
-export BUILD_FLAVOUR
+PROJDIR=; COMPOSERDIR=; COMPOSERPHAR=; VENDORDIR=; BUILDENV0=; BUILDENV=
+BUILD_IMAGES=(php-apache mariadb10); export BUILD_FLAVOUR=; DIST=; IMAGENAME=
 source "$MYDIR/rundk" || exit 1
 source "$PROJDIR/$VENDORDIR/nulib/php/load.sh" || exit 1
 require: template
diff --git a/support/rundk.userconf b/support/rundk.userconf
index 49e3c76..0185be9 100644
--- a/support/rundk.userconf
+++ b/support/rundk.userconf
@@ -14,7 +14,7 @@ BUILDENV0=
 BUILDENV=
 
 # Listes des images que le script build construit automatiquement
-BUILD_IMAGES=(web db)
+BUILD_IMAGES=(php-apache mariadb10)
 BUILD_FLAVOUR=
 
 ## En ce qui concerne DIST et IMAGENAME, les valeurs dans BUILDENV prennent le