diff --git a/src/bundle/DependencyInjection/Compiler/ViewBuilderPass.php b/src/bundle/DependencyInjection/Compiler/ViewBuilderPass.php
deleted file mode 100644
index 2dcfe286..00000000
--- a/src/bundle/DependencyInjection/Compiler/ViewBuilderPass.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
- * @copyright Copyright (C) eZ Systems AS. All rights reserved.
- * @license For full copyright and license information view LICENSE file distributed with this source code.
- */
-namespace EzSystems\EzSupportToolsBundle\DependencyInjection\Compiler;
-
-use Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-
-class ViewBuilderPass implements CompilerPassInterface
-{
-    /**
-     * Registers the SystemInfoViewBuilder into the view builder registry.
-     *
-     * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
-     */
-    public function process(ContainerBuilder $container)
-    {
-        if (!$container->has('ezpublish.view_builder.registry')) {
-            return;
-        }
-
-        $viewBuilderRegistry = $container->findDefinition('ezpublish.view_builder.registry');
-        $viewBuilders = [
-            $container->findDefinition('support_tools.view.system_info_view_builder'),
-        ];
-
-        $viewBuilderRegistry->addMethodCall('addToRegistry', [$viewBuilders]);
-    }
-}
diff --git a/src/bundle/EzSystemsEzSupportToolsBundle.php b/src/bundle/EzSystemsEzSupportToolsBundle.php
index c1c79817..62bf6914 100644
--- a/src/bundle/EzSystemsEzSupportToolsBundle.php
+++ b/src/bundle/EzSystemsEzSupportToolsBundle.php
@@ -9,7 +9,6 @@
 use EzSystems\EzSupportToolsBundle\DependencyInjection\Compiler\SystemInfoCollectorPass;
 use EzSystems\EzSupportToolsBundle\DependencyInjection\Compiler\OutputFormatPass;
 use EzSystems\EzSupportToolsBundle\DependencyInjection\Compiler\SystemInfoTabGroupPass;
-use EzSystems\EzSupportToolsBundle\DependencyInjection\Compiler\ViewBuilderPass;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
@@ -20,7 +19,6 @@ public function build(ContainerBuilder $container)
         parent::build($container);
         $container->addCompilerPass(new SystemInfoCollectorPass());
         $container->addCompilerPass(new OutputFormatPass());
-        $container->addCompilerPass(new ViewBuilderPass());
         $container->addCompilerPass(new SystemInfoTabGroupPass());
     }
 }
diff --git a/src/bundle/Resources/config/view.yaml b/src/bundle/Resources/config/view.yaml
index 1ddd8688..679a498e 100644
--- a/src/bundle/Resources/config/view.yaml
+++ b/src/bundle/Resources/config/view.yaml
@@ -15,6 +15,8 @@ services:
         arguments:
             - "@ezpublish.view.configurator"
             - "@support_tools.system_info.collector_registry"
+        tags:
+            - { name: ibexa.view_builder }
 
     support_tools.view.system_info.provider:
         class: "%ezpublish.view_provider.configured.class%"