diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 44a14da7..76416958 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -34,6 +34,7 @@
         'get_class_to_class_keyword' => false, // should be enabled as soon as support for php < 8 is dropped
         'nullable_type_declaration_for_default_null_value' => true,
         'no_null_property_initialization' => false,
+        'new_with_parentheses' => true,
     ])
     ->setFinder(
         PhpCsFixer\Finder::create()
diff --git a/Resources/config/controller.xml b/Resources/config/controller.xml
index 6b905ac8..92d30fb1 100644
--- a/Resources/config/controller.xml
+++ b/Resources/config/controller.xml
@@ -8,12 +8,11 @@
                  public="true">
             <tag name="container.service_subscriber" />
             <tag name="controller.service_arguments" />
-            <tag name="sulu.context" context="website" />
             <call method="setContainer">
                 <argument type="service" id="Psr\Container\ContainerInterface" />
             </call>
         </service>
 
-        <service id="Sulu\Bundle\ContentBundle\Content\UserInterface\Controller\Website\ContentController" alias="sulu_content.content_controller" />
+        <service id="Sulu\Bundle\ContentBundle\Content\UserInterface\Controller\Website\ContentController" alias="sulu_content.content_controller" public="true" />
     </services>
 </container>
diff --git a/Tests/Application/config/templates/examples/default.xml b/Tests/Application/config/templates/examples/default.xml
index ad509ec9..a28945d1 100644
--- a/Tests/Application/config/templates/examples/default.xml
+++ b/Tests/Application/config/templates/examples/default.xml
@@ -6,7 +6,7 @@
     <key>default</key>
 
     <view>@ExampleTest/examples/default</view>
-    <controller>Sulu\Bundle\WebsiteBundle\Controller\DefaultController::indexAction</controller>
+    <controller>Sulu\Bundle\ContentBundle\Content\UserInterface\Controller\Website\ContentController::indexAction</controller>
     <cacheLifetime>604800</cacheLifetime>
 
     <meta>
diff --git a/Tests/Application/config/templates/examples/example-2.xml b/Tests/Application/config/templates/examples/example-2.xml
index 3a07a642..faa7fea9 100644
--- a/Tests/Application/config/templates/examples/example-2.xml
+++ b/Tests/Application/config/templates/examples/example-2.xml
@@ -6,7 +6,7 @@
     <key>example-2</key>
 
     <view>@ExampleTest/examples/example-2</view>
-    <controller>Sulu\Bundle\WebsiteBundle\Controller\DefaultController::indexAction</controller>
+    <controller>Sulu\Bundle\ContentBundle\Content\UserInterface\Controller\Website\ContentController::indexAction</controller>
     <cacheLifetime>604800</cacheLifetime>
 
     <meta>
diff --git a/Tests/Application/config/templates/examples/no-route.xml b/Tests/Application/config/templates/examples/no-route.xml
index 3c838658..0e1edc6c 100644
--- a/Tests/Application/config/templates/examples/no-route.xml
+++ b/Tests/Application/config/templates/examples/no-route.xml
@@ -6,7 +6,7 @@
     <key>no-route</key>
 
     <view>@ExampleTest/examples/example-2</view>
-    <controller>Sulu\Bundle\WebsiteBundle\Controller\DefaultController::indexAction</controller>
+    <controller>Sulu\Bundle\ContentBundle\Content\UserInterface\Controller\Website\ContentController::indexAction</controller>
     <cacheLifetime>604800</cacheLifetime>
 
     <meta>