diff --git a/.travis.yml b/.travis.yml
index fa65ca1..025ed2b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,6 +15,8 @@ env:
   - DIR=dev/ VERSION=latest
   - DIR=dev/ VERSION=5.5
   - DIR=dev/ VERSION=5.6
+  - DIR=dev/ VERSION=7.0
+  - DIR=dev/ VERSION=7.1
 
 before_install:
 - make -C ${DIR} pull VERSION=${VERSION}
diff --git a/dev/7.0/Dockerfile b/dev/7.0/Dockerfile
new file mode 100644
index 0000000..7b60f5a
--- /dev/null
+++ b/dev/7.0/Dockerfile
@@ -0,0 +1,6 @@
+FROM chialab/php:7.0
+MAINTAINER dev@chialab.it
+
+# Install XDebug.
+RUN pecl install xdebug \
+    && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini
diff --git a/dev/7.0/apache/Dockerfile b/dev/7.0/apache/Dockerfile
new file mode 100644
index 0000000..de0519a
--- /dev/null
+++ b/dev/7.0/apache/Dockerfile
@@ -0,0 +1,6 @@
+FROM chialab/php:7.0-apache
+MAINTAINER dev@chialab.it
+
+# Install XDebug.
+RUN pecl install xdebug \
+    && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini
diff --git a/dev/7.0/fpm/Dockerfile b/dev/7.0/fpm/Dockerfile
new file mode 100644
index 0000000..953c522
--- /dev/null
+++ b/dev/7.0/fpm/Dockerfile
@@ -0,0 +1,6 @@
+FROM chialab/php:7.0-fpm
+MAINTAINER dev@chialab.it
+
+# Install XDebug.
+RUN pecl install xdebug \
+    && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini
diff --git a/dev/7.1/Dockerfile b/dev/7.1/Dockerfile
new file mode 100644
index 0000000..2401477
--- /dev/null
+++ b/dev/7.1/Dockerfile
@@ -0,0 +1,6 @@
+FROM chialab/php:7.1
+MAINTAINER dev@chialab.it
+
+# Install XDebug.
+RUN pecl install xdebug \
+    && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini
diff --git a/dev/7.1/apache/Dockerfile b/dev/7.1/apache/Dockerfile
new file mode 100644
index 0000000..6d084ea
--- /dev/null
+++ b/dev/7.1/apache/Dockerfile
@@ -0,0 +1,6 @@
+FROM chialab/php:7.1-apache
+MAINTAINER dev@chialab.it
+
+# Install XDebug.
+RUN pecl install xdebug \
+    && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini
diff --git a/dev/7.1/fpm/Dockerfile b/dev/7.1/fpm/Dockerfile
new file mode 100644
index 0000000..7696195
--- /dev/null
+++ b/dev/7.1/fpm/Dockerfile
@@ -0,0 +1,6 @@
+FROM chialab/php:7.1-fpm
+MAINTAINER dev@chialab.it
+
+# Install XDebug.
+RUN pecl install xdebug \
+    && echo "zend_extension=\"$(php-config --extension-dir)/xdebug.so\"" > $PHP_INI_DIR/conf.d/xdebug.ini
diff --git a/dev/Makefile b/dev/Makefile
index d88ab39..6b48d8b 100644
--- a/dev/Makefile
+++ b/dev/Makefile
@@ -25,10 +25,11 @@ EXTENSIONS := \
 	pdo_mysql \
 	pdo_pgsql \
 	pgsql \
+	Xdebug \
 	zip
 ifneq ($(VERSION),$(filter 7.0 7.1 latest, $(VERSION)))
 	# Add more extensions to 5.x series images.
-	EXTENSIONS += memcached mysql redis Xdebug
+	EXTENSIONS += memcached mysql redis
 endif
 
 pull: