diff --git a/cms/conf.d/include.conf b/cms/conf.d/include.conf
deleted file mode 100755
index a732196..0000000
--- a/cms/conf.d/include.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-foreach (glob(dirname(__FILE__) . "/include/*.conf") as $gtx_include_filename) {
-        include $gtx_include_filename;
-}
diff --git a/cms/conf.d/include.yml b/cms/conf.d/include.yml
new file mode 100755
index 0000000..83a2f48
--- /dev/null
+++ b/cms/conf.d/include.yml
@@ -0,0 +1,6 @@
+include_conf_files:
+  directory: "include"
+  files:
+    - devtools.yml
+    - features.yml
+    - fileupdload.yml
diff --git a/cms/conf.d/include/alohaeditor.conf b/cms/conf.d/include/alohaeditor.conf
deleted file mode 100755
index b3d9bbc..0000000
--- a/cms/conf.d/include/alohaeditor.conf
+++ /dev/null
@@ -1 +0,0 @@
-<?php
diff --git a/cms/conf.d/include/devtools.conf b/cms/conf.d/include/devtools.conf
deleted file mode 100755
index a3ca727..0000000
--- a/cms/conf.d/include/devtools.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$DEVTOOLS["synchronizer"]["class"] = "com.gentics.contentnode.devtools.FileMonitorWatcher";
-$DEVTOOLS["synchronizer"]["interval"] = 100;
diff --git a/cms/conf.d/include/devtools.yml b/cms/conf.d/include/devtools.yml
new file mode 100755
index 0000000..d91a6ab
--- /dev/null
+++ b/cms/conf.d/include/devtools.yml
@@ -0,0 +1,4 @@
+devtools:
+  synchronizer:
+    class: "com.gentics.contentnode.devtools.FileMonitorWatcher"
+    interval: 100
diff --git a/cms/conf.d/include/features.conf b/cms/conf.d/include/features.conf
deleted file mode 100755
index 035f37a..0000000
--- a/cms/conf.d/include/features.conf
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-$FEATURE["mesh_contentrepository"]      = true;
-$FEATURE["pub_dir_segment"]             = true;
-$FEATURE["devtools"]                    = true;
-$FEATURE['activiti_integration']        = true;
-$FEATURE["aloha_annotate_editables"]    = true;
-$FEATURE["live_urls"]                   = true;
-$FEATURE["resumable_publish_process"]   = true;
-$FEATURE["customform_resolve_nodetags"] = true;
-$FEATURE["force_javaparser_post"]       = true;
-$FEATURE["copy_tags"]                   = true;
-$FEATURE["nice_urls"]                   = true;
-$FEATURE["contentgroup3_pagefilename"]  = true; 
-$FEATURE["contentfile_auto_offline"]    = true;
-$FEATURE["tagtypemigration"]            = true;
-$FEATURE["publish_cache"]               = false;
\ No newline at end of file
diff --git a/cms/conf.d/include/features.yml b/cms/conf.d/include/features.yml
new file mode 100755
index 0000000..94f27db
--- /dev/null
+++ b/cms/conf.d/include/features.yml
@@ -0,0 +1,19 @@
+feature:
+  mesh_contentrepository: true
+  pub_dir_segment: true
+  devtools: true
+  activiti_integration: true
+  aloha_annotate_editables: true
+  live_urls: true
+  resumable_publish_process: true
+  customform_resolve_nodetags: true
+  force_javaparser_post: true
+  copy_tags: true
+  nice_urls: true
+  contentgroup3_pagefilename: true
+  contentfile_auto_offline: true
+  publish_cache: true
+  content_staging: true
+  packages: true
+  file_fetch: true
+  objtag_sync: true
diff --git a/cms/conf.d/include/fileupload.conf b/cms/conf.d/include/fileupload.conf
deleted file mode 100755
index b823960..0000000
--- a/cms/conf.d/include/fileupload.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-
-$MAX_FILESIZE = "4G";
-$NO_MAX_FILESIZE = ["Node Super Admin", "Editor"];
diff --git a/cms/conf.d/include/fileupload.yml b/cms/conf.d/include/fileupload.yml
new file mode 100755
index 0000000..d25cab1
--- /dev/null
+++ b/cms/conf.d/include/fileupload.yml
@@ -0,0 +1,5 @@
+max_filesize: "4G"
+no_max_filesize:
+  - "Node Super Admin"
+  - "Editor"
+  - "Node Admin"
diff --git a/docker-compose.override.yml.example b/docker-compose.override.yml.example
index 0afaa7b..ecfac98 100644
--- a/docker-compose.override.yml.example
+++ b/docker-compose.override.yml.example
@@ -23,12 +23,12 @@ services:
 
   cms:
     ports:
-      - '8082:80'
+      - '8082:8080'
     environment:
       LICENSEKEY: TH1S-15N0-T4V4-L1DK-3YKT-HXBY-D34D-B33F
     volumes:
-      - ./cms/dumps:/Node/etc/dumps
-      - ./portal/public/static/demo-assets/files:/Node/node/content/packages/demo-assets/files:ro
+      - ./portal/public/static/demo-assets/files:/cms/packages/demo-assets/files:ro
+      - ./cms/content-packages:/cms/content-packages
   
   # Optional: Language Tool
   # To enable, please comment out the entrypoint line!
diff --git a/docker-compose.yml b/docker-compose.yml
index b0e9702..737155a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,5 +1,4 @@
 services:
-
   portal:
     image: gentics-portal-php
     build:
@@ -16,7 +15,7 @@ services:
     deploy:
       resources:
         limits:
-          cpus: '1'
+          cpus: "1"
           memory: 768M
 
   # https://www.elastic.co/guide/en/elasticsearch/reference/current/docker.html
@@ -43,13 +42,13 @@ services:
     deploy:
       resources:
         limits:
-          cpus: '0.5'
+          cpus: "0.5"
           memory: 1G
 
   # https://hub.docker.com/r/gentics/mesh/
   mesh:
     # https://getmesh.io/docs/administration-guide.html#_environment_variables
-    image: docker.apa-it.at/gentics/mesh:1.8.11
+    image: docker.apa-it.at/gentics/mesh:2.0.5
     volumes:
       - mesh-data:/mesh/data
       - mesh-config:/config
@@ -72,19 +71,17 @@ services:
     deploy:
       resources:
         limits:
-          cpus: '0.5'
+          cpus: "0.5"
           memory: 1G
 
   # https://hub.docker.com/r/gentics/cms/
   cms:
-    image: docker.apa-it.at/gentics/cms:5.44.5
+    image: docker.apa-it.at/gentics/cms:6.0.6
     restart: on-failure
     volumes:
-      - cms-node:/Node/node
-      - cms-dbfiles:/Node/node/content/dbfiles
-      - cms-bundles:/Node/node/system/bundles
-      - ./cms/conf.d/include.conf:/Node/etc/conf.d/include.conf
-      - ./cms/conf.d/include:/Node/etc/conf.d/include
+      - cms-bundles:/cms/system/bundles
+      - cms-dbfiles:/cms/data/dbfiles
+      - ./cms/conf.d/include:/cms/conf/include
     environment:
       JAVA_XMS: 512m
       JAVA_XMX: 512m
@@ -92,11 +89,12 @@ services:
       NODE_DB_PASSWORD: ""
       NODE_DB_HOST: db
       NODE_USER_PASSWORD: node
+      CONF_FILES: include
 
     deploy:
       resources:
         limits:
-          cpus: '1'
+          cpus: "1"
           memory: 1G
 
   # https://hub.docker.com/_/mariadb/
@@ -110,11 +108,11 @@ services:
     environment:
       MYSQL_ALLOW_EMPTY_PASSWORD: "true"
       MYSQL_ROOT_PASSWORD: ""
-    
+
     deploy:
       resources:
         limits:
-          cpus: '0.5'
+          cpus: "0.5"
           memory: 512M
 
   # Optional: Language tool
@@ -127,7 +125,7 @@ services:
     deploy:
       resources:
         limits:
-          cpus: '0.25'
+          cpus: "0.25"
           memory: 192M
 
   # Optional: Keycloak
@@ -147,7 +145,7 @@ services:
     deploy:
       resources:
         limits:
-          cpus: '0.5'
+          cpus: "0.5"
           memory: 768M
 
 volumes:
diff --git a/portal-files/Dockerfile b/portal-files/Dockerfile
index 03605c6..654defb 100644
--- a/portal-files/Dockerfile
+++ b/portal-files/Dockerfile
@@ -1,4 +1,4 @@
-FROM php:8.1-fpm-bullseye
+FROM php:8.2-fpm-bullseye
 
 # Install Debian packages
 RUN apt-get update -y \