diff --git a/config/install/content_moderation.state.needs_review.yml b/config/install/content_moderation.state.needs_review.yml
deleted file mode 100644
index 76a8033..0000000
--- a/config/install/content_moderation.state.needs_review.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-langcode: en
-status: true
-dependencies: {  }
-id: needs_review
-label: Needs Review
-published: false
-default_revision: false
diff --git a/config/install/content_moderation.state_transition.published_draft.yml b/config/install/content_moderation.state_transition.archived_draft.yml
similarity index 51%
copy from config/install/content_moderation.state_transition.published_draft.yml
copy to config/install/content_moderation.state_transition.archived_draft.yml
index daf9efc..8fbf9c3 100644
--- a/config/install/content_moderation.state_transition.published_draft.yml
+++ b/config/install/content_moderation.state_transition.archived_draft.yml
@@ -2,10 +2,10 @@ langcode: en
 status: true
 dependencies:
   config:
+    - content_moderation.state.archived
     - content_moderation.state.draft
-    - content_moderation.state.published
-id: published_draft
-label: 'Create New Draft'
-stateFrom: published
+id: archived_draft
+label: 'Un-archive to Draft'
+stateFrom: archived
 stateTo: draft
 weight: -5
diff --git a/config/install/content_moderation.state_transition.archived_published.yml b/config/install/content_moderation.state_transition.archived_published.yml
index fb4d70d..4be7600 100644
--- a/config/install/content_moderation.state_transition.archived_published.yml
+++ b/config/install/content_moderation.state_transition.archived_published.yml
@@ -8,4 +8,4 @@ id: archived_published
 label: 'Un-archive'
 stateFrom: archived
 stateTo: published
-weight: 0
+weight: -4
diff --git a/config/install/content_moderation.state_transition.draft_draft.yml b/config/install/content_moderation.state_transition.draft_draft.yml
index 166aca2..0ba0f34 100644
--- a/config/install/content_moderation.state_transition.draft_draft.yml
+++ b/config/install/content_moderation.state_transition.draft_draft.yml
@@ -7,4 +7,4 @@ id: draft_draft
 label: 'Create New Draft'
 stateFrom: draft
 stateTo: draft
-weight: -11
+weight: -10
diff --git a/config/install/content_moderation.state_transition.draft_needs_review.yml b/config/install/content_moderation.state_transition.draft_needs_review.yml
deleted file mode 100644
index d88f6f0..0000000
--- a/config/install/content_moderation.state_transition.draft_needs_review.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - content_moderation.state.draft
-    - content_moderation.state.needs_review
-id: draft_needs_review
-label: 'Request Review'
-stateFrom: draft
-stateTo: needs_review
-weight: -10
diff --git a/config/install/content_moderation.state_transition.needs_review_draft.yml b/config/install/content_moderation.state_transition.needs_review_draft.yml
deleted file mode 100644
index 55d095d..0000000
--- a/config/install/content_moderation.state_transition.needs_review_draft.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - content_moderation.state.draft
-    - content_moderation.state.needs_review
-id: needs_review_draft
-label: 'Send Back to Draft'
-stateFrom: needs_review
-stateTo: draft
-weight: -6
diff --git a/config/install/content_moderation.state_transition.needs_review_needs_review.yml b/config/install/content_moderation.state_transition.needs_review_needs_review.yml
deleted file mode 100644
index 6c7dbac..0000000
--- a/config/install/content_moderation.state_transition.needs_review_needs_review.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - content_moderation.state.needs_review
-id: needs_review_needs_review
-label: 'Keep in Review'
-stateFrom: needs_review
-stateTo: needs_review
-weight: -8
diff --git a/config/install/content_moderation.state_transition.needs_review_published.yml b/config/install/content_moderation.state_transition.needs_review_published.yml
deleted file mode 100644
index c729026..0000000
--- a/config/install/content_moderation.state_transition.needs_review_published.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-langcode: en
-status: true
-dependencies:
-  config:
-    - content_moderation.state.needs_review
-    - content_moderation.state.published
-id: needs_review_published
-label: 'Publish'
-stateFrom: needs_review
-stateTo: published
-weight: -7
diff --git a/config/install/content_moderation.state_transition.published_archived.yml b/config/install/content_moderation.state_transition.published_archived.yml
index 30894ad..f3a866a 100644
--- a/config/install/content_moderation.state_transition.published_archived.yml
+++ b/config/install/content_moderation.state_transition.published_archived.yml
@@ -8,4 +8,4 @@ id: published_archived
 label: 'Archive'
 stateFrom: published
 stateTo: archived
-weight: -3
+weight: -6
diff --git a/config/install/content_moderation.state_transition.published_draft.yml b/config/install/content_moderation.state_transition.published_draft.yml
index daf9efc..bd25a31 100644
--- a/config/install/content_moderation.state_transition.published_draft.yml
+++ b/config/install/content_moderation.state_transition.published_draft.yml
@@ -8,4 +8,4 @@ id: published_draft
 label: 'Create New Draft'
 stateFrom: published
 stateTo: draft
-weight: -5
+weight: -8
diff --git a/config/install/content_moderation.state_transition.published_published.yml b/config/install/content_moderation.state_transition.published_published.yml
index e1a19c2..3c09a85 100644
--- a/config/install/content_moderation.state_transition.published_published.yml
+++ b/config/install/content_moderation.state_transition.published_published.yml
@@ -7,4 +7,4 @@ id: published_published
 label: 'Publish'
 stateFrom: published
 stateTo: published
-weight: -4
+weight: -7