diff --git a/docker-compose.yml b/docker-compose.yml
index 549458d1..50cb5e21 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -15,12 +15,12 @@ services:
         links:
             - php
 
-### PHP Container ###########################################
+### PHP-FPM Container #######################################
 
-    php:
+    php-fpm:
         build:
-            context: ./php
-            dockerfile: Dockerfile-php-70
+            context: ./php-fpm
+            dockerfile: Dockerfile-70
         volumes:
             - ../:/var/www/laravel
             - ./logs/php/:/usr/local/var/log
diff --git a/php/Dockerfile-php-55 b/php-fpm/Dockerfile-55
similarity index 100%
rename from php/Dockerfile-php-55
rename to php-fpm/Dockerfile-55
diff --git a/php/Dockerfile-php-56 b/php-fpm/Dockerfile-56
similarity index 100%
rename from php/Dockerfile-php-56
rename to php-fpm/Dockerfile-56
diff --git a/php/Dockerfile-php-70 b/php-fpm/Dockerfile-70
similarity index 100%
rename from php/Dockerfile-php-70
rename to php-fpm/Dockerfile-70
diff --git a/php/laravel.ini b/php-fpm/laravel.ini
similarity index 100%
rename from php/laravel.ini
rename to php-fpm/laravel.ini
diff --git a/php/laravel.pool.conf b/php-fpm/laravel.pool.conf
similarity index 100%
rename from php/laravel.pool.conf
rename to php-fpm/laravel.pool.conf