diff --git a/docker-compose.yml b/docker-compose.yml
index 1d61f22..58e86c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,7 +9,7 @@ mariadb:
         - MYSQL_ROOT_PASSWORD=MyPassWord48
 
 php:
-    build: ./php-fpm
+    image: daiko/phpfpm-dev:latest
     expose:
         - 9000
     volumes:
@@ -38,7 +38,7 @@ nginx:
         - php
 
 mailcatcher:
-    build: ./mailcatcher
+    image: daiko/mailcatcher:latest
     volumes:
         - ./config/smtpd.conf:/etc/smtpd.conf
         - ./config/mailname:/etc/mailname
diff --git a/mailcatcher/Dockerfile b/mailcatcher/Dockerfile
deleted file mode 100644
index b78e1bc..0000000
--- a/mailcatcher/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM ruby
-
-RUN gem install mailcatcher
-
-ENTRYPOINT ["mailcatcher", "-f", "--ip", "0.0.0.0", "--smtp-port", "25", "--no-quit"]
diff --git a/php-fpm/Dockerfile b/php-fpm/Dockerfile
deleted file mode 100644
index 31d380e..0000000
--- a/php-fpm/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM php:7-fpm
-
-RUN curl -o /tmp/xdebug.tgz https://xdebug.org/files/xdebug-2.5.0.tgz && \
-    mkdir -p /usr/src/php/ext/xdebug && \
-    tar xzf /tmp/xdebug.tgz -C /usr/src/php/ext/xdebug/ && \
-    rm /tmp/xdebug.tgz && \
-    mv /usr/src/php/ext/xdebug/xdebug*/* /usr/src/php/ext/xdebug/
-
-RUN apt-get update && apt-get install -y \
-	    ssmtp \
-        libfreetype6-dev \
-        libjpeg62-turbo-dev \
-        libmcrypt-dev \
-        libpng12-dev \
-        mariadb-client \
-    && docker-php-ext-install -j$(nproc) iconv mcrypt gd zip sockets \
-    && docker-php-ext-install -j$(nproc) mysqli pdo pdo_mysql \
-    && docker-php-ext-install -j$(nproc) xdebug\
-    && apt-get purge -y --auto-remove $buildDeps \
-	&& cd /usr/src/php/ext/xdebug/ \
-	&& make clean \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-RUN setcap cap_net_raw=eip /usr/local/bin/php