diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index a920581..ed56ad9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,11 +13,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        php-versions: [ '8.1' ]
-        neos-versions: [ '8.3' ]
-        include:
-          - php-versions: '8.1'
-            neos-versions: '8.2'
+        php-versions: [ '8.2', '8.3' ]
+        neos-versions: [ '9.0' ]
 
     runs-on: ubuntu-latest
 
@@ -35,7 +32,11 @@ jobs:
           ini-values: date.timezone="Africa/Tunis", opcache.fast_shutdown=0, apc.enable_cli=on
 
       - name: Set Neos Version
-        run: composer require neos/neos ^${{ matrix.neos-versions }} --no-progress --no-interaction
+        run: |
+          composer require neos/contentgraph-doctrinedbaladapter ^${{ matrix.neos-versions }} --no-progress --no-interaction --no-update
+          composer require neos/eventstore-doctrineadapter --no-progress --no-interaction --no-update
+          composer require neos/neos ^${{ matrix.neos-versions }} --no-progress --no-interaction --no-update
+          composer update
 
       - name: Run Tests
         run: composer test
diff --git a/Migrations/ContentRepository/Version20230501011400.yaml b/Migrations/ContentRepository/Version20230501011400.yaml
index f43df48..325c6af 100644
--- a/Migrations/ContentRepository/Version20230501011400.yaml
+++ b/Migrations/ContentRepository/Version20230501011400.yaml
@@ -1,18 +1,14 @@
-up:
-  comments: 'Raname identifier field to name'
-  migration:
-    - filters:
-        - type: 'NodeType'
-          settings:
-            nodeType: 'Sitegeist.PaperTiger:Mixin.Name'
-        - type: 'PropertyNotEmpty'
-          settings:
-            propertyName: "identifier"
-      transformations:
-        - type: 'RenameProperty'
-          settings:
-            oldPropertyName: 'identifier'
-            newPropertyName: 'name'
-
-down:
-  comments: 'No down migration available'
+comments: 'Rename identifier field to name'
+migration:
+  - filters:
+      - type: 'NodeType'
+        settings:
+          nodeType: 'Sitegeist.PaperTiger:Mixin.Name'
+      - type: 'PropertyNotEmpty'
+        settings:
+          propertyName: "identifier"
+    transformations:
+      - type: 'RenameProperty'
+        settings:
+          from: 'identifier'
+          to: 'name'
diff --git a/NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion b/NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion
index 5df874b..616959e 100644
--- a/NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion
+++ b/NodeTypes/Field/FriendlyCaptcha/FriendlyCaptcha.fusion
@@ -3,7 +3,7 @@ prototype(Sitegeist.PaperTiger:Field.FriendlyCaptcha) < prototype(Neos.Neos:Cont
 
     renderer = Neos.Fusion:Case {
         backend {
-            condition = ${node.context.inBackend}
+            condition = ${renderingMode.isEdit}
             renderer = afx`
                 <Sitegeist.PaperTiger:FieldContainer
                     field.name={props.name}
diff --git a/NodeTypes/Field/Hidden/Hidden.fusion b/NodeTypes/Field/Hidden/Hidden.fusion
index a7a78fb..fcc44eb 100644
--- a/NodeTypes/Field/Hidden/Hidden.fusion
+++ b/NodeTypes/Field/Hidden/Hidden.fusion
@@ -6,7 +6,7 @@ prototype(Sitegeist.PaperTiger:Field.Hidden) < prototype(Neos.Neos:ContentCompon
 
     renderer = Neos.Fusion:Case {
         backend {
-            condition = ${node.context.inBackend}
+            condition = ${renderingMode.isEdit}
             renderer = afx`
                 <Sitegeist.PaperTiger:FieldContainer
                     field.name={props.name}
diff --git a/NodeTypes/Field/Honeypot/Honeypot.fusion b/NodeTypes/Field/Honeypot/Honeypot.fusion
index b46ee20..2785441 100644
--- a/NodeTypes/Field/Honeypot/Honeypot.fusion
+++ b/NodeTypes/Field/Honeypot/Honeypot.fusion
@@ -12,7 +12,7 @@ prototype(Sitegeist.PaperTiger:Field.Honeypot) < prototype(Neos.Neos:ContentComp
 
     renderer = Neos.Fusion:Case {
         backend {
-            condition = ${node.context.inBackend}
+            condition = ${renderingMode.isEdit}
             renderer = afx`
                 <Sitegeist.PaperTiger:FieldContainer
                     field.name={props.name}
diff --git a/NodeTypes/Form.fusion b/NodeTypes/Form.fusion
index be47b5e..f9fb522 100644
--- a/NodeTypes/Form.fusion
+++ b/NodeTypes/Form.fusion
@@ -15,7 +15,7 @@ prototype(Sitegeist.PaperTiger:Form) < prototype(Neos.Neos:ContentComponent) {
 
     renderer = Neos.Fusion:Case {
         runtimeForm {
-            condition = ${node.context.live}
+            condition = ${!renderingMode.isEdit}
 
             renderer = Neos.Fusion:Join {
                 anchor = ${props.anchor}
@@ -47,7 +47,7 @@ prototype(Sitegeist.PaperTiger:Form) < prototype(Neos.Neos:ContentComponent) {
         }
 
         backend {
-            condition = ${node.context.inBackend}
+            condition = ${renderingMode.isEdit}
             renderer = afx`
                 <style @if={props.backendStyle} data-slipstream>{props.backendStyle}</style>
                 <script @if={props.backendScript} data-slipstream>{props.backendScript}</script>
diff --git a/Resources/Private/Fusion/Prototypes/ActionCollection.Definition.fusion b/Resources/Private/Fusion/Prototypes/ActionCollection.Definition.fusion
index 80302b0..0d18ecb 100644
--- a/Resources/Private/Fusion/Prototypes/ActionCollection.Definition.fusion
+++ b/Resources/Private/Fusion/Prototypes/ActionCollection.Definition.fusion
@@ -18,6 +18,6 @@ prototype(Sitegeist.PaperTiger:ActionCollection.Definition.ContentCase) < protot
     default {
         @position = 'end'
         condition = true
-        type = ${node.nodeType.name + '.Definition'}
+        type = ${node.nodeTypeName + '.Definition'}
     }
 }
diff --git a/Resources/Private/Fusion/Prototypes/ActionCollection.Preview.fusion b/Resources/Private/Fusion/Prototypes/ActionCollection.Preview.fusion
index b6a44ba..cf49ff0 100644
--- a/Resources/Private/Fusion/Prototypes/ActionCollection.Preview.fusion
+++ b/Resources/Private/Fusion/Prototypes/ActionCollection.Preview.fusion
@@ -12,7 +12,7 @@ prototype(Sitegeist.PaperTiger:ActionCollection.Preview.ContentCase) < prototype
         default {
             @position = 'end'
             condition = true
-            type = ${node.nodeType.name + '.Preview'}
+            type = ${node.nodeTypeName + '.Preview'}
         }
     }
 
diff --git a/Resources/Private/Fusion/Prototypes/FieldCollection.Schema.fusion b/Resources/Private/Fusion/Prototypes/FieldCollection.Schema.fusion
index b71454f..5eed880 100644
--- a/Resources/Private/Fusion/Prototypes/FieldCollection.Schema.fusion
+++ b/Resources/Private/Fusion/Prototypes/FieldCollection.Schema.fusion
@@ -10,9 +10,9 @@ prototype(Sitegeist.PaperTiger:FieldCollection.Schema) < prototype(Neos.Fusion:C
                 name = ${q(node).is('[instanceof Sitegeist.PaperTiger:Mixin.Name]') ? q(node).property('name') : q(node).property('_identifier')}
                 schema = Neos.Fusion:Renderer {
                     @if.canRender = Neos.Fusion:CanRender {
-                        type = ${node.nodeType.name + '.Schema'}
+                        type = ${node.nodeTypeName + '.Schema'}
                     }
-                    type = ${node.nodeType.name + '.Schema'}
+                    type = ${node.nodeTypeName + '.Schema'}
                 }
                 value = ${(this.name && this.schema) ? Array.set(carry, this.name, this.schema) : carry}
             }
diff --git a/composer.json b/composer.json
index ea5514d..1237d93 100644
--- a/composer.json
+++ b/composer.json
@@ -5,10 +5,10 @@
     "license": "GPL-3.0+",
     "require": {
         "php": ">=8.1",
-        "neos/neos": "~8.2 || 9.0.x-dev ",
-        "neos/fusion": "~8.2 || 9.0.x-dev",
+        "neos/neos": "^9.0",
+        "neos/fusion": "^9.0 ",
         "neos/fusion-form": "~2.0 || dev-master",
-        "sitegeist/inspectorgadget": "~2.0",
+        "sitegeist/inspectorgadget": "^v3.0.0",
         "sitegeist/neos-symfonymailer": "~1.1",
         "sitegeist/fusionform-upload": "~1.0",
         "sitegeist/fusionform-friendlycaptcha": "~1.0"