diff --git a/config/sync/system.action.user_add_role_action.content_creator.yml b/config/sync/system.action.user_add_role_action.content_creator.yml
new file mode 100644
index 0000000000..8e0f428a07
--- /dev/null
+++ b/config/sync/system.action.user_add_role_action.content_creator.yml
@@ -0,0 +1,14 @@
+uuid: 99265270-f9d0-4784-9c2c-f32243eec39d
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.content_creator
+  module:
+    - user
+id: user_add_role_action.content_creator
+label: 'Add the Content creator role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: content_creator
diff --git a/config/sync/system.action.user_add_role_action.content_publisher.yml b/config/sync/system.action.user_add_role_action.content_publisher.yml
new file mode 100644
index 0000000000..717919eeb2
--- /dev/null
+++ b/config/sync/system.action.user_add_role_action.content_publisher.yml
@@ -0,0 +1,14 @@
+uuid: 44359427-6773-4aea-b2aa-0edf7b14d2d0
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.content_publisher
+  module:
+    - user
+id: user_add_role_action.content_publisher
+label: 'Add the Content publisher role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: content_publisher
diff --git a/config/sync/system.action.user_add_role_action.content_reviewer.yml b/config/sync/system.action.user_add_role_action.content_reviewer.yml
new file mode 100644
index 0000000000..2782d17d6d
--- /dev/null
+++ b/config/sync/system.action.user_add_role_action.content_reviewer.yml
@@ -0,0 +1,14 @@
+uuid: c3aa76b2-e643-4f86-b429-e9945200d417
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.content_reviewer
+  module:
+    - user
+id: user_add_role_action.content_reviewer
+label: 'Add the Content reviewer role to the selected user(s)'
+type: user
+plugin: user_add_role_action
+configuration:
+  rid: content_reviewer
diff --git a/config/sync/system.action.user_add_role_action.landing_page_creator.yml b/config/sync/system.action.user_add_role_action.landing_page_creator.yml
deleted file mode 100644
index 9adec477f5..0000000000
--- a/config/sync/system.action.user_add_role_action.landing_page_creator.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 60a7e1f5-5258-41dc-bcf0-46be264d6e22
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.landing_page_creator
-  module:
-    - user
-id: user_add_role_action.landing_page_creator
-label: 'Add the Landing page creator role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: landing_page_creator
diff --git a/config/sync/system.action.user_add_role_action.landing_page_reviewer.yml b/config/sync/system.action.user_add_role_action.landing_page_reviewer.yml
deleted file mode 100644
index d6a3f40b3f..0000000000
--- a/config/sync/system.action.user_add_role_action.landing_page_reviewer.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 829af3ec-9c32-49be-a212-168724ed4616
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.landing_page_reviewer
-  module:
-    - user
-id: user_add_role_action.landing_page_reviewer
-label: 'Add the Landing page reviewer role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: landing_page_reviewer
diff --git a/config/sync/system.action.user_add_role_action.layout_manager.yml b/config/sync/system.action.user_add_role_action.layout_manager.yml
deleted file mode 100644
index 77cc9f1ef6..0000000000
--- a/config/sync/system.action.user_add_role_action.layout_manager.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 3b0fb7c9-a028-4716-a9c4-68b22457dd38
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.layout_manager
-  module:
-    - user
-id: user_add_role_action.layout_manager
-label: 'Add the Layout manager role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: layout_manager
diff --git a/config/sync/system.action.user_add_role_action.page_creator.yml b/config/sync/system.action.user_add_role_action.page_creator.yml
deleted file mode 100644
index faf7f12d16..0000000000
--- a/config/sync/system.action.user_add_role_action.page_creator.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 17ce49bf-d41c-40fa-a272-974a169976b2
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.page_creator
-  module:
-    - user
-id: user_add_role_action.page_creator
-label: 'Add the Basic page creator role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: page_creator
diff --git a/config/sync/system.action.user_add_role_action.page_reviewer.yml b/config/sync/system.action.user_add_role_action.page_reviewer.yml
deleted file mode 100644
index 2d85c43bf5..0000000000
--- a/config/sync/system.action.user_add_role_action.page_reviewer.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: c737ec6e-b848-4416-a04e-7e64bb16eb12
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.page_reviewer
-  module:
-    - user
-id: user_add_role_action.page_reviewer
-label: 'Add the Basic page reviewer role to the selected user(s)'
-type: user
-plugin: user_add_role_action
-configuration:
-  rid: page_reviewer
diff --git a/config/sync/system.action.user_remove_role_action.content_creator.yml b/config/sync/system.action.user_remove_role_action.content_creator.yml
new file mode 100644
index 0000000000..5e8dc790a6
--- /dev/null
+++ b/config/sync/system.action.user_remove_role_action.content_creator.yml
@@ -0,0 +1,14 @@
+uuid: 400f013e-fd53-448c-bad5-b4f49b6b6542
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.content_creator
+  module:
+    - user
+id: user_remove_role_action.content_creator
+label: 'Remove the Content creator role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: content_creator
diff --git a/config/sync/system.action.user_remove_role_action.content_publisher.yml b/config/sync/system.action.user_remove_role_action.content_publisher.yml
new file mode 100644
index 0000000000..1af47de99d
--- /dev/null
+++ b/config/sync/system.action.user_remove_role_action.content_publisher.yml
@@ -0,0 +1,14 @@
+uuid: b83f08c7-7a5c-4d80-acd1-f4da3fc6acbb
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.content_publisher
+  module:
+    - user
+id: user_remove_role_action.content_publisher
+label: 'Remove the Content publisher role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: content_publisher
diff --git a/config/sync/system.action.user_remove_role_action.content_reviewer.yml b/config/sync/system.action.user_remove_role_action.content_reviewer.yml
new file mode 100644
index 0000000000..045c50930c
--- /dev/null
+++ b/config/sync/system.action.user_remove_role_action.content_reviewer.yml
@@ -0,0 +1,14 @@
+uuid: b40918c7-be63-44a8-a2d5-c20d14401b49
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.content_reviewer
+  module:
+    - user
+id: user_remove_role_action.content_reviewer
+label: 'Remove the Content reviewer role from the selected user(s)'
+type: user
+plugin: user_remove_role_action
+configuration:
+  rid: content_reviewer
diff --git a/config/sync/system.action.user_remove_role_action.landing_page_creator.yml b/config/sync/system.action.user_remove_role_action.landing_page_creator.yml
deleted file mode 100644
index 9d0d874c0c..0000000000
--- a/config/sync/system.action.user_remove_role_action.landing_page_creator.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: e2f23a99-47a5-410e-a9c0-4e499f3097e2
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.landing_page_creator
-  module:
-    - user
-id: user_remove_role_action.landing_page_creator
-label: 'Remove the Landing page creator role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: landing_page_creator
diff --git a/config/sync/system.action.user_remove_role_action.landing_page_reviewer.yml b/config/sync/system.action.user_remove_role_action.landing_page_reviewer.yml
deleted file mode 100644
index 3ed7f599fc..0000000000
--- a/config/sync/system.action.user_remove_role_action.landing_page_reviewer.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 8e77a225-b3fc-45b1-9ead-689d1fba0f45
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.landing_page_reviewer
-  module:
-    - user
-id: user_remove_role_action.landing_page_reviewer
-label: 'Remove the Landing page reviewer role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: landing_page_reviewer
diff --git a/config/sync/system.action.user_remove_role_action.layout_manager.yml b/config/sync/system.action.user_remove_role_action.layout_manager.yml
deleted file mode 100644
index 1bae2b2a74..0000000000
--- a/config/sync/system.action.user_remove_role_action.layout_manager.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: f4766644-c31a-4591-af40-b8eae7baf3ca
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.layout_manager
-  module:
-    - user
-id: user_remove_role_action.layout_manager
-label: 'Remove the Layout manager role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: layout_manager
diff --git a/config/sync/system.action.user_remove_role_action.page_creator.yml b/config/sync/system.action.user_remove_role_action.page_creator.yml
deleted file mode 100644
index c57fb86676..0000000000
--- a/config/sync/system.action.user_remove_role_action.page_creator.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 912277f9-a2dc-4f07-9bdb-f5a7c8746066
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.page_creator
-  module:
-    - user
-id: user_remove_role_action.page_creator
-label: 'Remove the Basic page creator role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: page_creator
diff --git a/config/sync/system.action.user_remove_role_action.page_reviewer.yml b/config/sync/system.action.user_remove_role_action.page_reviewer.yml
deleted file mode 100644
index f011498da8..0000000000
--- a/config/sync/system.action.user_remove_role_action.page_reviewer.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-uuid: 3ac53bae-1690-40b7-a693-8bcd6af06e4c
-langcode: en
-status: true
-dependencies:
-  config:
-    - user.role.page_reviewer
-  module:
-    - user
-id: user_remove_role_action.page_reviewer
-label: 'Remove the Basic page reviewer role from the selected user(s)'
-type: user
-plugin: user_remove_role_action
-configuration:
-  rid: page_reviewer
diff --git a/config/sync/user.role.content_creator.yml b/config/sync/user.role.content_creator.yml
new file mode 100644
index 0000000000..53ee66d028
--- /dev/null
+++ b/config/sync/user.role.content_creator.yml
@@ -0,0 +1,34 @@
+uuid: 488ad726-c1b4-430b-ac62-51c64bd60b43
+langcode: en
+status: true
+dependencies:
+  module:
+    - lightning_core
+third_party_settings:
+  lightning_core:
+    description: ''
+id: content_creator
+label: 'Content creator'
+weight: 7
+is_admin: null
+permissions:
+  - 'access administration pages'
+  - 'access content overview'
+  - 'access toolbar'
+  - 'access user profiles'
+  - 'create landing_page content'
+  - 'create page content'
+  - 'edit any landing_page content'
+  - 'edit any page content'
+  - 'edit own landing_page content'
+  - 'edit own page content'
+  - 'use editorial transition archived_published'
+  - 'use editorial transition create_new_draft'
+  - 'use editorial transition review'
+  - 'view all revisions'
+  - 'view any unpublished content'
+  - 'view landing_page revisions'
+  - 'view latest version'
+  - 'view own unpublished content'
+  - 'view page revisions'
+  - 'view the administration theme'
diff --git a/config/sync/user.role.content_publisher.yml b/config/sync/user.role.content_publisher.yml
new file mode 100644
index 0000000000..d5d95343a1
--- /dev/null
+++ b/config/sync/user.role.content_publisher.yml
@@ -0,0 +1,47 @@
+uuid: 2782bb1f-74f1-4ac9-b2f8-5dd3cc9bfec1
+langcode: en
+status: true
+dependencies:
+  module:
+    - lightning_core
+third_party_settings:
+  lightning_core:
+    description: ''
+id: content_publisher
+label: 'Content publisher'
+weight: 9
+is_admin: null
+permissions:
+  - 'access administration pages'
+  - 'access content overview'
+  - 'access toolbar'
+  - 'access user profiles'
+  - 'create landing_page content'
+  - 'create page content'
+  - 'delete any landing_page content'
+  - 'delete any page content'
+  - 'delete own landing_page content'
+  - 'delete own page content'
+  - 'edit any landing_page content'
+  - 'edit any page content'
+  - 'edit own landing_page content'
+  - 'edit own page content'
+  - 'revert all revisions'
+  - 'revert landing_page revisions'
+  - 'revert page revisions'
+  - 'schedule editorial transition archive'
+  - 'schedule editorial transition archived_published'
+  - 'schedule editorial transition publish'
+  - 'use editorial transition archive'
+  - 'use editorial transition archived_published'
+  - 'use editorial transition create_new_draft'
+  - 'use editorial transition publish'
+  - 'use editorial transition review'
+  - 'use editorial transition stage_for_publishing'
+  - 'view all revisions'
+  - 'view any unpublished content'
+  - 'view landing_page revisions'
+  - 'view latest version'
+  - 'view own unpublished content'
+  - 'view page revisions'
+  - 'view the administration theme'
diff --git a/config/sync/user.role.content_reviewer.yml b/config/sync/user.role.content_reviewer.yml
new file mode 100644
index 0000000000..681617c066
--- /dev/null
+++ b/config/sync/user.role.content_reviewer.yml
@@ -0,0 +1,35 @@
+uuid: abeaf14e-b04e-42f4-b009-3f5fa1f03458
+langcode: en
+status: true
+dependencies:
+  module:
+    - lightning_core
+third_party_settings:
+  lightning_core:
+    description: ''
+id: content_reviewer
+label: 'Content reviewer'
+weight: 8
+is_admin: null
+permissions:
+  - 'access administration pages'
+  - 'access content overview'
+  - 'access toolbar'
+  - 'access user profiles'
+  - 'create landing_page content'
+  - 'create page content'
+  - 'edit any landing_page content'
+  - 'edit any page content'
+  - 'edit own landing_page content'
+  - 'edit own page content'
+  - 'use editorial transition archived_published'
+  - 'use editorial transition create_new_draft'
+  - 'use editorial transition review'
+  - 'use editorial transition stage_for_publishing'
+  - 'view all revisions'
+  - 'view any unpublished content'
+  - 'view landing_page revisions'
+  - 'view latest version'
+  - 'view own unpublished content'
+  - 'view page revisions'
+  - 'view the administration theme'
diff --git a/config/sync/user.role.landing_page_creator.yml b/config/sync/user.role.landing_page_creator.yml
deleted file mode 100644
index 181bbba376..0000000000
--- a/config/sync/user.role.landing_page_creator.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 8b1d0e41-f534-4998-a589-f617adf0167b
-langcode: en
-status: true
-dependencies: {  }
-id: landing_page_creator
-label: 'Landing page creator'
-weight: 4
-is_admin: false
-permissions:
-  - 'access contextual links'
-  - 'access image_browser entity browser pages'
-  - 'access in-place editing'
-  - 'access media_browser entity browser pages'
-  - 'access panels in-place editing'
-  - 'access toolbar'
-  - 'administer panelizer node landing_page content'
-  - 'administer panelizer node landing_page layout'
-  - 'change layouts in place editing'
-  - 'create landing_page content'
-  - 'create url aliases'
-  - 'edit own landing_page content'
-  - 'use editorial transition create_new_draft'
-  - 'use editorial transition review'
-  - 'use moderation sidebar'
-  - 'use text format rich_text'
-  - 'view any unpublished content'
-  - 'view landing_page revisions'
-  - 'view latest version'
-  - 'view own unpublished content'
diff --git a/config/sync/user.role.landing_page_reviewer.yml b/config/sync/user.role.landing_page_reviewer.yml
deleted file mode 100644
index 01cf432327..0000000000
--- a/config/sync/user.role.landing_page_reviewer.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: bc77474b-1d80-4f37-9e1b-8be4ff002963
-langcode: en
-status: true
-dependencies: {  }
-id: landing_page_reviewer
-label: 'Landing page reviewer'
-weight: 5
-is_admin: false
-permissions:
-  - 'access content overview'
-  - 'access toolbar'
-  - 'delete any landing_page content'
-  - 'edit any landing_page content'
-  - 'use editorial transition archive'
-  - 'use editorial transition publish'
-  - 'use editorial transition review'
-  - 'use moderation sidebar'
-  - 'view any unpublished content'
-  - 'view latest version'
diff --git a/config/sync/user.role.layout_manager.yml b/config/sync/user.role.layout_manager.yml
deleted file mode 100644
index c04d5cd615..0000000000
--- a/config/sync/user.role.layout_manager.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-uuid: dd7cd1ea-6a87-4b27-aa36-51e4d5553b01
-langcode: en
-status: true
-dependencies: {  }
-_core:
-  default_config_hash: O15STNqaxZJp9WQvMNCRYzhPnpaMVU0W8eVoijQd3rw
-id: layout_manager
-label: 'Layout manager'
-weight: 2
-is_admin: false
-permissions:
-  - 'administer node display'
-  - 'administer panelizer'
-  - 'administer panelizer node landing_page defaults'
-  - 'administer panelizer node page defaults'
diff --git a/config/sync/user.role.page_creator.yml b/config/sync/user.role.page_creator.yml
deleted file mode 100644
index 17610db686..0000000000
--- a/config/sync/user.role.page_creator.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-uuid: 5f46a412-8a96-42f4-85c0-c7066ac7d470
-langcode: en
-status: true
-dependencies: {  }
-id: page_creator
-label: 'Basic page creator'
-weight: 2
-is_admin: false
-permissions:
-  - 'access contextual links'
-  - 'access image_browser entity browser pages'
-  - 'access in-place editing'
-  - 'access media_browser entity browser pages'
-  - 'access panels in-place editing'
-  - 'access toolbar'
-  - 'administer panelizer node page content'
-  - 'administer panelizer node page layout'
-  - 'change layouts in place editing'
-  - 'create page content'
-  - 'create url aliases'
-  - 'edit own page content'
-  - 'use editorial transition create_new_draft'
-  - 'use editorial transition review'
-  - 'use moderation sidebar'
-  - 'use text format rich_text'
-  - 'view any unpublished content'
-  - 'view latest version'
-  - 'view own unpublished content'
-  - 'view page revisions'
diff --git a/config/sync/user.role.page_reviewer.yml b/config/sync/user.role.page_reviewer.yml
deleted file mode 100644
index 4d00264150..0000000000
--- a/config/sync/user.role.page_reviewer.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-uuid: e6c7684d-1e02-42a7-b248-7240392b733c
-langcode: en
-status: true
-dependencies: {  }
-id: page_reviewer
-label: 'Basic page reviewer'
-weight: 3
-is_admin: false
-permissions:
-  - 'access content overview'
-  - 'access toolbar'
-  - 'delete any page content'
-  - 'edit any page content'
-  - 'use editorial transition archive'
-  - 'use editorial transition publish'
-  - 'use editorial transition review'
-  - 'use moderation sidebar'
-  - 'view any unpublished content'
-  - 'view latest version'
diff --git a/config/sync/workflows.workflow.editorial.yml b/config/sync/workflows.workflow.editorial.yml
index d3b1418629..c356652f5d 100644
--- a/config/sync/workflows.workflow.editorial.yml
+++ b/config/sync/workflows.workflow.editorial.yml
@@ -14,16 +14,21 @@ label: Editorial
 type: content_moderation
 type_settings:
   states:
+    approved_by_reviewer:
+      published: false
+      default_revision: false
+      label: Staged
+      weight: -1
     archived:
       label: Archived
-      weight: 5
+      weight: 1
       published: false
       default_revision: true
     draft:
       label: Draft
       published: false
       default_revision: false
-      weight: -5
+      weight: -3
     published:
       label: Published
       published: true
@@ -31,7 +36,7 @@ type_settings:
       weight: 0
     review:
       label: 'In review'
-      weight: -1
+      weight: -2
       published: false
       default_revision: false
   transitions:
@@ -40,18 +45,19 @@ type_settings:
       from:
         - published
       to: archived
-      weight: 2
+      weight: 1
     archived_published:
       label: 'Restore from archive'
       from:
         - archived
       to: published
-      weight: 4
+      weight: 2
     create_new_draft:
       label: 'Create New Draft'
       to: draft
-      weight: 0
+      weight: -3
       from:
+        - approved_by_reviewer
         - archived
         - draft
         - published
@@ -59,18 +65,27 @@ type_settings:
     publish:
       label: Publish
       to: published
-      weight: 1
+      weight: 0
       from:
+        - approved_by_reviewer
         - draft
         - published
         - review
     review:
       label: 'Send to review'
       to: review
-      weight: 0
+      weight: -2
       from:
         - draft
         - review
+    stage_for_publishing:
+      label: 'Stage for publishing'
+      from:
+        - approved_by_reviewer
+        - draft
+        - review
+      to: approved_by_reviewer
+      weight: -1
   entity_types:
     node:
       - landing_page