diff --git a/Tests/IntegrationTests/e2e-docker.sh b/Tests/IntegrationTests/e2e-docker.sh
index 785c18fb94..6fe682e282 100755
--- a/Tests/IntegrationTests/e2e-docker.sh
+++ b/Tests/IntegrationTests/e2e-docker.sh
@@ -58,17 +58,17 @@ dc exec -T php bash <<-'BASH'
 
     ./flow cr:setup --content-repository onedimension
     ./flow cr:import --content-repository onedimension --path ./DistributionPackages/Neos.Test.OneDimension/Resources/Private/Content
-    # Hack to create Neos workspace metadata for the live workspace (Failed to load metadata for workspace "live").
-    ./flow migrateevents:migrateWorkspaceMetadataToWorkspaceService --content-repository onedimension
-    # Connect to a Neos site, todo the nodeTypeName parameter is obsolete but necessary
+    # TODO: Fix when part of importer: Add Neos workspace role for the live workspace
+    ./flow workspace:assignrole live Neos.Neos:LivePublisher collaborator --content-repository onedimension
+    # TODO: Fix when part of importer: Connect to a Neos site, todo the nodeTypeName parameter is obsolete but necessary
     ./flow site:create neos-test-onedimension Neos.Test.OneDimension Neos.TestNodeTypes:Document.HomePage
     ./flow domain:add neos-test-onedimension onedimension.localhost --port 8081
 
     ./flow cr:setup --content-repository twodimensions
     ./flow cr:import --content-repository twodimensions --path ./DistributionPackages/Neos.Test.TwoDimensions/Resources/Private/Content
-    # Hack to create Neos workspace metadata for the live workspace (Failed to load metadata for workspace "live").
-    ./flow migrateevents:migrateWorkspaceMetadataToWorkspaceService --content-repository onedimension
-    # Connect to a Neos site, todo the nodeTypeName parameter is obsolete but necessary
+    # TODO: Fix when part of importer: Add Neos workspace role for the live workspace
+    ./flow workspace:assignrole live Neos.Neos:LivePublisher collaborator --content-repository twodimensions
+    # TODO: Fix when part of importer: Connect to a Neos site, todo the nodeTypeName parameter is obsolete but necessary
     ./flow site:create neos-test-twodimensions Neos.Test.TwoDimensions Neos.TestNodeTypes:Document.HomePage
     ./flow domain:add neos-test-twodimensions twodimensions.localhost --port 8081
 
diff --git a/Tests/IntegrationTests/e2e.sh b/Tests/IntegrationTests/e2e.sh
index e78c71986e..9446741e5d 100755
--- a/Tests/IntegrationTests/e2e.sh
+++ b/Tests/IntegrationTests/e2e.sh
@@ -80,17 +80,17 @@ function run_tests() {
 
     ./flow cr:setup --content-repository onedimension
     ./flow cr:import --content-repository onedimension --path ./DistributionPackages/Neos.Test.OneDimension/Resources/Private/Content
-    # Hack to create Neos workspace metadata for the live workspace (Failed to load metadata for workspace "live").
-    ./flow migrateevents:migrateWorkspaceMetadataToWorkspaceService --content-repository onedimension
-    # Connect to a Neos site, todo the nodeTypeName parameter is obsolete but necessary
+    # TODO: Fix when part of importer: Add Neos workspace role for the live workspace
+    ./flow workspace:assignrole live Neos.Neos:LivePublisher collaborator --content-repository onedimension
+    # TODO: Fix when part of importer: Connect to a Neos site, todo the nodeTypeName parameter is obsolete but necessary
     ./flow site:create neos-test-onedimension Neos.Test.OneDimension Neos.TestNodeTypes:Document.HomePage
     ./flow domain:add neos-test-onedimension onedimension.localhost --port 8081
 
     ./flow cr:setup --content-repository twodimensions
     ./flow cr:import --content-repository twodimensions --path ./DistributionPackages/Neos.Test.TwoDimensions/Resources/Private/Content
-    # Hack to create Neos workspace metadata for the live workspace (Failed to load metadata for workspace "live").
-    ./flow migrateevents:migrateWorkspaceMetadataToWorkspaceService --content-repository onedimension
-    # Connect to a Neos site, todo the nodeTypeName parameter is obsolete but necessary
+    # TODO: Fix when part of importer: Add Neos workspace role for the live workspace
+    ./flow workspace:assignrole live Neos.Neos:LivePublisher collaborator --content-repository twodimensions
+    # TODO: Fix when part of importer: Connect to a Neos site, todo the nodeTypeName parameter is obsolete but necessary
     ./flow site:create neos-test-twodimensions Neos.Test.TwoDimensions Neos.TestNodeTypes:Document.HomePage
     ./flow domain:add neos-test-twodimensions twodimensions.localhost --port 8081