diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbd498f2a0af16ec4c34b17412c1fab241b58911..86d143525eced536b12870fe531c488cda52e660 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,6 +15,16 @@ stages:
 
 # // Stage test
 
+phpcs:
+  stage: test
+  image: "$CI_REGISTRY/php-extended/docker-images:php-8.0-buster-cli-dev"
+  except:
+    - tags
+  script:
+    - php /composer.phar update --ansi --no-interaction --no-progress --prefer-dist --no-dev
+    - /vendor/bin/php-cs-fixer --version
+    - /vendor/bin/php-cs-fixer fix -v --allow-risky=yes --dry-run
+
 phpunit-7.1:
   stage: test
   image: "$CI_REGISTRY/php-extended/docker-images:php-7.1-buster-cli-dev"
@@ -190,56 +200,4 @@ phpmd-8.0:
     - /vendor/bin/phpmd --version
     - /vendor/bin/phpmd ./src ansi ./phpmd.xml
 
-phpcs-7.1:
-  stage: test
-  image: "$CI_REGISTRY/php-extended/docker-images:php-7.1-buster-cli-dev"
-  except:
-    - tags
-  script:
-    - php /composer.phar update --ansi --no-interaction --no-progress --prefer-dist --no-dev
-    - /vendor/bin/php-cs-fixer --version
-    - /vendor/bin/php-cs-fixer fix -v --allow-risky=yes --dry-run
-
-phpcs-7.2:
-  stage: test
-  image: "$CI_REGISTRY/php-extended/docker-images:php-7.2-buster-cli-dev"
-  except:
-    - tags
-  script:
-    - php /composer.phar update --ansi --no-interaction --no-progress --prefer-dist --no-dev
-    - /vendor/bin/php-cs-fixer --version
-    - /vendor/bin/php-cs-fixer fix -v --allow-risky=yes --dry-run
-
-phpcs-7.3:
-  stage: test
-  image: "$CI_REGISTRY/php-extended/docker-images:php-7.3-buster-cli-dev"
-  except:
-    - tags
-  script:
-    - php /composer.phar update --ansi --no-interaction --no-progress --prefer-dist --no-dev
-    - /vendor/bin/php-cs-fixer --version
-    - /vendor/bin/php-cs-fixer fix -v --allow-risky=yes --dry-run
-
-phpcs-7.4:
-  stage: test
-  image: "$CI_REGISTRY/php-extended/docker-images:php-7.4-buster-cli-dev"
-  except:
-    - tags
-  script:
-    - php /composer.phar update --ansi --no-interaction --no-progress --prefer-dist --no-dev
-    - /vendor/bin/php-cs-fixer --version
-    - /vendor/bin/php-cs-fixer fix -v --allow-risky=yes --dry-run
-
-phpcs-8.0:
-  stage: test
-  image: "$CI_REGISTRY/php-extended/docker-images:php-8.0-buster-cli-dev"
-  except:
-    - tags
-  variables:
-    PHP_CS_FIXER_IGNORE_ENV: 1
-  script:
-    - php /composer.phar update --ansi --no-interaction --no-progress --prefer-dist --no-dev
-    - /vendor/bin/php-cs-fixer --version
-    - /vendor/bin/php-cs-fixer fix -v --allow-risky=yes --dry-run
-
 ## End Stage //
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index f11b791a3c7ac8582e390657e8f70bcb64237de5..93fdfb8b0d08a38f95041e927d1459bed75b1ed7 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -328,7 +328,6 @@ $config = (new \PhpCsFixer\Config())
 		
 		
 		// Language Construct Rules
-		'class_keyword_remove' => false, // i'd prefer the opposite
 		'combine_consecutive_issets' => true,
 		'combine_consecutive_unsets' => true,
 		'declare_equal_normalize' => ['space' => 'none'],