diff --git a/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx b/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx
index f23705753d..8ad29a6770 100644
--- a/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx
+++ b/apps/admin-x-settings/src/components/settings/advanced/labs/AlphaFeatures.tsx
@@ -59,6 +59,10 @@ const features = [{
     title: 'Content Visibility',
     description: 'Enables content visibility in Emails',
     flag: 'contentVisibility'
+},{
+    title: 'Publish Flow — End Screen',
+    description: 'Enables improved publish flow',
+    flag: 'publishFlowEndScreen'
 }];
 
 const AlphaFeatures: React.FC = () => {
diff --git a/ghost/admin/app/components/editor/modals/publish-flow.hbs b/ghost/admin/app/components/editor/modals/publish-flow.hbs
index 5efa915609..e202eb7bff 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow.hbs
+++ b/ghost/admin/app/components/editor/modals/publish-flow.hbs
@@ -45,13 +45,14 @@
                 @close={{@close}}
             />
         {{else if this.isComplete}}
-            {{!-- <Editor::Modals::PublishFlow::Confirm
-                @publishOptions={{@data.publishOptions}}
-                @recipientType={{this.recipientType}}
-                @saveTask={{this.saveTask}}
-                @cancel={{this.toggleConfirm}}
-                @close={{@close}}
-            /> --}}
+            {{#unless (feature "publishFlowEndScreen")}}
+                <Editor::Modals::PublishFlow::Complete
+                    @publishOptions={{@data.publishOptions}}
+                    @recipientType={{this.recipientType}}
+                    @postCount={{this.postCount}}
+                    @close={{@close}}
+                />
+            {{/unless}}
         {{else}}
             <Editor::Modals::PublishFlow::Options
                 @publishOptions={{@data.publishOptions}}
diff --git a/ghost/admin/app/components/editor/modals/publish-flow/confirm.js b/ghost/admin/app/components/editor/modals/publish-flow/confirm.js
index b1ed66f578..9152a8b825 100644
--- a/ghost/admin/app/components/editor/modals/publish-flow/confirm.js
+++ b/ghost/admin/app/components/editor/modals/publish-flow/confirm.js
@@ -13,6 +13,7 @@ function isString(str) {
 
 export default class PublishFlowOptions extends Component {
     @service settings;
+    @service feature;
 
     @tracked errorMessage;
 
@@ -91,12 +92,14 @@ export default class PublishFlowOptions extends Component {
 
         try {
             yield this.args.saveTask.perform();
-            if (this.args.publishOptions.isScheduled) {
-                localStorage.setItem('ghost-last-scheduled-post', this.args.publishOptions.post.id);
-                window.location.href = '/ghost/#/posts?type=scheduled';
-            } else {
-                localStorage.setItem('ghost-last-published-post', this.args.publishOptions.post.id);
-                window.location.href = `/ghost/#/posts/analytics/${this.args.publishOptions.post.id}`;
+            if (this.feature.publishFlowEndScreen) {
+                if (this.args.publishOptions.isScheduled) {
+                    localStorage.setItem('ghost-last-scheduled-post', this.args.publishOptions.post.id);
+                    window.location.href = '/ghost/#/posts?type=scheduled';
+                } else {
+                    localStorage.setItem('ghost-last-published-post', this.args.publishOptions.post.id);
+                    window.location.href = `/ghost/#/posts/analytics/${this.args.publishOptions.post.id}`;
+                }
             }
         } catch (e) {
             if (e === undefined && this.args.publishOptions.post.errors.length !== 0) {
diff --git a/ghost/admin/app/components/posts-list/list.js b/ghost/admin/app/components/posts-list/list.js
index a4e6df776a..d0ecbb7a42 100644
--- a/ghost/admin/app/components/posts-list/list.js
+++ b/ghost/admin/app/components/posts-list/list.js
@@ -6,12 +6,15 @@ import {task} from 'ember-concurrency';
 export default class PostsList extends Component {
     @service store;
     @service modals;
+    @service feature;
 
     latestScheduledPost = null;
 
     constructor() {
         super(...arguments);
-        this.checkPublishFlowModal();
+        if (this.feature.publishFlowEndScreen) {
+            this.checkPublishFlowModal();
+        }
     }
 
     async checkPublishFlowModal() {
diff --git a/ghost/admin/app/components/posts/analytics.hbs b/ghost/admin/app/components/posts/analytics.hbs
index 71f1cabb0e..102fbd820f 100644
--- a/ghost/admin/app/components/posts/analytics.hbs
+++ b/ghost/admin/app/components/posts/analytics.hbs
@@ -34,53 +34,61 @@
                         {{moment-format publishedAt "HH:mm"}}
                     {{/let}}
                 </div>
-                <div style="display: flex; gap: 4px;">
-                    <button class="gh-post-list-cta edit" {{on "click" this.fetchPostTask.perform}}>
-                        {{svg-jar "reload" title="Refresh post analytics"}}<span>Refresh</span>
-                    </button>
-                    {{#unless this.post.emailOnly}}
-                        <button class="gh-post-list-cta edit" {{on "click" this.togglePublishFlowModal}}>
-                            {{svg-jar "share" title="Share post"}}<span>Share</span>
-                        </button>
-                    {{/unless}}
+                {{#unless (feature "publishFlowEndScreen")}}
+                    <LinkTo @route="lexical-editor.edit" @models={{array this.post.displayName this.post.id}} class="gh-post-list-cta edit" title="">
+                        {{svg-jar "pen" title=""}}<span>Edit post</span>
+                    </LinkTo>
+                {{else}}
+                    <div style="display: flex; gap: 4px;">
+                        {{#if (feature "publishFlowEndScreen")}}
+                            <button class="gh-post-list-cta edit" {{on "click" this.fetchPostTask.perform}}>
+                                {{svg-jar "reload" title="Refresh post analytics"}}<span>Refresh</span>
+                            </button>
+                        {{/if}}
+                        {{#unless this.post.emailOnly}}
+                            <button class="gh-post-list-cta edit" {{on "click" this.togglePublishFlowModal}}>
+                                {{svg-jar "share" title="Share post"}}<span>Share</span>
+                            </button>
+                        {{/unless}}
 
-                    <span class="dropdown">
-                        <GhDropdownButton
-                            @dropdownName="analytics-actions-menu"
-                            @classNames="gh-post-list-cta edit gh-btn-icon icon-only gh-btn-action-icon"
-                            @title="Analytics Actions"
-                            data-test-button="analytics-actions"
-                        >
-                            <span>
-                                {{svg-jar "dotdotdot"}}
-                                <span class="hidden">Actions</span>
-                            </span>
-                        </GhDropdownButton>
-                        <GhDropdown
-                            @name="analytics-actions-menu"
-                            @tagName="ul"
-                            @classNames="gh-analytics-actions-menu dropdown-menu dropdown-triangle-top-right"
-                            @closeOnClick={{true}}
-                        >
-                            <li>
-                                <LinkTo @route="lexical-editor.edit" @models={{array this.post.displayName this.post.id}}>Edit post</LinkTo>
-                            </li>
-                            <li>
-                                <a href="{{this.post.url}}" target="_blank" rel="noreferrer">View in browser</a>
-                            </li>
-                            <li>
-                                <button
-                                    type="button"
-                                    class="mr2"
-                                    {{on "click" this.confirmDeleteMember}}
-                                    data-test-button="delete-post"
-                                >
-                                    <span class="red">Delete post</span>
-                                </button>
-                            </li>
-                        </GhDropdown>
-                    </span>
-                </div>
+                        <span class="dropdown">
+                            <GhDropdownButton
+                                @dropdownName="analytics-actions-menu"
+                                @classNames="gh-post-list-cta edit gh-btn-icon icon-only gh-btn-action-icon"
+                                @title="Analytics Actions"
+                                data-test-button="analytics-actions"
+                            >
+                                <span>
+                                    {{svg-jar "dotdotdot"}}
+                                    <span class="hidden">Actions</span>
+                                </span>
+                            </GhDropdownButton>
+                            <GhDropdown
+                                @name="analytics-actions-menu"
+                                @tagName="ul"
+                                @classNames="gh-analytics-actions-menu dropdown-menu dropdown-triangle-top-right"
+                                @closeOnClick={{true}}
+                            >
+                                <li>
+                                    <LinkTo @route="lexical-editor.edit" @models={{array this.post.displayName this.post.id}}>Edit post</LinkTo>
+                                </li>
+                                <li>
+                                    <a href="{{this.post.url}}" target="_blank" rel="noreferrer">View in browser</a>
+                                </li>
+                                <li>
+                                    <button
+                                        type="button"
+                                        class="mr2"
+                                        {{on "click" this.confirmDeleteMember}}
+                                        data-test-button="delete-post"
+                                    >
+                                        <span class="red">Delete post</span>
+                                    </button>
+                                </li>
+                            </GhDropdown>
+                        </span>
+                    </div>
+                {{/unless}}
             </div>
         </div>
     </GhCanvasHeader>
diff --git a/ghost/admin/app/components/posts/analytics.js b/ghost/admin/app/components/posts/analytics.js
index c7b38343e4..bbd035091e 100644
--- a/ghost/admin/app/components/posts/analytics.js
+++ b/ghost/admin/app/components/posts/analytics.js
@@ -43,7 +43,9 @@ export default class Analytics extends Component {
 
     constructor() {
         super(...arguments);
-        this.checkPublishFlowModal();
+        if (this.feature.publishFlowEndScreen) {
+            this.checkPublishFlowModal();
+        }
     }
 
     openPublishFlowModal() {
@@ -64,7 +66,11 @@ export default class Analytics extends Component {
     }
 
     get post() {
-        return this._post ?? this.args.post;
+        if (this.feature.publishFlowEndScreen) {
+            return this._post ?? this.args.post;
+        }
+
+        return this.args.post;
     }
 
     set post(value) {
diff --git a/ghost/admin/app/services/feature.js b/ghost/admin/app/services/feature.js
index 2af398c3b0..b58fd84c45 100644
--- a/ghost/admin/app/services/feature.js
+++ b/ghost/admin/app/services/feature.js
@@ -79,6 +79,7 @@ export default class FeatureService extends Service {
     @feature('internalLinking') internalLinking;
     @feature('editorExcerpt') editorExcerpt;
     @feature('contentVisibility') contentVisibility;
+    @feature('publishFlowEndScreen') publishFlowEndScreen;
 
     _user = null;
 
diff --git a/ghost/core/core/shared/labs.js b/ghost/core/core/shared/labs.js
index e8b68426b1..eb2a483148 100644
--- a/ghost/core/core/shared/labs.js
+++ b/ghost/core/core/shared/labs.js
@@ -46,7 +46,8 @@ const ALPHA_FEATURES = [
     'importMemberTier',
     'lexicalIndicators',
     'adminXDemo',
-    'contentVisibility'
+    'contentVisibility',
+    'publishFlowEndScreen'
 ];
 
 module.exports.GA_KEYS = [...GA_FEATURES];