diff --git a/Configuration/NodeTypes.Collection.Content.Carousel.yaml b/Configuration/NodeTypes.Collection.Content.Carousel.yaml
index 63e640ad..eef2c3a5 100644
--- a/Configuration/NodeTypes.Collection.Content.Carousel.yaml
+++ b/Configuration/NodeTypes.Collection.Content.Carousel.yaml
@@ -6,7 +6,7 @@
     Neos.Neos:ContentCollection: true
   constraints:
     nodeTypes:
-      'Neos.Neos:Content': false
+      '*': false
       'Neos.Demo:Constraint.Content.Carousel': true
 
 ##
diff --git a/Configuration/NodeTypes.Collection.Content.Column.yaml b/Configuration/NodeTypes.Collection.Content.Column.yaml
index 517a5413..37d3ef51 100644
--- a/Configuration/NodeTypes.Collection.Content.Column.yaml
+++ b/Configuration/NodeTypes.Collection.Content.Column.yaml
@@ -6,7 +6,7 @@
     Neos.Neos:ContentCollection: true
   constraints:
     nodeTypes:
-      'Neos.Neos:Content': false
+      '*': false
       'Neos.Demo:Constraint.Content.Column': true
 
 ##
diff --git a/Configuration/NodeTypes.Collection.Content.Footer.yaml b/Configuration/NodeTypes.Collection.Content.Footer.yaml
index 9c376aea..937a0eaa 100644
--- a/Configuration/NodeTypes.Collection.Content.Footer.yaml
+++ b/Configuration/NodeTypes.Collection.Content.Footer.yaml
@@ -6,7 +6,7 @@
     Neos.Neos:ContentCollection: true
   constraints:
     nodeTypes:
-      'Neos.Neos:Content': false
+      '*': false
       'Neos.Demo:Content.Headline': true
       'Neos.Demo:Content.Text': true
       'Neos.Demo:Content.Image': true
diff --git a/Configuration/NodeTypes.Collection.Content.Teaser.yaml b/Configuration/NodeTypes.Collection.Content.Teaser.yaml
index db72e216..42442d72 100644
--- a/Configuration/NodeTypes.Collection.Content.Teaser.yaml
+++ b/Configuration/NodeTypes.Collection.Content.Teaser.yaml
@@ -6,7 +6,7 @@
     Neos.Neos:ContentCollection: true
   constraints:
     nodeTypes:
-      'Neos.Neos:Content': false
+      '*': false
       'Neos.Demo:Content.Headline': true
       'Neos.Demo:Content.Text': true
       'Neos.Demo:Content.Image': true
diff --git a/composer.json b/composer.json
index bf3de7f9..a6f56361 100644
--- a/composer.json
+++ b/composer.json
@@ -108,7 +108,6 @@
             "Neos.NodeTypes-20200120114136",
             "Neos.Flow-20200813181400",
             "Neos.Flow-20201003165200",
-            "Neos.Neos-20201108113821",
             "Neos.Flow-20201109224100"
         ]
     }