diff --git a/dev/5.6/Dockerfile b/dev/5.6/Dockerfile
deleted file mode 100644
index a18549c..0000000
--- a/dev/5.6/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:5.6
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/5.6/apache/Dockerfile b/dev/5.6/apache/Dockerfile
deleted file mode 100644
index 82f8247..0000000
--- a/dev/5.6/apache/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:5.6-apache
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/5.6/fpm/Dockerfile b/dev/5.6/fpm/Dockerfile
deleted file mode 100644
index 2b136cc..0000000
--- a/dev/5.6/fpm/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:5.6-fpm
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.0/Dockerfile b/dev/7.0/Dockerfile
deleted file mode 100644
index f5c4652..0000000
--- a/dev/7.0/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.0
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.0/apache/Dockerfile b/dev/7.0/apache/Dockerfile
deleted file mode 100644
index d155793..0000000
--- a/dev/7.0/apache/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.0-apache
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.0/fpm/Dockerfile b/dev/7.0/fpm/Dockerfile
deleted file mode 100644
index 30fbc59..0000000
--- a/dev/7.0/fpm/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.0-fpm
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.1/Dockerfile b/dev/7.1/Dockerfile
deleted file mode 100644
index b0d0943..0000000
--- a/dev/7.1/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.1
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.1/apache/Dockerfile b/dev/7.1/apache/Dockerfile
deleted file mode 100644
index 0270bce..0000000
--- a/dev/7.1/apache/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.1-apache
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.1/fpm/Dockerfile b/dev/7.1/fpm/Dockerfile
deleted file mode 100644
index ad34708..0000000
--- a/dev/7.1/fpm/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.1-fpm
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.2/Dockerfile b/dev/7.2/Dockerfile
deleted file mode 100644
index e72c4ba..0000000
--- a/dev/7.2/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.2
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.2/apache/Dockerfile b/dev/7.2/apache/Dockerfile
deleted file mode 100644
index b1a3b94..0000000
--- a/dev/7.2/apache/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.2-apache
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.2/fpm/Dockerfile b/dev/7.2/fpm/Dockerfile
deleted file mode 100644
index 578d2ba..0000000
--- a/dev/7.2/fpm/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.2-fpm
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.3/Dockerfile b/dev/7.3/Dockerfile
deleted file mode 100644
index ea387c4..0000000
--- a/dev/7.3/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.3
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.3/apache/Dockerfile b/dev/7.3/apache/Dockerfile
deleted file mode 100644
index e515591..0000000
--- a/dev/7.3/apache/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.3-apache
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.3/fpm/Dockerfile b/dev/7.3/fpm/Dockerfile
deleted file mode 100644
index 0c955db..0000000
--- a/dev/7.3/fpm/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.3-fpm
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.4/Dockerfile b/dev/7.4/Dockerfile
deleted file mode 100644
index c9a42e5..0000000
--- a/dev/7.4/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.4
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.4/apache/Dockerfile b/dev/7.4/apache/Dockerfile
deleted file mode 100644
index 1e03bf4..0000000
--- a/dev/7.4/apache/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.4-apache
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/7.4/fpm/Dockerfile b/dev/7.4/fpm/Dockerfile
deleted file mode 100644
index db6ad42..0000000
--- a/dev/7.4/fpm/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:7.4-fpm
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/8.0/Dockerfile b/dev/8.0/Dockerfile
deleted file mode 100644
index 830cb86..0000000
--- a/dev/8.0/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:8.0
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/8.0/apache/Dockerfile b/dev/8.0/apache/Dockerfile
deleted file mode 100644
index 70b95e7..0000000
--- a/dev/8.0/apache/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:8.0-apache
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/8.0/fpm/Dockerfile b/dev/8.0/fpm/Dockerfile
deleted file mode 100644
index ef2230d..0000000
--- a/dev/8.0/fpm/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM chialab/php:8.0-fpm
-LABEL maintainer="dev@chialab.io"
-
-# Install XDebug.
-RUN install-php-extensions xdebug
diff --git a/dev/Dockerfile b/dev/Dockerfile
index 05426fc..eded13b 100644
--- a/dev/Dockerfile
+++ b/dev/Dockerfile
@@ -1,4 +1,5 @@
-FROM chialab/php:latest
+ARG BASE_IMAGE=latest
+FROM chialab/php:${BASE_IMAGE}
 LABEL maintainer="dev@chialab.io"
 
 # Install XDebug.
diff --git a/dev/Makefile b/dev/Makefile
index 1cd4570..3294302 100644
--- a/dev/Makefile
+++ b/dev/Makefile
@@ -41,11 +41,7 @@ endif
 
 build:
 	@echo " =====> Building $(IMAGE):$(VERSION)..."
-	@dir="$(subst -,/,$(VERSION))"; \
-	if [[ "$(VERSION)" == 'latest' ]]; then \
-		dir='.'; \
-	fi; \
-	docker image build --quiet -t $(IMAGE):$(VERSION) $${dir}
+	docker image build --quiet --build-arg 'BASE_IMAGE=$(VERSION)' -t $(IMAGE):$(VERSION) .
 
 test:
 	@echo -e "=====> Testing loaded extensions... \c"
diff --git a/dev/README.md b/dev/README.md
index de1ec22..06bc54c 100644
--- a/dev/README.md
+++ b/dev/README.md
@@ -8,26 +8,26 @@ An automated build is set up, so they should be always up-to-date with the Docke
 
 For more production-like environments, you might want to choose an [image *without* XDebug installed](https://hub.docker.com/r/chialab/php/), instead.
 
-## Available tags and `Dockerfile` links
-- [`latest` (_dev/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/Dockerfile)
-- [`5.6` (_dev/5.6/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/5.6/Dockerfile)
-- [`5.6-apache` (_dev/5.6/apache/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/5.6/apache/Dockerfile)
-- [`5.6-fpm` (_dev/5.6/fpm/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/5.6/fpm/Dockerfile)
-- [`7.0` (_dev/7.0/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.0/Dockerfile)
-- [`7.0-apache` (_dev/7.0/apache/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.0/apache/Dockerfile)
-- [`7.0-fpm` (_dev/7.0/fpm/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.0/fpm/Dockerfile)
-- [`7.1` (_dev/7.1/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.1/Dockerfile)
-- [`7.1-apache` (_dev/7.1/apache/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.1/apache/Dockerfile)
-- [`7.1-fpm` (_dev/7.1/fpm/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.1/fpm/Dockerfile)
-- [`7.2` (_dev/7.2/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.2/Dockerfile)
-- [`7.2-apache` (_dev/7.2/apache/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.2/apache/Dockerfile)
-- [`7.2-fpm` (_dev/7.2/fpm/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.2/fpm/Dockerfile)
-- [`7.3` (_dev/7.3/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.3/Dockerfile)
-- [`7.3-apache` (_dev/7.3/apache/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.3/apache/Dockerfile)
-- [`7.3-fpm` (_dev/7.3/fpm/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.3/fpm/Dockerfile)
-- [`7.4` (_dev/7.4/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.4/Dockerfile)
-- [`7.4-apache` (_dev/7.4/apache/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.4/apache/Dockerfile)
-- [`7.4-fpm` (_dev/7.4/fpm/Dockerfile_)](https://github.com/Chialab/docker-php/blob/master/dev/7.4/fpm/Dockerfile)
+## Available tags
+- `latest`
+- `5.6`
+- `5.6-apache`
+- `5.6-fpm`
+- `7.0`
+- `7.0-apache`
+- `7.0-fpm`
+- `7.1`
+- `7.1-apache`
+- `7.1-fpm`
+- `7.2`
+- `7.2-apache`
+- `7.2-fpm`
+- `7.3`
+- `7.3-apache`
+- `7.3-fpm`
+- `7.4`
+- `7.4-apache`
+- `7.4-fpm`
 
 As you might have guessed, all tags are built on top of the corresponding tag of the official image. Not all tags are supported in order to easen manteinance.