diff --git a/README.md b/README.md
index a5e7525c..fcbb7c77 100644
--- a/README.md
+++ b/README.md
@@ -552,6 +552,10 @@ The following tools will assist you on creating new projects easily as well as h
     <td>:wrench: <a href="https://github.com/squizlabs/PHP_CodeSniffer">php code beautifier</a></td>
     <td><code>phpcbf</code> is a command line tool that automatically correct coding standard violations.</td>
   </tr>
+  <tr>
+    <td>:wrench: <a href="https://github.com/FriendsOfPHP/PHP-CS-Fixer">php cs fixer</a></td>
+    <td><code>php-cs-fixer</code> is a tool to automatically fix PHP Coding Standards issues.</td>
+  </tr>
   <tr>
     <td>:wrench: <a href="https://github.com/Unitech/pm2">pm2</a></td>
     <td><code>pm2</code> is Node.js Production Process Manager with a built-in Load Balancer.</td>
diff --git a/docker-compose.yml b/docker-compose.yml
index 5669d1da..ee56efbe 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -95,7 +95,7 @@ services:
   # PHP
   # ------------------------------------------------------------
   php:
-    image: devilbox/php-fpm:${PHP_SERVER}-work-0.67
+    image: devilbox/php-fpm:${PHP_SERVER}-work-0.68
     hostname: php
 
     ##
diff --git a/docs/_includes/links/tools.rst b/docs/_includes/links/tools.rst
index 971341d9..bc3ef0e1 100644
--- a/docs/_includes/links/tools.rst
+++ b/docs/_includes/links/tools.rst
@@ -159,6 +159,12 @@
      PHP CodeSniffer <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
    </a>
 
+.. |ext_lnk_tool_php_cs_fixer| raw:: html
+
+   <a target="_blank" href="https://github.com/FriendsOfPHP/PHP-CS-Fixer">
+     PHP-CS-Fixer <img src="https://raw.githubusercontent.com/cytopia/icons/master/11x11/ext-link.png" />
+   </a>
+
 .. |ext_lnk_tool_phpcbf| raw:: html
 
    <a target="_blank" href="https://github.com/squizlabs/PHP_CodeSniffer">
diff --git a/docs/readings/available-tools.rst b/docs/readings/available-tools.rst
index 685b3d16..5cc8b301 100644
--- a/docs/readings/available-tools.rst
+++ b/docs/readings/available-tools.rst
@@ -66,6 +66,8 @@ The PHP container is your workhorse and these are your tools:
 +----------------------+---------------------------------------+
 | ``phalcon``          | |ext_lnk_tool_phalcon|                |
 +----------------------+---------------------------------------+
+| ``php-cs-fixer``     | |ext_lnk_tool_php_cs_fixer|           |
++----------------------+---------------------------------------+
 | ``phpcs``            | |ext_lnk_tool_phpcs|                  |
 +----------------------+---------------------------------------+
 | ``phpcbf``           | |ext_lnk_tool_phpcbf|                 |