diff --git a/Makefile b/Makefile
index f20b16e..11e2351 100644
--- a/Makefile
+++ b/Makefile
@@ -30,22 +30,6 @@ build: clean build-assets build-site
 build-prod:
 	$(MAKE) build TARGET=prod
 
-# Format
-
-format-pages:
-	./tools/npm run format-md
-
-format-assets:
-	./tools/npm run format-webpack
-	./tools/npm run format-js
-	./tools/npm run format-vue
-	./tools/npm run format-style
-
-format-php:
-	./tools/php-cs-fixer fix
-
-format: format-pages format-assets format-php
-
 watch: clean build-assets
 	./tools/sculpin generate \
 		--env="${APP_ENV}" \
diff --git a/Taskfile.yml b/Taskfile.yml
index bb94ee0..7883237 100644
--- a/Taskfile.yml
+++ b/Taskfile.yml
@@ -50,3 +50,23 @@ tasks:
         vars: { CLI_ARGS: "install" }
       - task: npm
         vars: { CLI_ARGS: "install" }
+
+  format-pages:
+    cmds:
+      - task: npm
+        vars: { CLI_ARGS: 'run format-md' }
+
+  format-assets:
+    cmds:
+      - task: npm
+        vars: { CLI_ARGS: 'run format-webpack' }
+      - task: npm
+        vars: { CLI_ARGS: 'run format-js' }
+      - task: npm
+        vars: { CLI_ARGS: 'run format-vue' }
+      - task: npm
+        vars: { CLI_ARGS: 'run format-style' }
+
+  format-php:
+    cmds:
+      - docker run {{.DOCKER_COMMON_OPTS}} "{{.PHP_IMAGE}}" php-cs-fixer fix
diff --git a/bundle/HtmlPrettierBundle/DependencyInjection/HtmlPrettierExtension.php b/bundle/HtmlPrettierBundle/DependencyInjection/HtmlPrettierExtension.php
index 5b0ccbd..9f2ab2e 100644
--- a/bundle/HtmlPrettierBundle/DependencyInjection/HtmlPrettierExtension.php
+++ b/bundle/HtmlPrettierBundle/DependencyInjection/HtmlPrettierExtension.php
@@ -11,9 +11,6 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class HtmlPrettierExtension extends Extension
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
diff --git a/bundle/HtmlPrettierBundle/HtmlPrettier.php b/bundle/HtmlPrettierBundle/HtmlPrettier.php
index 681a636..3688e1c 100644
--- a/bundle/HtmlPrettierBundle/HtmlPrettier.php
+++ b/bundle/HtmlPrettierBundle/HtmlPrettier.php
@@ -4,21 +4,14 @@ declare(strict_types=1);
 
 namespace Homepage\HtmlPrettierBundle;
 
-use Generator;
 use Sculpin\Core\Event\SourceSetEvent;
 use Sculpin\Core\Sculpin;
 use Sculpin\Core\Source\SourceInterface;
 use Sculpin\Core\Source\SourceSet;
-
-use function strlen;
-
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;
 
 class HtmlPrettier implements EventSubscriberInterface
 {
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
@@ -47,7 +40,7 @@ class HtmlPrettier implements EventSubscriberInterface
         }
     }
 
-    private function filterSource(SourceSet $sourceSet): Generator
+    private function filterSource(SourceSet $sourceSet): \Generator
     {
         /** @var SourceInterface $source */
         foreach ($sourceSet->allSources() as $source) {
@@ -65,7 +58,7 @@ class HtmlPrettier implements EventSubscriberInterface
 
     private function endsWith($haystack, $needle): bool
     {
-        $length = strlen($needle);
+        $length = \strlen($needle);
 
         return $length === 0 || (substr($haystack, -$length) === $needle);
     }
diff --git a/bundle/SiteMapBundle/DependencyInjection/SiteMapExtension.php b/bundle/SiteMapBundle/DependencyInjection/SiteMapExtension.php
index f23186f..e3ff71b 100644
--- a/bundle/SiteMapBundle/DependencyInjection/SiteMapExtension.php
+++ b/bundle/SiteMapBundle/DependencyInjection/SiteMapExtension.php
@@ -11,9 +11,6 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class SiteMapExtension extends Extension
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));
diff --git a/bundle/SiteMapBundle/SiteMapGenerator.php b/bundle/SiteMapBundle/SiteMapGenerator.php
index 8846f0b..ebe4ecb 100644
--- a/bundle/SiteMapBundle/SiteMapGenerator.php
+++ b/bundle/SiteMapBundle/SiteMapGenerator.php
@@ -23,9 +23,6 @@ class SiteMapGenerator implements DataProviderInterface, EventSubscriberInterfac
      */
     private $sources;
 
-    /**
-     * {@inheritdoc}
-     */
     public static function getSubscribedEvents(): array
     {
         return [
diff --git a/bundle/TwigExtensionBundle/DependencyInjection/TwigExtensionExtension.php b/bundle/TwigExtensionBundle/DependencyInjection/TwigExtensionExtension.php
index 8606625..9854070 100644
--- a/bundle/TwigExtensionBundle/DependencyInjection/TwigExtensionExtension.php
+++ b/bundle/TwigExtensionBundle/DependencyInjection/TwigExtensionExtension.php
@@ -11,9 +11,6 @@ use Symfony\Component\HttpKernel\DependencyInjection\Extension;
 
 class TwigExtensionExtension extends Extension
 {
-    /**
-     * {@inheritdoc}
-     */
     public function load(array $configs, ContainerBuilder $container)
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config'));