diff --git a/.php_cs b/.php_cs
index 1ddb9a19f0..6eab089ae6 100644
--- a/.php_cs
+++ b/.php_cs
@@ -13,6 +13,12 @@ $config = Symfony\CS\Config\Config::create()
         'no_blank_lines_before_namespace',
         // [contrib] Ordering use statements.
         'ordered_use',
+        // [contrib] Annotations should be ordered so that param annotations come first, then throws annotations, then return annotations.
+        'phpdoc_order',
+        // [contrib] Arrays should use the long syntax.
+        'long_array_syntax',
+        // [contrib] Ensure there is no code on the same line as the PHP open tag.
+        'newline_after_open_tag',
     ))
     ->finder($finder);
 
diff --git a/Dockerfile b/Dockerfile
index be10a7f936..410a1bac99 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -35,7 +35,7 @@ RUN composer global require "mayflower/php-codebrowser"
 RUN composer global require "sebastian/phpcpd"
 RUN composer global require "squizlabs/php_codesniffer"
 RUN composer global require "phploc/phploc"
-RUN composer global require "fabpot/php-cs-fixer"
+RUN composer global require "fabpot/php-cs-fixer=1.8.1"
 
 
 # Documentor dependencies