diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3c9a485..472d47ce 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to Roadiz will be documented in this file.
 
+## [2.3.22](https://github.com/roadiz/core-bundle-dev-app/compare/v2.3.21...v2.3.22) - 2024-08-01
+
+### Bug Fixes
+
+- Do not require a `themes` folder at project root - ([02b2e1c](https://github.com/roadiz/core-bundle-dev-app/commit/02b2e1cf242c8b8f63fb9caaa6d8eca0220ec53b))
+
 ## [2.3.21](https://github.com/roadiz/core-bundle-dev-app/compare/v2.3.20...v2.3.21) - 2024-07-29
 
 ### Bug Fixes
diff --git a/lib/RoadizCompatBundle/config/services.yaml b/lib/RoadizCompatBundle/config/services.yaml
index 20484641..9e0b7144 100644
--- a/lib/RoadizCompatBundle/config/services.yaml
+++ b/lib/RoadizCompatBundle/config/services.yaml
@@ -19,24 +19,6 @@ services:
             - '../src/Tests/'
             - '../src/Event/'
 
-    #
-    # Automatic themes registration
-    #
-    Themes\:
-        resource: '%kernel.project_dir%/themes/'
-        autowire: true
-        autoconfigure: true
-        exclude:
-            - '%kernel.project_dir%/themes/DependencyInjection/'
-            - '%kernel.project_dir%/themes/app/'
-            - '%kernel.project_dir%/themes/public/'
-            - '%kernel.project_dir%/themes/Resources/'
-            - '%kernel.project_dir%/themes/Services/'
-            - '%kernel.project_dir%/themes/static/'
-            - '%kernel.project_dir%/themes/Entity/'
-            - '%kernel.project_dir%/themes/Kernel.php'
-            - '%kernel.project_dir%/themes/Tests/'
-
     # Explicit declaration
     RZ\Roadiz\CompatBundle\Controller\AppController: ~
     RZ\Roadiz\CompatBundle\Controller\Controller: ~
diff --git a/lib/RoadizCompatBundle/src/DependencyInjection/Compiler/ThemesTranslatorPathsCompilerPass.php b/lib/RoadizCompatBundle/src/DependencyInjection/Compiler/ThemesTranslatorPathsCompilerPass.php
index d1483c90..0e4997b7 100644
--- a/lib/RoadizCompatBundle/src/DependencyInjection/Compiler/ThemesTranslatorPathsCompilerPass.php
+++ b/lib/RoadizCompatBundle/src/DependencyInjection/Compiler/ThemesTranslatorPathsCompilerPass.php
@@ -9,7 +9,7 @@
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\Finder\Finder;
 
-class ThemesTranslatorPathsCompilerPass implements CompilerPassInterface
+final class ThemesTranslatorPathsCompilerPass implements CompilerPassInterface
 {
     /**
      * @inheritDoc
diff --git a/lib/RoadizCoreBundle/config/services.yaml b/lib/RoadizCoreBundle/config/services.yaml
index b4031340..3c5dfc86 100644
--- a/lib/RoadizCoreBundle/config/services.yaml
+++ b/lib/RoadizCoreBundle/config/services.yaml
@@ -1,6 +1,6 @@
 ---
 parameters:
-    roadiz_core.cms_version: '2.3.21'
+    roadiz_core.cms_version: '2.3.22'
     roadiz_core.cms_version_prefix: 'main'
     env(APP_NAMESPACE): "roadiz"
     env(APP_VERSION): "0.1.0"
diff --git a/themes/.gitkeep b/themes/.gitkeep
deleted file mode 100644
index e69de29b..00000000