From a4757cf009839a951e8cd5295cd9d549a21f5714 Mon Sep 17 00:00:00 2001
From: Tomi Turtiainen <10324676+tomi@users.noreply.github.com>
Date: Mon, 1 Dec 2025 20:44:59 +0200
Subject: [PATCH] chore: Initial V2 changes (#22553)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
Co-authored-by: yehorkardash <yehor.kardash@n8n.io>
Co-authored-by: Daria <daria.staferova@n8n.io>
Co-authored-by: Svetoslav Dekov <svetoslav.dekov@n8n.io>
Co-authored-by: Nikhil Kuriakose <nikhilkuria@gmail.com>
Co-authored-by: Charlie Kolb <charlie@n8n.io>
---
 .github/workflows/ci-postgres-mysql.yml       |   4 +-
 CONTRIBUTING.md                               |   6 -
 docker/images/n8n/Dockerfile                  |  28 +-
 docker/images/n8n/README.md                   |  20 -
 docker/images/n8n/n8n-task-runners.json       |  35 -
 docker/images/runners/README.md               |   1 -
 .../backend-test-utils/src/db/workflows.ts    |  28 -
 packages/@n8n/benchmark/package.json          |   2 +-
 .../n8n-setups/postgres/docker-compose.yml    |   1 -
 .../scaling-multi-main/docker-compose.yml     |   2 -
 .../scaling-single-main/docker-compose.yml    |   2 -
 .../n8n-setups/sqlite/docker-compose.yml      |   1 -
 .../configs/__tests__/database.config.test.ts |  22 +-
 .../config/src/configs/database.config.ts     |  31 +-
 .../src/configs/instance-settings-config.ts   |   2 +-
 .../@n8n/config/src/configs/nodes.config.ts   |   9 +-
 .../@n8n/config/src/configs/runners.config.ts |   3 +-
 .../config/src/configs/scaling-mode.config.ts |   4 -
 .../config/src/configs/security.config.ts     |  17 +-
 .../config/src/configs/workflows.config.ts    |   4 -
 packages/@n8n/config/test/config.test.ts      |  19 +-
 .../__tests__/workflow.repository.test.ts     |   4 +
 .../src/repositories/workflow.repository.ts   |  61 +-
 packages/cli/bin/n8n                          |   2 +-
 packages/cli/package.json                     |  10 +-
 packages/cli/src/command-registry.ts          |  55 +-
 .../commands/__tests__/execute-batch.test.ts  |   3 +-
 .../src/commands/__tests__/execute.test.ts    |   3 +-
 packages/cli/src/commands/base-command.ts     |  77 +-
 packages/cli/src/commands/publish/workflow.ts |  56 ++
 packages/cli/src/commands/start.ts            |  32 +-
 .../cli/src/commands/unpublish/workflow.ts    |  54 ++
 packages/cli/src/commands/update/workflow.ts  |  55 +-
 packages/cli/src/config/index.ts              |  39 +-
 .../abstract-oauth.controller.test.ts         |   2 +-
 .../oauth/abstract-oauth.controller.ts        |   3 +-
 .../spec/paths/workflows.id.activate.yml      |  19 +
 .../workflows/spec/paths/workflows.id.yml     |   2 +-
 .../handlers/workflows/workflows.handler.ts   |   1 +
 .../scaling/__tests__/scaling.service.test.ts |   2 +-
 packages/cli/src/scaling/scaling.service.ts   |   2 +-
 .../cli/src/workflows/workflow.service.ts     | 177 ++---
 .../commands/publish/workflow.test.ts         | 111 +++
 .../commands/unpublish/workflow.test.ts       | 144 ++++
 .../commands/update/workflow.test.ts          |  48 +-
 .../integration/commands/worker.cmd.test.ts   |   1 +
 .../repositories/workflow.repository.test.ts  | 101 ++-
 .../integration/public-api/workflows.test.ts  | 203 ++---
 .../instance-risk-reporter.test.ts            |   5 +-
 ...-task-runner-execution.integration.test.ts |   1 +
 .../task-runner-module.internal.test.ts       |   1 +
 .../workflows/workflow.service.test.ts        | 123 +--
 .../workflows/workflows.controller.ee.test.ts |  47 --
 .../workflows/workflows.controller.test.ts    | 709 +++++++-----------
 packages/cli/test/setup-test-folder.ts        |   2 +-
 .../__tests__/binary-data.config.test.ts      |  22 +-
 .../src/binary-data/binary-data.config.ts     |  13 +-
 .../src/binary-data/binary-data.service.ts    |  31 +-
 .../file-system-helper-functions.test.ts      |  31 +-
 .../utils/file-system-helper-functions.ts     |  14 +-
 .../__tests__/instance-settings.test.ts       |  53 +-
 .../instance-settings/instance-settings.ts    |  46 +-
 .../frontend/@n8n/i18n/src/locales/en.json    |  25 +-
 .../src/api/workflowHistory.ts                |  16 +-
 packages/frontend/editor-ui/src/Interface.ts  |   2 +
 .../editor-ui/src/app/api/workflows.ts        |  24 +
 .../src/app/components/ActivationModal.vue    |  15 +-
 .../MainHeader/ActionsDropdownMenu.vue        | 434 +++++++++++
 .../MainHeader/WorkflowDetails.test.ts        |  27 +-
 .../components/MainHeader/WorkflowDetails.vue | 498 ++----------
 .../MainHeader/WorkflowHeaderActions.vue      | 194 +++++
 .../WorkflowHeaderDraftPublishActions.test.ts | 411 ++++++++++
 .../WorkflowHeaderDraftPublishActions.vue     | 186 +++++
 .../MainHeader/WorkflowPublishModal.vue       | 289 +++++++
 .../src/app/components/MainHeader/utils.ts    |  11 +
 .../editor-ui/src/app/components/Modals.vue   |  27 +
 .../src/app/components/WorkflowCard.test.ts   |   1 -
 .../src/app/components/WorkflowCard.vue       |  59 +-
 .../app/components/WorkflowPublishForm.vue    |  81 ++
 .../app/composables/useWorkflowActivate.ts    | 124 ++-
 .../src/app/composables/useWorkflowHelpers.ts |   4 +
 .../app/composables/useWorkflowSaving.test.ts |   5 +-
 .../src/app/composables/useWorkflowSaving.ts  |   6 +-
 .../editor-ui/src/app/constants/actions.ts    |   2 +
 .../editor-ui/src/app/constants/modals.ts     |   3 +
 .../editor-ui/src/app/constants/workflows.ts  |   5 +
 .../editor-ui/src/app/stores/ui.store.ts      |   6 +
 .../src/app/stores/workflows.store.ts         |  46 +-
 .../editor-ui/src/app/types/externalHooks.ts  |   4 +-
 .../workflowHistory/__tests__/utils.ts        |   3 +
 .../components/WorkflowHistoryContent.test.ts |  12 +-
 .../components/WorkflowHistoryContent.vue     | 142 +++-
 .../components/WorkflowHistoryList.test.ts    |  24 +-
 .../components/WorkflowHistoryList.vue        |  61 +-
 .../WorkflowHistoryListItem.test.ts           |  41 +-
 .../components/WorkflowHistoryListItem.vue    | 154 +++-
 .../WorkflowHistoryPublishModal.vue           | 155 ++++
 .../WorkflowHistoryVersionRestoreModal.vue    |   7 +-
 .../WorkflowHistoryVersionUnpublishModal.vue  |  79 ++
 .../workflows/workflowHistory/types.ts        |  11 +
 .../workflows/workflowHistory/utils.ts        |  22 +
 .../workflowHistory/views/WorkflowHistory.vue | 161 +++-
 .../credentials/AutomizyApi.credentials.ts    |  26 -
 .../credentials/CrowdDevApi.credentials.ts    |  72 --
 .../credentials/KitemakerApi.credentials.ts   |  19 -
 .../credentials/SpontitApi.credentials.ts     |  25 -
 .../nodes/Automizy/Automizy.node.json         |  18 -
 .../nodes/Automizy/Automizy.node.ts           | 374 ---------
 .../nodes/Automizy/ContactDescription.ts      | 451 -----------
 .../nodes/Automizy/GenericFunctions.ts        |  70 --
 .../nodes/Automizy/ListDescription.ts         | 209 ------
 .../nodes-base/nodes/Automizy/automizy.png    | Bin 1790 -> 0 bytes
 .../nodes/CrowdDev/CrowdDev.node.json         |  18 -
 .../nodes/CrowdDev/CrowdDev.node.ts           |  35 -
 .../nodes/CrowdDev/CrowdDevTrigger.node.json  |  18 -
 .../nodes/CrowdDev/CrowdDevTrigger.node.ts    | 186 -----
 .../nodes/CrowdDev/GenericFunctions.ts        | 221 ------
 .../nodes/CrowdDev/crowdDev.dark.svg          |   4 -
 .../nodes-base/nodes/CrowdDev/crowdDev.svg    |   4 -
 .../CrowdDev/descriptions/activityFields.ts   | 187 -----
 .../CrowdDev/descriptions/automationFields.ts | 130 ----
 .../nodes/CrowdDev/descriptions/index.ts      |  25 -
 .../CrowdDev/descriptions/memberFields.ts     | 276 -------
 .../nodes/CrowdDev/descriptions/noteFields.ts |  93 ---
 .../descriptions/organizationFields.ts        | 151 ----
 .../nodes/CrowdDev/descriptions/resources.ts  |  36 -
 .../nodes/CrowdDev/descriptions/shared.ts     |  27 -
 .../nodes/CrowdDev/descriptions/taskFields.ts | 164 ----
 .../nodes/CrowdDev/descriptions/utils.ts      |  57 --
 .../nodes/Kitemaker/GenericFunctions.ts       |  83 --
 .../nodes/Kitemaker/Kitemaker.node.json       |  18 -
 .../nodes/Kitemaker/Kitemaker.node.ts         | 331 --------
 .../descriptions/OrganizationDescription.ts   |  24 -
 .../descriptions/SpaceDescription.ts          |  58 --
 .../Kitemaker/descriptions/UserDescription.ts |  58 --
 .../descriptions/WorkItemDescription.ts       | 352 ---------
 .../nodes/Kitemaker/descriptions/index.ts     |   4 -
 .../nodes/Kitemaker/kitemaker.dark.svg        |   5 -
 .../nodes-base/nodes/Kitemaker/kitemaker.svg  |   5 -
 .../nodes-base/nodes/Kitemaker/mutations.ts   |  69 --
 .../nodes-base/nodes/Kitemaker/queries.ts     | 200 -----
 .../nodes/N8nTrigger/N8nTrigger.node.ts       |  18 +-
 .../nodes/N8nTrigger/test/trigger.test.ts     |   2 +-
 .../nodes/Spontit/GenericFunctions.ts         |  43 --
 .../nodes/Spontit/PushDescription.ts          | 152 ----
 .../nodes/Spontit/Spontit.node.json           |  18 -
 .../nodes-base/nodes/Spontit/Spontit.node.ts  | 116 ---
 packages/nodes-base/nodes/Spontit/spontit.png | Bin 1688 -> 0 bytes
 packages/nodes-base/package.json              |   9 -
 packages/nodes-base/test/setup.ts             |   2 +
 packages/testing/playwright/fixtures/base.ts  |   1 +
 .../testing/playwright/pages/CanvasPage.ts    |  45 +-
 .../playwright/pages/WorkflowSettingsModal.ts |  16 +
 .../testing/playwright/playwright.config.ts   |   1 +
 .../services/workflow-api-helper.ts           |  23 +-
 .../tests/cli-workflows/credentials.json      |  28 -
 .../workflow-195-schema-mode-workflows.snap   | 429 -----------
 .../tests/cli-workflows/workflows/65.json     | 110 ---
 .../playwright/tests/ui/13-pinning.spec.ts    |   2 +-
 .../53-workflow-production-checklist.spec.ts  |  17 +-
 .../tests/ui/7-workflow-actions.spec.ts       |  92 ++-
 pnpm-lock.yaml                                |  24 +-
 162 files changed, 4078 insertions(+), 7156 deletions(-)
 delete mode 100644 docker/images/n8n/n8n-task-runners.json
 create mode 100644 packages/cli/src/commands/publish/workflow.ts
 create mode 100644 packages/cli/src/commands/unpublish/workflow.ts
 create mode 100644 packages/cli/test/integration/commands/publish/workflow.test.ts
 create mode 100644 packages/cli/test/integration/commands/unpublish/workflow.test.ts
 create mode 100644 packages/frontend/editor-ui/src/app/components/MainHeader/ActionsDropdownMenu.vue
 create mode 100644 packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowHeaderActions.vue
 create mode 100644 packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowHeaderDraftPublishActions.test.ts
 create mode 100644 packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowHeaderDraftPublishActions.vue
 create mode 100644 packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowPublishModal.vue
 create mode 100644 packages/frontend/editor-ui/src/app/components/MainHeader/utils.ts
 create mode 100644 packages/frontend/editor-ui/src/app/components/WorkflowPublishForm.vue
 create mode 100644 packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryPublishModal.vue
 create mode 100644 packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryVersionUnpublishModal.vue
 create mode 100644 packages/frontend/editor-ui/src/features/workflows/workflowHistory/types.ts
 create mode 100644 packages/frontend/editor-ui/src/features/workflows/workflowHistory/utils.ts
 delete mode 100644 packages/nodes-base/credentials/AutomizyApi.credentials.ts
 delete mode 100644 packages/nodes-base/credentials/CrowdDevApi.credentials.ts
 delete mode 100644 packages/nodes-base/credentials/KitemakerApi.credentials.ts
 delete mode 100644 packages/nodes-base/credentials/SpontitApi.credentials.ts
 delete mode 100644 packages/nodes-base/nodes/Automizy/Automizy.node.json
 delete mode 100644 packages/nodes-base/nodes/Automizy/Automizy.node.ts
 delete mode 100644 packages/nodes-base/nodes/Automizy/ContactDescription.ts
 delete mode 100644 packages/nodes-base/nodes/Automizy/GenericFunctions.ts
 delete mode 100644 packages/nodes-base/nodes/Automizy/ListDescription.ts
 delete mode 100644 packages/nodes-base/nodes/Automizy/automizy.png
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/CrowdDev.node.json
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.json
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.ts
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/GenericFunctions.ts
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/crowdDev.dark.svg
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/crowdDev.svg
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/descriptions/resources.ts
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/descriptions/shared.ts
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts
 delete mode 100644 packages/nodes-base/nodes/CrowdDev/descriptions/utils.ts
 delete mode 100644 packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
 delete mode 100644 packages/nodes-base/nodes/Kitemaker/Kitemaker.node.json
 delete mode 100644 packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
 delete mode 100644 packages/nodes-base/nodes/Kitemaker/descriptions/OrganizationDescription.ts
 delete mode 100644 packages/nodes-base/nodes/Kitemaker/descriptions/SpaceDescription.ts
 delete mode 100644 packages/nodes-base/nodes/Kitemaker/descriptions/UserDescription.ts
 delete mode 100644 packages/nodes-base/nodes/Kitemaker/descriptions/WorkItemDescription.ts
 delete mode 100644 packages/nodes-base/nodes/Kitemaker/descriptions/index.ts
 delete mode 100644 packages/nodes-base/nodes/Kitemaker/kitemaker.dark.svg
 delete mode 100644 packages/nodes-base/nodes/Kitemaker/kitemaker.svg
 delete mode 100644 packages/nodes-base/nodes/Kitemaker/mutations.ts
 delete mode 100644 packages/nodes-base/nodes/Kitemaker/queries.ts
 delete mode 100644 packages/nodes-base/nodes/Spontit/GenericFunctions.ts
 delete mode 100644 packages/nodes-base/nodes/Spontit/PushDescription.ts
 delete mode 100644 packages/nodes-base/nodes/Spontit/Spontit.node.json
 delete mode 100644 packages/nodes-base/nodes/Spontit/Spontit.node.ts
 delete mode 100644 packages/nodes-base/nodes/Spontit/spontit.png
 delete mode 100644 packages/testing/playwright/tests/cli-workflows/workflow-tests.spec.ts-snapshots/workflow-195-schema-mode-workflows.snap
 delete mode 100644 packages/testing/playwright/tests/cli-workflows/workflows/65.json

diff --git a/.github/workflows/ci-postgres-mysql.yml b/.github/workflows/ci-postgres-mysql.yml
index 7cd621b653b..4abfb9bc5e8 100644
--- a/.github/workflows/ci-postgres-mysql.yml
+++ b/.github/workflows/ci-postgres-mysql.yml
@@ -60,6 +60,7 @@ jobs:
     needs: build
     runs-on: blacksmith-4vcpu-ubuntu-2204
     timeout-minutes: 30
+    if: false
     env:
       DB_MYSQLDB_PASSWORD: password
       DB_MYSQLDB_POOL_SIZE: 1
@@ -89,6 +90,7 @@ jobs:
     needs: build
     runs-on: blacksmith-2vcpu-ubuntu-2204
     timeout-minutes: 20
+    if: false
     env:
       DB_MYSQLDB_PASSWORD: password
       DB_MYSQLDB_POOL_SIZE: 1
@@ -140,7 +142,7 @@ jobs:
   notify-on-failure:
     name: Notify Slack on failure
     runs-on: ubuntu-latest
-    needs: [sqlite-pooled, mariadb, postgres, mysql]
+    needs: [sqlite-pooled, postgres]
     steps:
       - name: Notify Slack on failure
         uses: act10ns/slack@44541246747a30eb3102d87f7a4cc5471b0ffb7d # v2.1.0
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1c58a048393..29293813326 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -178,12 +178,6 @@ To start n8n execute:
 pnpm start
 ```
 
-To start n8n with tunnel:
-
-```
-./packages/cli/bin/n8n start --tunnel
-```
-
 ## Development cycle
 
 While iterating on n8n modules code, you can run `pnpm dev`. It will then
diff --git a/docker/images/n8n/Dockerfile b/docker/images/n8n/Dockerfile
index 10a40fe7729..7a3456486e5 100644
--- a/docker/images/n8n/Dockerfile
+++ b/docker/images/n8n/Dockerfile
@@ -1,7 +1,5 @@
 ARG NODE_VERSION=22.21.0
 ARG N8N_VERSION=snapshot
-ARG LAUNCHER_VERSION=1.4.1
-ARG TARGETPLATFORM
 
 # ==============================================================================
 # STAGE 1: System Dependencies & Base Setup
@@ -16,29 +14,7 @@ FROM alpine:3.22.2 AS app-artifact-processor
 COPY ./compiled /app/
 
 # ==============================================================================
-# STAGE 3: Task Runner Launcher
-# ==============================================================================
-FROM alpine:3.22.2 AS launcher-downloader
-ARG TARGETPLATFORM
-ARG LAUNCHER_VERSION
-
-RUN set -e; \
-    case "$TARGETPLATFORM" in \
-        "linux/amd64") ARCH_NAME="amd64" ;; \
-        "linux/arm64") ARCH_NAME="arm64" ;; \
-        *) echo "Unsupported platform: $TARGETPLATFORM" && exit 1 ;; \
-    esac; \
-    mkdir /launcher-temp && cd /launcher-temp; \
-    wget -q "https://github.com/n8n-io/task-runner-launcher/releases/download/${LAUNCHER_VERSION}/task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz"; \
-    wget -q "https://github.com/n8n-io/task-runner-launcher/releases/download/${LAUNCHER_VERSION}/task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz.sha256"; \
-    echo "$(cat task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz.sha256) task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz" > checksum.sha256; \
-    sha256sum -c checksum.sha256; \
-    mkdir -p /launcher-bin; \
-    tar xzf task-runner-launcher-${LAUNCHER_VERSION}-linux-${ARCH_NAME}.tar.gz -C /launcher-bin; \
-    cd / && rm -rf /launcher-temp
-
-# ==============================================================================
-# STAGE 4: Final Runtime Image
+# STAGE 3: Final Runtime Image
 # ==============================================================================
 FROM system-deps AS runtime
 
@@ -52,9 +28,7 @@ ENV SHELL=/bin/sh
 WORKDIR /home/node
 
 COPY --from=app-artifact-processor /app /usr/local/lib/node_modules/n8n
-COPY --from=launcher-downloader /launcher-bin/* /usr/local/bin/
 COPY docker/images/n8n/docker-entrypoint.sh /
-COPY docker/images/n8n/n8n-task-runners.json /etc/n8n-task-runners.json
 
 RUN cd /usr/local/lib/node_modules/n8n && \
 		npm rebuild sqlite3 && \
diff --git a/docker/images/n8n/README.md b/docker/images/n8n/README.md
index b84b3806141..7707c183d5d 100644
--- a/docker/images/n8n/README.md
+++ b/docker/images/n8n/README.md
@@ -23,7 +23,6 @@ n8n is a workflow automation platform that gives technical teams the flexibility
   - [Available integrations](#available-integrations)
   - [Documentation](#documentation)
   - [Start n8n in Docker](#start-n8n-in-docker)
-  - [Start n8n with tunnel](#start-n8n-with-tunnel)
   - [Use with PostgreSQL](#use-with-postgresql)
   - [Passing sensitive data using files](#passing-sensitive-data-using-files)
   - [Example server setups](#example-server-setups)
@@ -75,25 +74,6 @@ To save your work between container restarts, it also mounts a docker volume, `n
 
 If this data can't be found at startup n8n automatically creates a new key and any existing credentials can no longer be decrypted.
 
-## Start n8n with tunnel
-
-> **WARNING**: This is only meant for local development and testing and should **NOT** be used in production!
-
-n8n must be reachable from the internet to make use of webhooks - essential for triggering workflows from external web-based services such as GitHub. To make this easier, n8n has a special tunnel service which redirects requests from our servers to your local n8n instance. You can inspect the code running this service here: [https://github.com/n8n-io/localtunnel](https://github.com/n8n-io/localtunnel)
-
-To use it simply start n8n with `--tunnel`
-
-```bash
-docker volume create n8n_data
-
-docker run -it --rm \
- --name n8n \
- -p 5678:5678 \
- -v n8n_data:/home/node/.n8n \
- docker.n8n.io/n8nio/n8n \
- start --tunnel
-```
-
 ## Use with PostgreSQL
 
 By default, n8n uses SQLite to save credentials, past executions and workflows. However, n8n also supports using PostgreSQL.
diff --git a/docker/images/n8n/n8n-task-runners.json b/docker/images/n8n/n8n-task-runners.json
deleted file mode 100644
index 091e5395934..00000000000
--- a/docker/images/n8n/n8n-task-runners.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-	"task-runners": [
-		{
-			"runner-type": "javascript",
-			"workdir": "/home/node",
-			"command": "/usr/local/bin/node",
-			"args": [
-				"--disallow-code-generation-from-strings",
-				"--disable-proto=delete",
-				"/usr/local/lib/node_modules/n8n/node_modules/@n8n/task-runner/dist/start.js"
-			],
-			"allowed-env": [
-				"PATH",
-				"GENERIC_TIMEZONE",
-				"N8N_RUNNERS_GRANT_TOKEN",
-				"N8N_RUNNERS_TASK_BROKER_URI",
-				"N8N_RUNNERS_MAX_PAYLOAD",
-				"N8N_RUNNERS_MAX_CONCURRENCY",
-				"N8N_RUNNERS_TASK_TIMEOUT",
-				"N8N_RUNNERS_HEARTBEAT_INTERVAL",
-				"N8N_RUNNERS_HEALTH_CHECK_SERVER_ENABLED",
-				"N8N_RUNNERS_HEALTH_CHECK_SERVER_HOST",
-				"N8N_RUNNERS_HEALTH_CHECK_SERVER_PORT",
-				"NODE_FUNCTION_ALLOW_BUILTIN",
-				"NODE_FUNCTION_ALLOW_EXTERNAL",
-				"NODE_OPTIONS",
-				"NODE_PATH",
-				"N8N_SENTRY_DSN",
-				"N8N_VERSION",
-				"ENVIRONMENT",
-				"DEPLOYMENT_NAME"
-			]
-		}
-	]
-}
diff --git a/docker/images/runners/README.md b/docker/images/runners/README.md
index 08c5d1f7ca7..ff9078d930b 100644
--- a/docker/images/runners/README.md
+++ b/docker/images/runners/README.md
@@ -38,7 +38,6 @@ docker buildx build \
 N8N_RUNNERS_ENABLED=true \
 N8N_RUNNERS_MODE=external \
 N8N_RUNNERS_AUTH_TOKEN=test \
-N8N_NATIVE_PYTHON_RUNNER=true \
 N8N_LOG_LEVEL=debug \
 pnpm start
 ```
diff --git a/packages/@n8n/backend-test-utils/src/db/workflows.ts b/packages/@n8n/backend-test-utils/src/db/workflows.ts
index d9f03b3f295..0d8274f9ae6 100644
--- a/packages/@n8n/backend-test-utils/src/db/workflows.ts
+++ b/packages/@n8n/backend-test-utils/src/db/workflows.ts
@@ -286,31 +286,3 @@ export async function createActiveWorkflow(
 	workflow.activeVersionId = workflow.versionId;
 	return workflow;
 }
-
-/**
- * Create a workflow with a specific active version.
- * This simulates a workflow where the active version differs from the current version.
- * @param activeVersionId the version ID to set as active
- * @param attributes workflow attributes
- * @param user user to assign the workflow to
- */
-export async function createWorkflowWithActiveVersion(
-	activeVersionId: string,
-	attributes: Partial<IWorkflowDb> = {},
-	user?: User,
-) {
-	const workflow = await createWorkflowWithTriggerAndHistory({ active: true, ...attributes }, user);
-
-	await Container.get(WorkflowHistoryRepository).insert({
-		workflowId: workflow.id,
-		versionId: activeVersionId,
-		nodes: workflow.nodes,
-		connections: workflow.connections,
-		authors: user?.email ?? 'test@example.com',
-	});
-
-	await setActiveVersion(workflow.id, activeVersionId);
-
-	workflow.activeVersionId = activeVersionId;
-	return workflow;
-}
diff --git a/packages/@n8n/benchmark/package.json b/packages/@n8n/benchmark/package.json
index ca70b523bf6..8792b896e1c 100644
--- a/packages/@n8n/benchmark/package.json
+++ b/packages/@n8n/benchmark/package.json
@@ -35,7 +35,7 @@
   "dependencies": {
     "@oclif/core": "4.0.7",
     "axios": "catalog:",
-    "dotenv": "8.6.0",
+    "dotenv": "17.2.3",
     "nanoid": "catalog:",
     "zx": "^8.1.4"
   },
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
index 687de86bd04..255db8bd5c8 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/postgres/docker-compose.yml
@@ -37,7 +37,6 @@ services:
       - N8N_RUNNERS_MODE=external
       - N8N_RUNNERS_BROKER_LISTEN_ADDRESS=0.0.0.0
       - N8N_RUNNERS_AUTH_TOKEN=test
-      - N8N_NATIVE_PYTHON_RUNNER=true
       - N8N_METRICS=true
     ports:
       - 5678:5678
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
index fddd24be355..d193a8cd3ce 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-multi-main/docker-compose.yml
@@ -55,7 +55,6 @@ services:
       - N8N_RUNNERS_MODE=external
       - N8N_RUNNERS_BROKER_LISTEN_ADDRESS=0.0.0.0
       - N8N_RUNNERS_AUTH_TOKEN=test
-      - N8N_NATIVE_PYTHON_RUNNER=true
     command: worker
     volumes:
       - ${RUN_DIR}/n8n-worker1:/n8n
@@ -103,7 +102,6 @@ services:
       - N8N_RUNNERS_MODE=external
       - N8N_RUNNERS_BROKER_LISTEN_ADDRESS=0.0.0.0
       - N8N_RUNNERS_AUTH_TOKEN=test
-      - N8N_NATIVE_PYTHON_RUNNER=true
     command: worker
     volumes:
       - ${RUN_DIR}/n8n-worker2:/n8n
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
index b6a2f61eef8..a765f25f9ad 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/scaling-single-main/docker-compose.yml
@@ -53,7 +53,6 @@ services:
       - N8N_RUNNERS_MODE=external
       - N8N_RUNNERS_BROKER_LISTEN_ADDRESS=0.0.0.0
       - N8N_RUNNERS_AUTH_TOKEN=test
-      - N8N_NATIVE_PYTHON_RUNNER=true
     command: worker
     volumes:
       - ${RUN_DIR}/n8n-worker1:/n8n
@@ -99,7 +98,6 @@ services:
       - N8N_RUNNERS_MODE=external
       - N8N_RUNNERS_BROKER_LISTEN_ADDRESS=0.0.0.0
       - N8N_RUNNERS_AUTH_TOKEN=test
-      - N8N_NATIVE_PYTHON_RUNNER=true
     command: worker
     volumes:
       - ${RUN_DIR}/n8n-worker2:/n8n
diff --git a/packages/@n8n/benchmark/scripts/n8n-setups/sqlite/docker-compose.yml b/packages/@n8n/benchmark/scripts/n8n-setups/sqlite/docker-compose.yml
index e5b193f00b5..f970eed48de 100644
--- a/packages/@n8n/benchmark/scripts/n8n-setups/sqlite/docker-compose.yml
+++ b/packages/@n8n/benchmark/scripts/n8n-setups/sqlite/docker-compose.yml
@@ -19,7 +19,6 @@ services:
       - N8N_RUNNERS_MODE=external
       - N8N_RUNNERS_BROKER_LISTEN_ADDRESS=0.0.0.0
       - N8N_RUNNERS_AUTH_TOKEN=test
-      - N8N_NATIVE_PYTHON_RUNNER=true
       - N8N_METRICS=true
     ports:
       - 5678:5678
diff --git a/packages/@n8n/config/src/configs/__tests__/database.config.test.ts b/packages/@n8n/config/src/configs/__tests__/database.config.test.ts
index c620fc49c28..e50273462ec 100644
--- a/packages/@n8n/config/src/configs/__tests__/database.config.test.ts
+++ b/packages/@n8n/config/src/configs/__tests__/database.config.test.ts
@@ -8,32 +8,12 @@ describe('DatabaseConfig', () => {
 		jest.clearAllMocks();
 	});
 
-	test('`isLegacySqlite` defaults to true', () => {
-		const databaseConfig = Container.get(DatabaseConfig);
-		expect(databaseConfig.isLegacySqlite).toBe(true);
-	});
-
-	test.each(['mariadb', 'mysqldb', 'postgresdb'] satisfies Array<DatabaseConfig['type']>)(
+	test.each(['sqlite', 'mariadb', 'mysqldb', 'postgresdb'] satisfies Array<DatabaseConfig['type']>)(
 		'`isLegacySqlite` returns false if dbType is `%s`',
 		(dbType) => {
 			const databaseConfig = Container.get(DatabaseConfig);
-			databaseConfig.sqlite.poolSize = 0;
 			databaseConfig.type = dbType;
 			expect(databaseConfig.isLegacySqlite).toBe(false);
 		},
 	);
-
-	test('`isLegacySqlite` returns false if dbType is `sqlite` and `poolSize` > 0', () => {
-		const databaseConfig = Container.get(DatabaseConfig);
-		databaseConfig.sqlite.poolSize = 1;
-		databaseConfig.type = 'sqlite';
-		expect(databaseConfig.isLegacySqlite).toBe(false);
-	});
-
-	test('`isLegacySqlite` returns true if dbType is `sqlite` and `poolSize` is 0', () => {
-		const databaseConfig = Container.get(DatabaseConfig);
-		databaseConfig.sqlite.poolSize = 0;
-		databaseConfig.type = 'sqlite';
-		expect(databaseConfig.isLegacySqlite).toBe(true);
-	});
 });
diff --git a/packages/@n8n/config/src/configs/database.config.ts b/packages/@n8n/config/src/configs/database.config.ts
index ba08b609c12..fc60af9e418 100644
--- a/packages/@n8n/config/src/configs/database.config.ts
+++ b/packages/@n8n/config/src/configs/database.config.ts
@@ -5,6 +5,17 @@ import { Config, Env, Nested } from '../decorators';
 const dbLoggingOptionsSchema = z.enum(['query', 'error', 'schema', 'warn', 'info', 'log', 'all']);
 type DbLoggingOptions = z.infer<typeof dbLoggingOptionsSchema>;
 
+class MySqlMariaDbNotSupportedError extends Error {
+	// Workaround to not get this reported to Sentry
+	readonly cause: { level: 'warning' } = {
+		level: 'warning',
+	};
+
+	constructor() {
+		super('MySQL and MariaDB have been removed. Please migrate to PostgreSQL.');
+	}
+}
+
 @Config
 class LoggingConfig {
 	/** Whether database logging is enabled. */
@@ -119,15 +130,17 @@ class MysqlConfig {
 	poolSize: number = 10;
 }
 
+const sqlitePoolSizeSchema = z.coerce.number().int().gte(1);
+
 @Config
 export class SqliteConfig {
 	/** SQLite database file name */
 	@Env('DB_SQLITE_DATABASE')
 	database: string = 'database.sqlite';
 
-	/** SQLite database pool size. Set to `0` to disable pooling. */
-	@Env('DB_SQLITE_POOL_SIZE')
-	poolSize: number = 0;
+	/** SQLite database pool size. Must be equal to or higher than `1`. */
+	@Env('DB_SQLITE_POOL_SIZE', sqlitePoolSizeSchema)
+	poolSize: number = 3;
 
 	/**
 	 * Enable SQLite WAL mode.
@@ -154,12 +167,10 @@ export class DatabaseConfig {
 	type: DbType = 'sqlite';
 
 	/**
-	 * Is true if the default sqlite data source of TypeORM is used, as opposed
-	 * to any other (e.g. postgres)
-	 * This also returns false if n8n's new pooled sqlite data source is used.
+	 * Legacy sqlite is no longer supported. Setting kept until we clean up all uses.
 	 */
 	get isLegacySqlite() {
-		return this.type === 'sqlite' && this.sqlite.poolSize === 0;
+		return false;
 	}
 
 	/** Prefix for table names */
@@ -183,4 +194,10 @@ export class DatabaseConfig {
 
 	@Nested
 	sqlite: SqliteConfig;
+
+	sanitize() {
+		if (this.type === 'mariadb' || this.type === 'mysqldb') {
+			throw new MySqlMariaDbNotSupportedError();
+		}
+	}
 }
diff --git a/packages/@n8n/config/src/configs/instance-settings-config.ts b/packages/@n8n/config/src/configs/instance-settings-config.ts
index 644d0567073..4d3f6ca9b62 100644
--- a/packages/@n8n/config/src/configs/instance-settings-config.ts
+++ b/packages/@n8n/config/src/configs/instance-settings-config.ts
@@ -11,7 +11,7 @@ export class InstanceSettingsConfig {
 	 * attempt change them to 0600 (only owner has rw access) if they are too wide.
 	 */
 	@Env('N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS')
-	enforceSettingsFilePermissions: boolean = false;
+	enforceSettingsFilePermissions: boolean = true;
 
 	/**
 	 * Encryption key to use for encrypting and decrypting credentials.
diff --git a/packages/@n8n/config/src/configs/nodes.config.ts b/packages/@n8n/config/src/configs/nodes.config.ts
index 6ea8f115f55..d8613636a06 100644
--- a/packages/@n8n/config/src/configs/nodes.config.ts
+++ b/packages/@n8n/config/src/configs/nodes.config.ts
@@ -26,9 +26,14 @@ export class NodesConfig {
 	@Env('NODES_INCLUDE')
 	include: JsonStringArray = [];
 
-	/** Node types not to load. Excludes none if unspecified. @example '["n8n-nodes-base.hackerNews"]' */
+	/**
+	 * Node types not to load. Defaults to excluding `ExecuteCommand` and `LocalFileTrigger` for security.
+	 * Set to an empty array to enable all node types.
+	 *
+	 * @example '["n8n-nodes-base.hackerNews"]'
+	 */
 	@Env('NODES_EXCLUDE')
-	exclude: JsonStringArray = [];
+	exclude: JsonStringArray = ['n8n-nodes-base.executeCommand', 'n8n-nodes-base.localFileTrigger'];
 
 	/** Node type to use as error trigger */
 	@Env('NODES_ERROR_TRIGGER_TYPE')
diff --git a/packages/@n8n/config/src/configs/runners.config.ts b/packages/@n8n/config/src/configs/runners.config.ts
index 90f643cdaf3..a1dc208ba0c 100644
--- a/packages/@n8n/config/src/configs/runners.config.ts
+++ b/packages/@n8n/config/src/configs/runners.config.ts
@@ -90,6 +90,5 @@ export class TaskRunnersConfig {
 	 * adjusted to account for breaking changes:
 	 * https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.code/#python-native-beta
 	 */
-	@Env('N8N_NATIVE_PYTHON_RUNNER')
-	isNativePythonRunnerEnabled: boolean = false;
+	isNativePythonRunnerEnabled: boolean = true;
 }
diff --git a/packages/@n8n/config/src/configs/scaling-mode.config.ts b/packages/@n8n/config/src/configs/scaling-mode.config.ts
index 15a3aeb1085..7c79d2edd3f 100644
--- a/packages/@n8n/config/src/configs/scaling-mode.config.ts
+++ b/packages/@n8n/config/src/configs/scaling-mode.config.ts
@@ -71,10 +71,6 @@ class SettingsConfig {
 	/** How often (in milliseconds) Bull must check for stalled jobs. `0` to disable. */
 	@Env('QUEUE_WORKER_STALLED_INTERVAL')
 	stalledInterval: number = 30_000;
-
-	/** Max number of times a stalled job will be re-processed. See Bull's [documentation](https://docs.bullmq.io/guide/workers/stalled-jobs). */
-	@Env('QUEUE_WORKER_MAX_STALLED_COUNT')
-	maxStalledCount: number = 1;
 }
 
 @Config
diff --git a/packages/@n8n/config/src/configs/security.config.ts b/packages/@n8n/config/src/configs/security.config.ts
index 5bba4f960b3..082fce420c9 100644
--- a/packages/@n8n/config/src/configs/security.config.ts
+++ b/packages/@n8n/config/src/configs/security.config.ts
@@ -3,18 +3,19 @@ import { Config, Env } from '../decorators';
 @Config
 export class SecurityConfig {
 	/**
-	 * Which directories to limit n8n's access to. Separate multiple dirs with semicolon `;`.
+	 * Dirs that the `ReadWriteFile` and `ReadBinaryFiles` nodes are allowed to access. Separate multiple dirs with semicolon `;`.
+	 * Set to an empty string to disable restrictions (insecure, not recommended for production).
 	 *
-	 * @example N8N_RESTRICT_FILE_ACCESS_TO=/home/user/.n8n;/home/user/n8n-data
+	 * @example N8N_RESTRICT_FILE_ACCESS_TO=/home/john/my-n8n-files
 	 */
 	@Env('N8N_RESTRICT_FILE_ACCESS_TO')
-	restrictFileAccessTo: string = '';
+	restrictFileAccessTo: string = '~/.n8n-files';
 
 	/**
-	 * Whether to block access to all files at:
-	 * - the ".n8n" directory,
-	 * - the static cache dir at ~/.cache/n8n/public, and
-	 * - user-defined config files.
+	 * Whether to block nodes from accessing files at dirs internally used by n8n:
+	 * - `~/.n8n`
+	 * - `~/.cache/n8n/public`
+	 * - any dirs specified by `N8N_CONFIG_FILES`, `N8N_CUSTOM_EXTENSIONS`, `N8N_BINARY_DATA_STORAGE_PATH`, `N8N_UM_EMAIL_TEMPLATES_INVITE`, and `UM_EMAIL_TEMPLATES_PWRESET`.
 	 */
 	@Env('N8N_BLOCK_FILE_ACCESS_TO_N8N_FILES')
 	blockFileAccessToN8nFiles: boolean = true;
@@ -50,7 +51,7 @@ export class SecurityConfig {
 	 * Whether to disable bare repositories support in the Git node.
 	 */
 	@Env('N8N_GIT_NODE_DISABLE_BARE_REPOS')
-	disableBareRepos: boolean = false;
+	disableBareRepos: boolean = true;
 
 	/** Whether to allow access to AWS system credentials, e.g. in awsAssumeRole credentials */
 	@Env('N8N_AWS_SYSTEM_CREDENTIALS_ACCESS_ENABLED')
diff --git a/packages/@n8n/config/src/configs/workflows.config.ts b/packages/@n8n/config/src/configs/workflows.config.ts
index fdd4ba8aa0b..7fe9998d0b6 100644
--- a/packages/@n8n/config/src/configs/workflows.config.ts
+++ b/packages/@n8n/config/src/configs/workflows.config.ts
@@ -22,8 +22,4 @@ export class WorkflowsConfig {
 	/** Whether to enable workflow dependency indexing */
 	@Env('N8N_WORKFLOWS_INDEXING_ENABLED')
 	indexingEnabled: boolean = false;
-
-	/** DO NOT USE - Enable draft/publish workflow feature */
-	@Env('N8N_ENV_FEAT_WORKFLOWS_DRAFT_PUBLISH_ENABLED')
-	draftPublishEnabled: boolean = false;
 }
diff --git a/packages/@n8n/config/test/config.test.ts b/packages/@n8n/config/test/config.test.ts
index 30a470816d8..9d608a83e95 100644
--- a/packages/@n8n/config/test/config.test.ts
+++ b/packages/@n8n/config/test/config.test.ts
@@ -5,6 +5,7 @@ import { tmpdir } from 'node:os';
 import path from 'node:path';
 
 import type { UserManagementConfig } from '../src/configs/user-management.config';
+import type { DatabaseConfig } from '../src/index';
 import { GlobalConfig } from '../src/index';
 
 jest.mock('fs');
@@ -95,15 +96,15 @@ describe('GlobalConfig', () => {
 			},
 			sqlite: {
 				database: 'database.sqlite',
-				enableWAL: false,
+				enableWAL: true,
 				executeVacuumOnStartup: false,
-				poolSize: 0,
+				poolSize: 3,
 			},
 			tablePrefix: '',
 			type: 'sqlite',
-			isLegacySqlite: true,
+			isLegacySqlite: false,
 			pingIntervalSeconds: 2,
-		},
+		} as DatabaseConfig,
 		credentials: {
 			defaultName: 'My credentials',
 			overwrite: {
@@ -158,7 +159,7 @@ describe('GlobalConfig', () => {
 		nodes: {
 			errorTriggerType: 'n8n-nodes-base.errorTrigger',
 			include: [],
-			exclude: [],
+			exclude: ['n8n-nodes-base.executeCommand', 'n8n-nodes-base.localFileTrigger'],
 			pythonEnabled: true,
 		},
 		publicApi: {
@@ -186,7 +187,6 @@ describe('GlobalConfig', () => {
 			callerPolicyDefaultOption: 'workflowsFromSameOwner',
 			activationBatchSize: 1,
 			indexingEnabled: false,
-			draftPublishEnabled: false,
 		},
 		endpoints: {
 			metrics: {
@@ -259,7 +259,6 @@ describe('GlobalConfig', () => {
 					lockDuration: 60_000,
 					lockRenewTime: 10_000,
 					stalledInterval: 30_000,
-					maxStalledCount: 1,
 				},
 			},
 		},
@@ -277,7 +276,7 @@ describe('GlobalConfig', () => {
 			taskRequestTimeout: 60,
 			heartbeatInterval: 30,
 			insecureMode: false,
-			isNativePythonRunnerEnabled: false,
+			isNativePythonRunnerEnabled: true,
 		},
 		sentry: {
 			backendDsn: '',
@@ -318,13 +317,13 @@ describe('GlobalConfig', () => {
 			cert: '',
 		},
 		security: {
-			restrictFileAccessTo: '',
+			restrictFileAccessTo: '~/.n8n-files',
 			blockFileAccessToN8nFiles: true,
 			daysAbandonedWorkflow: 90,
 			contentSecurityPolicy: '{}',
 			contentSecurityPolicyReportOnly: false,
 			disableWebhookHtmlSandboxing: false,
-			disableBareRepos: false,
+			disableBareRepos: true,
 			awsSystemCredentialsAccess: false,
 			enableGitNodeHooks: false,
 		},
diff --git a/packages/@n8n/db/src/repositories/__tests__/workflow.repository.test.ts b/packages/@n8n/db/src/repositories/__tests__/workflow.repository.test.ts
index df61b86d85d..0bd999669c2 100644
--- a/packages/@n8n/db/src/repositories/__tests__/workflow.repository.test.ts
+++ b/packages/@n8n/db/src/repositories/__tests__/workflow.repository.test.ts
@@ -6,6 +6,7 @@ import { WorkflowEntity } from '../../entities';
 import { mockEntityManager } from '../../utils/test-utils/mock-entity-manager';
 import { mockInstance } from '../../utils/test-utils/mock-instance';
 import { FolderRepository } from '../folder.repository';
+import { WorkflowHistoryRepository } from '../workflow-history.repository';
 import { WorkflowRepository } from '../workflow.repository';
 
 describe('WorkflowRepository', () => {
@@ -14,10 +15,12 @@ describe('WorkflowRepository', () => {
 		database: { type: 'postgresdb' },
 	});
 	const folderRepository = mockInstance(FolderRepository);
+	const workflowHistoryRepository = mockInstance(WorkflowHistoryRepository);
 	const workflowRepository = new WorkflowRepository(
 		entityManager.connection,
 		globalConfig,
 		folderRepository,
+		workflowHistoryRepository,
 	);
 
 	let queryBuilder: jest.Mocked<SelectQueryBuilder<WorkflowEntity>>;
@@ -141,6 +144,7 @@ describe('WorkflowRepository', () => {
 				entityManager.connection,
 				sqliteConfig,
 				folderRepository,
+				workflowHistoryRepository,
 			);
 			jest.spyOn(sqliteWorkflowRepository, 'createQueryBuilder').mockReturnValue(queryBuilder);
 
diff --git a/packages/@n8n/db/src/repositories/workflow.repository.ts b/packages/@n8n/db/src/repositories/workflow.repository.ts
index 306ef573d25..e428823ef53 100644
--- a/packages/@n8n/db/src/repositories/workflow.repository.ts
+++ b/packages/@n8n/db/src/repositories/workflow.repository.ts
@@ -10,9 +10,10 @@ import type {
 	FindOptionsRelations,
 	EntityManager,
 } from '@n8n/typeorm';
-import { PROJECT_ROOT } from 'n8n-workflow';
+import { PROJECT_ROOT, UserError } from 'n8n-workflow';
 
 import { FolderRepository } from './folder.repository';
+import { WorkflowHistoryRepository } from './workflow-history.repository';
 import {
 	WebhookEntity,
 	TagEntity,
@@ -54,6 +55,7 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 		dataSource: DataSource,
 		private readonly globalConfig: GlobalConfig,
 		private readonly folderRepository: FolderRepository,
+		private readonly workflowHistoryRepository: WorkflowHistoryRepository,
 	) {
 		super(WorkflowEntity, dataSource.manager);
 	}
@@ -824,6 +826,12 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 	}
 
 	async updateActiveState(workflowId: string, newState: boolean) {
+		const workflow = await this.findById(workflowId);
+
+		if (!workflow) {
+			throw new UserError(`Workflow "${workflowId}" not found.`);
+		}
+
 		if (newState) {
 			return await this.createQueryBuilder()
 				.update(WorkflowEntity)
@@ -838,26 +846,49 @@ export class WorkflowRepository extends Repository<WorkflowEntity> {
 		}
 	}
 
-	async deactivateAll() {
+	/**
+	 * Publish a specific version of a workflow
+	 * @param workflowId - The ID of the workflow
+	 * @param versionId - The ID of the version to publish (optional; if not provided, uses the current version)
+	 * */
+	async publishVersion(workflowId: string, versionId?: string) {
+		let versionIdToPublish = versionId;
+		if (!versionIdToPublish) {
+			const workflow = await this.findOne({
+				where: { id: workflowId },
+				select: ['id', 'versionId'],
+			});
+
+			if (!workflow) {
+				throw new UserError(`Workflow "${workflowId}" not found.`);
+			}
+
+			versionIdToPublish = workflow.versionId;
+		}
+
+		const version = await this.workflowHistoryRepository.findOneBy({
+			workflowId,
+			versionId: versionIdToPublish,
+		});
+		if (!version) {
+			throw new UserError(
+				`Version "${versionIdToPublish}" not found for workflow "${workflowId}".`,
+			);
+		}
+
+		return await this.update(
+			{ id: workflowId },
+			{ active: true, activeVersionId: versionIdToPublish },
+		);
+	}
+
+	async unpublishAll() {
 		return await this.update(
 			{ activeVersionId: Not(IsNull()) },
 			{ active: false, activeVersionId: null },
 		);
 	}
 
-	// We're planning to remove this command in V2, so for now set activeVersion to the current version
-	async activateAll() {
-		await this.manager
-			.createQueryBuilder()
-			.update(WorkflowEntity)
-			.set({
-				active: true,
-				activeVersionId: () => 'versionId',
-			})
-			.where('activeVersionId IS NULL')
-			.execute();
-	}
-
 	async findByActiveState(activeState: boolean) {
 		return await this.findBy({ activeVersionId: activeState ? Not(IsNull()) : IsNull() });
 	}
diff --git a/packages/cli/bin/n8n b/packages/cli/bin/n8n
index 62241cdb7c4..213d1946e79 100755
--- a/packages/cli/bin/n8n
+++ b/packages/cli/bin/n8n
@@ -37,7 +37,7 @@ require('reflect-metadata');
 // Also, do not use `inE2ETests` from constants here, because that'd end up code that might read from `process.env` before the values are loaded from an `.env` file.
 if (process.env.E2E_TESTS !== 'true') {
 	// Loading dotenv early ensures that `process.env` is up-to-date everywhere in code
-	require('dotenv').config();
+	require('dotenv').config({ quiet: true });
 }
 
 // Load config early to ensure `N8N_CONFIG_FILES` values are populated into `GlobalConfig`
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 953a6268ba3..89495997147 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -26,14 +26,14 @@
     "test:dev": "N8N_LOG_LEVEL=silent DB_SQLITE_POOL_SIZE=4 DB_TYPE=sqlite jest --watch",
     "test:sqlite": "N8N_LOG_LEVEL=silent DB_SQLITE_POOL_SIZE=4 DB_TYPE=sqlite jest --config=jest.config.integration.js --no-coverage",
     "test:postgres": "N8N_LOG_LEVEL=silent DB_TYPE=postgresdb DB_POSTGRESDB_SCHEMA=alt_schema DB_TABLE_PREFIX=test_ jest --config=jest.config.integration.js --no-coverage",
-    "test:mariadb": "N8N_LOG_LEVEL=silent DB_TYPE=mariadb DB_TABLE_PREFIX=test_ jest --config=jest.config.integration.js --no-coverage",
-    "test:mysql": "N8N_LOG_LEVEL=silent DB_TYPE=mysqldb DB_TABLE_PREFIX=test_ jest --config=jest.config.integration.js --no-coverage --maxWorkers=1",
+    "test:mariadb": "echo true",
+    "test:mysql": "echo true",
     "test:win": "set N8N_LOG_LEVEL=silent&& set DB_SQLITE_POOL_SIZE=4&& set DB_TYPE=sqlite&& jest",
     "test:dev:win": "set N8N_LOG_LEVEL=silent&& set DB_SQLITE_POOL_SIZE=4&& set DB_TYPE=sqlite&& jest --watch",
     "test:sqlite:win": "set N8N_LOG_LEVEL=silent&& set DB_SQLITE_POOL_SIZE=4&& set DB_TYPE=sqlite&& jest --config=jest.config.integration.js",
     "test:postgres:win": "set N8N_LOG_LEVEL=silent&& set DB_TYPE=postgresdb&& set DB_POSTGRESDB_SCHEMA=alt_schema&& set DB_TABLE_PREFIX=test_&& jest --config=jest.config.integration.js --no-coverage",
-    "test:mariadb:win": "set N8N_LOG_LEVEL=silent&& set DB_TYPE=mariadb&& set DB_TABLE_PREFIX=test_&& jest --config=jest.config.integration.js --no-coverage",
-    "test:mysql:win": "set N8N_LOG_LEVEL=silent&& set DB_TYPE=mysqldb&& set DB_TABLE_PREFIX=test_&& jest --config=jest.config.integration.js --no-coverage",
+    "test:mariadb:win": "echo true",
+    "test:mysql:win": "echo true",
     "watch": "tsc-watch -p tsconfig.build.json --onCompilationComplete \"tsc-alias -p tsconfig.build.json\""
   },
   "bin": {
@@ -128,7 +128,7 @@
     "convict": "6.2.4",
     "cookie-parser": "1.4.7",
     "csrf": "3.1.0",
-    "dotenv": "8.6.0",
+    "dotenv": "17.2.3",
     "express": "5.1.0",
     "express-handlebars": "8.0.1",
     "express-openapi-validator": "5.5.3",
diff --git a/packages/cli/src/command-registry.ts b/packages/cli/src/command-registry.ts
index 96376ef1cbd..48c08ff1001 100644
--- a/packages/cli/src/command-registry.ts
+++ b/packages/cli/src/command-registry.ts
@@ -3,7 +3,8 @@ import { CommandMetadata, type CommandEntry } from '@n8n/decorators';
 import { Container, Service } from '@n8n/di';
 import glob from 'fast-glob';
 import picocolors from 'picocolors';
-import { z } from 'zod';
+import { z, ZodError } from 'zod';
+
 import './zod-alias-support';
 
 /**
@@ -37,7 +38,9 @@ export class CommandRegistry {
 		// Try to load regular commands
 		try {
 			await import(`./commands/${this.commandName.replaceAll(':', '/')}.js`);
-		} catch {}
+		} catch {
+			// Do nothing
+		}
 
 		// Load modules to ensure all module commands are registered
 		await this.moduleRegistry.loadModules();
@@ -53,10 +56,23 @@ export class CommandRegistry {
 			return process.exit(0);
 		}
 
-		const { flags } = this.cliParser.parse({
-			argv: process.argv,
-			flagsSchema: commandEntry.flagsSchema,
-		});
+		let flags: Record<string, unknown>;
+		try {
+			({ flags } = this.cliParser.parse({
+				argv: process.argv,
+				flagsSchema: commandEntry.flagsSchema,
+			}));
+		} catch (error) {
+			if (error instanceof ZodError) {
+				this.logger.error(this.formatZodError(error));
+				this.logger.info('');
+				this.printCommandUsage(commandEntry);
+				return process.exit(1);
+			}
+
+			// Preserve previous behavior for non-Zod errors
+			throw error;
+		}
 
 		const command = Container.get(commandEntry.class);
 		command.flags = flags;
@@ -163,4 +179,31 @@ export class CommandRegistry {
 
 		this.logger.info(output);
 	}
+
+	private formatZodError(error: ZodError): string {
+		const issuesByFlag: Record<string, z.ZodIssue[]> = {};
+
+		for (const issue of error.issues) {
+			const flag = (issue.path[0] as string | undefined) ?? 'flags';
+			if (!issuesByFlag[flag]) issuesByFlag[flag] = [];
+			issuesByFlag[flag].push(issue);
+		}
+
+		let output = '';
+
+		output += picocolors.red(
+			`\nError: Invalid flags provided for command "${this.commandName}".\n\n`,
+		);
+
+		for (const [flag, issues] of Object.entries(issuesByFlag)) {
+			const flagLabel = flag === 'flags' ? '(general)' : `--${flag}`;
+			output += `  ${picocolors.bold(flagLabel)}\n`;
+			for (const issue of issues) {
+				output += `    - ${issue.message}\n`;
+			}
+			output += '\n';
+		}
+
+		return output.trimEnd();
+	}
 }
diff --git a/packages/cli/src/commands/__tests__/execute-batch.test.ts b/packages/cli/src/commands/__tests__/execute-batch.test.ts
index 86626f448dd..8ef554eda33 100644
--- a/packages/cli/src/commands/__tests__/execute-batch.test.ts
+++ b/packages/cli/src/commands/__tests__/execute-batch.test.ts
@@ -1,7 +1,7 @@
 import { mockInstance } from '@n8n/backend-test-utils';
 import { GlobalConfig } from '@n8n/config';
 import type { User, WorkflowEntity } from '@n8n/db';
-import { WorkflowRepository, DbConnection, AuthRolesService } from '@n8n/db';
+import { WorkflowRepository, DbConnection, AuthRolesService, BinaryDataRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { type SelectQueryBuilder } from '@n8n/typeorm';
 import { mock } from 'jest-mock-extended';
@@ -40,6 +40,7 @@ const dbConnection = mockInstance(DbConnection);
 dbConnection.init.mockResolvedValue(undefined);
 dbConnection.migrate.mockResolvedValue(undefined);
 mockInstance(AuthRolesService);
+mockInstance(BinaryDataRepository);
 
 test('should start a task runner when task runners are enabled', async () => {
 	// arrange
diff --git a/packages/cli/src/commands/__tests__/execute.test.ts b/packages/cli/src/commands/__tests__/execute.test.ts
index abc50ab8980..6317b50ab1f 100644
--- a/packages/cli/src/commands/__tests__/execute.test.ts
+++ b/packages/cli/src/commands/__tests__/execute.test.ts
@@ -1,7 +1,7 @@
 import { mockInstance } from '@n8n/backend-test-utils';
 import { GlobalConfig } from '@n8n/config';
 import type { User, WorkflowEntity } from '@n8n/db';
-import { WorkflowRepository, DbConnection, AuthRolesService } from '@n8n/db';
+import { WorkflowRepository, DbConnection, AuthRolesService, BinaryDataRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
 import { mock } from 'jest-mock-extended';
 import type { IRun } from 'n8n-workflow';
@@ -39,6 +39,7 @@ const dbConnection = mockInstance(DbConnection);
 dbConnection.init.mockResolvedValue(undefined);
 dbConnection.migrate.mockResolvedValue(undefined);
 mockInstance(AuthRolesService);
+mockInstance(BinaryDataRepository);
 
 test('should start a task runner when task runners are enabled', async () => {
 	// arrange
diff --git a/packages/cli/src/commands/base-command.ts b/packages/cli/src/commands/base-command.ts
index 9e738957a84..ea0ed8d4c54 100644
--- a/packages/cli/src/commands/base-command.ts
+++ b/packages/cli/src/commands/base-command.ts
@@ -20,7 +20,7 @@ import {
 	ErrorReporter,
 	ExecutionContextHookRegistry,
 } from 'n8n-core';
-import { ensureError, sleep, UnexpectedError, UserError } from 'n8n-workflow';
+import { ensureError, sleep, UnexpectedError } from 'n8n-workflow';
 
 import type { AbstractServer } from '@/abstract-server';
 import { N8N_VERSION, N8N_RELEASE_DATE } from '@/constants';
@@ -197,54 +197,41 @@ export abstract class BaseCommand<F = never> {
 		throw new UnexpectedError(message);
 	}
 
-	async initObjectStoreService() {
-		const binaryDataConfig = Container.get(BinaryDataConfig);
-		const isSelected = binaryDataConfig.mode === 's3';
-		const isAvailable = binaryDataConfig.availableModes.includes('s3');
-
-		if (!isSelected) return;
-
-		if (isSelected && !isAvailable) {
-			throw new UserError(
-				'External storage selected but unavailable. Please make external storage available by adding "s3" to `N8N_AVAILABLE_BINARY_DATA_MODES`.',
-			);
-		}
-
-		const isLicensed = Container.get(License).isLicensed(LICENSE_FEATURES.BINARY_DATA_S3);
-		if (!isLicensed) {
-			this.logger.error(
-				'No license found for S3 storage. \n Either set `N8N_DEFAULT_BINARY_DATA_MODE` to something else, or upgrade to a license that supports this feature.',
-			);
-			return process.exit(1);
-		}
-
-		this.logger.debug('License found for external storage - Initializing object store service');
-		try {
-			await Container.get(ObjectStoreService).init();
-			this.logger.debug('Object store init completed');
-		} catch (e) {
-			const error = e instanceof Error ? e : new Error(`${e}`);
-			this.logger.debug('Object store init failed', { error });
-		}
-	}
-
 	async initBinaryDataService() {
+		const binaryDataConfig = Container.get(BinaryDataConfig);
+		const binaryDataService = Container.get(BinaryDataService);
+		const isS3WriteMode = binaryDataConfig.mode === 's3';
+
+		const { DatabaseManager } = await import('@/binary-data/database.manager');
+		binaryDataService.setManager('database', Container.get(DatabaseManager));
+
+		if (isS3WriteMode) {
+			const isLicensed = Container.get(License).isLicensed(LICENSE_FEATURES.BINARY_DATA_S3);
+			if (!isLicensed) {
+				this.logger.error(
+					'S3 binary data storage requires a valid license. Either set `N8N_DEFAULT_BINARY_DATA_MODE` to something else, or upgrade to a license that supports this feature.',
+				);
+				process.exit(1);
+			}
+		}
+
+		// we always try to init S3 for reading - silently fail if not configured
 		try {
-			await this.initObjectStoreService();
-		} catch (e) {
-			const error = e instanceof Error ? e : new Error(`${e}`);
-			this.logger.error(`Failed to init object store: ${error.message}`, { error });
-			process.exit(1);
+			const objectStoreService = Container.get(ObjectStoreService);
+			await objectStoreService.init();
+			const { ObjectStoreManager } = await import('n8n-core/dist/binary-data/object-store.manager');
+			binaryDataService.setManager('s3', new ObjectStoreManager(objectStoreService));
+		} catch {
+			if (isS3WriteMode) {
+				this.logger.error(
+					'Failed to connect to S3 for binary data storage. Please check your S3 configuration.',
+				);
+				process.exit(1);
+			}
+			// S3 not configured - users without S3 data are unaffected; users with S3 data will fail at runtime when reading
 		}
 
-		if (Container.get(BinaryDataConfig).availableModes.includes('database')) {
-			const binaryDataService = Container.get(BinaryDataService);
-			const { DatabaseManager } = await import('@/binary-data/database.manager');
-			const databaseManager = Container.get(DatabaseManager);
-			binaryDataService.setManager('database', databaseManager);
-		}
-
-		await Container.get(BinaryDataService).init();
+		await binaryDataService.init();
 	}
 
 	protected async initDataDeduplicationService() {
diff --git a/packages/cli/src/commands/publish/workflow.ts b/packages/cli/src/commands/publish/workflow.ts
new file mode 100644
index 00000000000..b330de31209
--- /dev/null
+++ b/packages/cli/src/commands/publish/workflow.ts
@@ -0,0 +1,56 @@
+import { WorkflowRepository } from '@n8n/db';
+import { Command } from '@n8n/decorators';
+import { Container } from '@n8n/di';
+import { z } from 'zod';
+
+import { BaseCommand } from '../base-command';
+
+const flagsSchema = z.object({
+	id: z.string().describe('The ID of the workflow to publish'),
+	versionId: z
+		.string()
+		.describe('The version ID to publish. If not provided, publishes the current version')
+		.optional(),
+	all: z.boolean().describe('(Deprecated) This flag is no longer supported').optional(),
+});
+
+@Command({
+	name: 'publish:workflow',
+	description:
+		'Publish a specific version of a workflow. If no version is specified, publishes the current version.',
+	examples: ['--id=5 --versionId=abc123', '--id=5'],
+	flagsSchema,
+})
+export class PublishWorkflowCommand extends BaseCommand<z.infer<typeof flagsSchema>> {
+	async run() {
+		const { flags } = this;
+
+		// Educate users who try to use --all flag
+		if (flags.all) {
+			this.logger.error('The --all flag is no longer supported for workflow publishing.');
+			this.logger.error(
+				'Please publish workflows individually using: publish:workflow --id=<workflow-id> [--versionId=<version-id>]',
+			);
+			return;
+		}
+
+		if (flags.versionId) {
+			this.logger.info(`Publishing workflow with ID: ${flags.id}, version: ${flags.versionId}`);
+		} else {
+			this.logger.info(`Publishing workflow with ID: ${flags.id} (current version)`);
+		}
+
+		await Container.get(WorkflowRepository).publishVersion(flags.id, flags.versionId);
+
+		this.logger.info('Note: Changes will not take effect if n8n is running.');
+		this.logger.info('Please restart n8n for changes to take effect if n8n is currently running.');
+	}
+
+	async catch(error: Error) {
+		this.logger.error('Error updating database. See log messages for details.');
+		this.logger.error('\nGOT ERROR');
+		this.logger.error('====================================');
+		this.logger.error(error.message);
+		this.logger.error(error.stack!);
+	}
+}
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index ed1c2133239..f9e2472b7d5 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -7,7 +7,7 @@ import { Container } from '@n8n/di';
 import glob from 'fast-glob';
 import { createReadStream, createWriteStream, existsSync } from 'fs';
 import { mkdir } from 'fs/promises';
-import { jsonParse, randomString, type IWorkflowExecutionDataProcess } from 'n8n-workflow';
+import { jsonParse, type IWorkflowExecutionDataProcess } from 'n8n-workflow';
 import path from 'path';
 import replaceStream from 'replacestream';
 import { pipeline } from 'stream/promises';
@@ -52,7 +52,7 @@ const flagsSchema = z.object({
 @Command({
 	name: 'start',
 	description: 'Starts n8n. Makes Web-UI available and starts active workflows',
-	examples: ['', '--tunnel', '-o', '--tunnel -o'],
+	examples: ['', '-o'],
 	flagsSchema,
 })
 export class Start extends BaseCommand<z.infer<typeof flagsSchema>> {
@@ -299,34 +299,6 @@ export class Start extends BaseCommand<z.infer<typeof flagsSchema>> {
 			}
 		}
 
-		if (flags.tunnel) {
-			this.log('\nWaiting for tunnel ...');
-
-			let tunnelSubdomain =
-				process.env.N8N_TUNNEL_SUBDOMAIN ?? this.instanceSettings.tunnelSubdomain ?? '';
-
-			if (tunnelSubdomain === '') {
-				// When no tunnel subdomain did exist yet create a new random one
-				tunnelSubdomain = randomString(24).toLowerCase();
-
-				this.instanceSettings.update({ tunnelSubdomain });
-			}
-
-			const { default: localtunnel } = await import('@n8n/localtunnel');
-			const { port } = this.globalConfig;
-
-			const webhookTunnel = await localtunnel(port, {
-				host: 'https://hooks.n8n.cloud',
-				subdomain: tunnelSubdomain,
-			});
-
-			process.env.WEBHOOK_URL = `${webhookTunnel.url}/`;
-			this.log(`Tunnel URL: ${process.env.WEBHOOK_URL}\n`);
-			this.log(
-				'IMPORTANT! Do not share with anybody as it would give people access to your n8n instance!',
-			);
-		}
-
 		if (this.globalConfig.database.isLegacySqlite) {
 			// Employ lazy loading to avoid unnecessary imports in the CLI
 			// and to ensure that the legacy recovery service is only used when needed.
diff --git a/packages/cli/src/commands/unpublish/workflow.ts b/packages/cli/src/commands/unpublish/workflow.ts
new file mode 100644
index 00000000000..628986e89ee
--- /dev/null
+++ b/packages/cli/src/commands/unpublish/workflow.ts
@@ -0,0 +1,54 @@
+import { WorkflowRepository } from '@n8n/db';
+import { Command } from '@n8n/decorators';
+import { Container } from '@n8n/di';
+import { z } from 'zod';
+
+import { BaseCommand } from '../base-command';
+
+const flagsSchema = z.object({
+	all: z.boolean().describe('Unpublish all workflows').optional(),
+	id: z.string().describe('The ID of the workflow to unpublish').optional(),
+});
+
+@Command({
+	name: 'unpublish:workflow',
+	description: 'Unpublish workflow(s)',
+	examples: ['--all', '--id=5'],
+	flagsSchema,
+})
+export class UnpublishWorkflowCommand extends BaseCommand<z.infer<typeof flagsSchema>> {
+	async run() {
+		const { flags } = this;
+
+		if (!flags.all && !flags.id) {
+			this.logger.error('Either option "--all" or "--id" must be set.');
+			return;
+		}
+
+		if (flags.all && flags.id) {
+			this.logger.error('Cannot use both "--all" and "--id" flags together.');
+			return;
+		}
+
+		if (flags.id) {
+			this.logger.info(`Unpublishing workflow with ID: ${flags.id}`);
+			await Container.get(WorkflowRepository).updateActiveState(flags.id, false);
+			this.logger.info('Workflow unpublished successfully');
+		} else {
+			this.logger.info('Unpublishing all workflows');
+			await Container.get(WorkflowRepository).unpublishAll();
+			this.logger.info('All workflows unpublished successfully');
+		}
+
+		this.logger.info('Note: Changes will not take effect if n8n is running.');
+		this.logger.info('Please restart n8n for changes to take effect if n8n is currently running.');
+	}
+
+	async catch(error: Error) {
+		this.logger.error('Error unpublishing workflow(s). See log messages for details.');
+		this.logger.error('\nGOT ERROR');
+		this.logger.error('====================================');
+		this.logger.error(error.message);
+		this.logger.error(error.stack!);
+	}
+}
diff --git a/packages/cli/src/commands/update/workflow.ts b/packages/cli/src/commands/update/workflow.ts
index 3b44f7bd315..caac4cbbf7c 100644
--- a/packages/cli/src/commands/update/workflow.ts
+++ b/packages/cli/src/commands/update/workflow.ts
@@ -13,14 +13,17 @@ const flagsSchema = z.object({
 
 @Command({
 	name: 'update:workflow',
-	description: 'Update workflows',
+	description: '[DEPRECATED] Update workflows - use publish:workflow or unpublish:workflow instead',
 	examples: ['--all --active=false', '--id=5 --active=true'],
 	flagsSchema,
 })
 export class UpdateWorkflowCommand extends BaseCommand<z.infer<typeof flagsSchema>> {
 	async run() {
+		const workflowRepository = Container.get(WorkflowRepository);
 		const { flags } = this;
 
+		this.logger.warn('⚠️  WARNING: The "update:workflow" command is deprecated.\n');
+
 		if (!flags.all && !flags.id) {
 			this.logger.error('Either option "--all" or "--id" have to be set!');
 			return;
@@ -46,19 +49,49 @@ export class UpdateWorkflowCommand extends BaseCommand<z.infer<typeof flagsSchem
 		const newState = flags.active === 'true';
 		const action = newState ? 'Activating' : 'Deactivating';
 
-		if (flags.id) {
-			this.logger.info(`${action} workflow with ID: ${flags.id}`);
-			await Container.get(WorkflowRepository).updateActiveState(flags.id, newState);
-		} else {
-			this.logger.info(`${action} all workflows`);
-			if (newState) {
-				await Container.get(WorkflowRepository).activateAll();
-			} else {
-				await Container.get(WorkflowRepository).deactivateAll();
+		// Backwards compatibility: if --id and --active=true, publish the current version
+		if (flags.id && newState) {
+			this.logger.info(`Publishing workflow ${flags.id} with current version`);
+			this.logger.warn(`Please use: publish:workflow --id=${flags.id}\n`);
+			try {
+				await workflowRepository.publishVersion(flags.id);
+			} catch (error) {
+				this.logger.error('Failed to publish workflow');
+				throw error;
 			}
+
+			this.logger.info('Note: Changes will not take effect if n8n is running.');
+			this.logger.info(
+				'Please restart n8n for changes to take effect if n8n is currently running.',
+			);
+			return;
 		}
 
-		this.logger.info('Activation or deactivation will not take effect if n8n is running.');
+		// Block publishing with --all flag
+		if (flags.all && newState) {
+			this.logger.error('Workflow publishing via "update:workflow --all" is no longer supported.');
+			this.logger.error(
+				'Please publish workflows individually using: publish:workflow --id=<workflow-id>',
+			);
+			return;
+		}
+
+		// Show appropriate replacement command suggestion for unpublishing
+		if (flags.id) {
+			this.logger.warn(`Please use: unpublish:workflow --id=${flags.id}\n`);
+		} else {
+			this.logger.warn('Please use: unpublish:workflow --all\n');
+		}
+
+		if (flags.id) {
+			this.logger.info(`${action} workflow with ID: ${flags.id}`);
+			await workflowRepository.updateActiveState(flags.id, newState);
+		} else {
+			this.logger.info(`${action} all workflows`);
+			await workflowRepository.unpublishAll();
+		}
+
+		this.logger.info('Note: Changes will not take effect if n8n is running.');
 		this.logger.info('Please restart n8n for changes to take effect if n8n is currently running.');
 	}
 
diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index 0586aa0b139..8a4b035d2a9 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -1,12 +1,9 @@
-import { inTest, Logger } from '@n8n/backend-common';
+import { inTest } from '@n8n/backend-common';
 import { GlobalConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 import convict from 'convict';
-import { flatten } from 'flat';
 import { readFileSync } from 'fs';
-import merge from 'lodash/merge';
 import { setGlobalState, UserError } from 'n8n-workflow';
-import assert from 'node:assert';
 
 import { inE2ETests } from '@/constants';
 
@@ -33,42 +30,8 @@ const config = convict(schema, { args: [] });
 // eslint-disable-next-line @typescript-eslint/unbound-method
 config.getEnv = config.get;
 
-const logger = Container.get(Logger);
-
 // Load overwrites when not in tests
 if (!inE2ETests && !inTest) {
-	// Overwrite default configuration with settings which got defined in
-	// optional configuration files
-	const { N8N_CONFIG_FILES } = process.env;
-	if (N8N_CONFIG_FILES !== undefined) {
-		const configFiles = N8N_CONFIG_FILES.split(',');
-		for (const configFile of configFiles) {
-			if (!configFile) continue;
-			// NOTE: This is "temporary" code until we have migrated all config to the new package
-			try {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				const data = JSON.parse(readFileSync(configFile, 'utf8'));
-				for (const prefix in data) {
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-					const innerData = data[prefix];
-					if (prefix in globalConfig) {
-						// @ts-ignore
-						merge(globalConfig[prefix], innerData);
-					} else {
-						const flattenedData: Record<string, string> = flatten(innerData);
-						for (const key in flattenedData) {
-							config.set(`${prefix}.${key}`, flattenedData[key]);
-						}
-					}
-				}
-				logger.debug(`Loaded config overwrites from ${configFile}`);
-			} catch (error) {
-				assert(error instanceof Error);
-				logger.error(`Error loading config file ${configFile}`, { error });
-			}
-		}
-	}
-
 	// Overwrite config from files defined in "_FILE" environment variables
 	Object.entries(process.env).forEach(([envName, fileName]) => {
 		if (envName.endsWith('_FILE') && fileName) {
diff --git a/packages/cli/src/controllers/oauth/__tests__/abstract-oauth.controller.test.ts b/packages/cli/src/controllers/oauth/__tests__/abstract-oauth.controller.test.ts
index 3d4ebb70db7..01f4633340d 100644
--- a/packages/cli/src/controllers/oauth/__tests__/abstract-oauth.controller.test.ts
+++ b/packages/cli/src/controllers/oauth/__tests__/abstract-oauth.controller.test.ts
@@ -18,7 +18,7 @@ describe('shouldSkipAuthOnOAuthCallback', () => {
 		});
 
 		it('should return true', () => {
-			expect(shouldSkipAuthOnOAuthCallback()).toBe(true);
+			expect(shouldSkipAuthOnOAuthCallback()).toBe(false);
 		});
 	});
 
diff --git a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
index 11c011318eb..8ab590b9eff 100644
--- a/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
+++ b/packages/cli/src/controllers/oauth/abstract-oauth.controller.ts
@@ -35,8 +35,7 @@ type CsrfStateParam = {
 const MAX_CSRF_AGE = 5 * Time.minutes.toMilliseconds;
 
 export function shouldSkipAuthOnOAuthCallback() {
-	// TODO: Flip this flag in v2 https://linear.app/n8n/issue/CAT-329
-	const value = process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK?.toLowerCase() ?? 'true';
+	const value = process.env.N8N_SKIP_AUTH_ON_OAUTH_CALLBACK?.toLowerCase() ?? 'false';
 	return value === 'true';
 }
 
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.activate.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.activate.yml
index 20c40a7451a..b1aa2216963 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.activate.yml
+++ b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.activate.yml
@@ -7,6 +7,23 @@ post:
   description: Active a workflow.
   parameters:
     - $ref: '../schemas/parameters/workflowId.yml'
+  requestBody:
+    description: Optional parameters for workflow activation.
+    content:
+      application/json:
+        schema:
+          type: object
+          properties:
+            versionId:
+              type: string
+              description: The specific version ID to activate. If not provided, activates the latest version.
+            name:
+              type: string
+              description: Optional name for the workflow version during activation.
+            description:
+              type: string
+              description: Optional description for the workflow version during activation.
+    required: false
   responses:
     '200':
       description: Workflow object
@@ -14,6 +31,8 @@ post:
         application/json:
           schema:
             $ref: '../schemas/workflow.yml'
+    '400':
+      $ref: '../../../../shared/spec/responses/badRequest.yml'
     '401':
       $ref: '../../../../shared/spec/responses/unauthorized.yml'
     '404':
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml
index c8b2bf51cdc..167fb0d13c0 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml
+++ b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml
@@ -51,7 +51,7 @@ put:
   tags:
     - Workflow
   summary: Update a workflow
-  description: Update a workflow.
+  description: Update a workflow. If the workflow is active, the updated version will be automatically reactivated.
   parameters:
     - $ref: '../schemas/parameters/workflowId.yml'
   requestBody:
diff --git a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
index 73397581ade..2b4c56dddb7 100644
--- a/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts
@@ -309,6 +309,7 @@ export = {
 					{
 						forceSave: true, // Skip version conflict check for public API
 						publicApi: true,
+						publishIfActive: true,
 					},
 				);
 
diff --git a/packages/cli/src/scaling/__tests__/scaling.service.test.ts b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
index 248c1e27c50..c034ead5b65 100644
--- a/packages/cli/src/scaling/__tests__/scaling.service.test.ts
+++ b/packages/cli/src/scaling/__tests__/scaling.service.test.ts
@@ -70,7 +70,7 @@ describe('ScalingService', () => {
 		QUEUE_NAME,
 		{
 			prefix: globalConfig.queue.bull.prefix,
-			settings: globalConfig.queue.bull.settings,
+			settings: { ...globalConfig.queue.bull.settings, maxStalledCount: 0 },
 			createClient: expect.any(Function),
 		},
 	];
diff --git a/packages/cli/src/scaling/scaling.service.ts b/packages/cli/src/scaling/scaling.service.ts
index 9142a6c8d2a..4198eb7ef33 100644
--- a/packages/cli/src/scaling/scaling.service.ts
+++ b/packages/cli/src/scaling/scaling.service.ts
@@ -67,7 +67,7 @@ export class ScalingService {
 
 		this.queue = new BullQueue(QUEUE_NAME, {
 			prefix,
-			settings: this.globalConfig.queue.bull.settings,
+			settings: { ...this.globalConfig.queue.bull.settings, maxStalledCount: 0 },
 			createClient: (type) => service.createClient({ type: `${type}(bull)` }),
 		});
 
diff --git a/packages/cli/src/workflows/workflow.service.ts b/packages/cli/src/workflows/workflow.service.ts
index e0a06dc69c3..f949d25d2cf 100644
--- a/packages/cli/src/workflows/workflow.service.ts
+++ b/packages/cli/src/workflows/workflow.service.ts
@@ -6,7 +6,6 @@ import type {
 	ListQueryDb,
 	WorkflowFolderUnionFull,
 	WorkflowHistoryUpdate,
-	WorkflowHistory,
 } from '@n8n/db';
 import {
 	SharedWorkflow,
@@ -24,6 +23,7 @@ import type { EntityManager } from '@n8n/typeorm';
 // eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
 import { In } from '@n8n/typeorm';
 import type { QueryDeepPartialEntity } from '@n8n/typeorm/query-builder/QueryPartialEntity';
+import isEqual from 'lodash/isEqual';
 import omit from 'lodash/omit';
 import pick from 'lodash/pick';
 import { FileLocation, BinaryDataService } from 'n8n-core';
@@ -34,6 +34,7 @@ import { ActiveWorkflowManager } from '@/active-workflow-manager';
 import { FolderNotFoundError } from '@/errors/folder-not-found.error';
 import { BadRequestError } from '@/errors/response-errors/bad-request.error';
 import { NotFoundError } from '@/errors/response-errors/not-found.error';
+import { WorkflowHistoryVersionNotFoundError } from '@/errors/workflow-history-version-not-found.error';
 import { EventService } from '@/events/event.service';
 import { ExternalHooks } from '@/external-hooks';
 import { validateEntity } from '@/generic-helpers';
@@ -50,12 +51,6 @@ import { WorkflowFinderService } from './workflow-finder.service';
 import { WorkflowHistoryService } from './workflow-history/workflow-history.service';
 import { WorkflowSharingService } from './workflow-sharing.service';
 
-type RollbackPayload = {
-	active: boolean;
-	activeVersionId: string | null;
-	activeVersion: WorkflowHistory | null;
-} & Partial<Omit<WorkflowEntity, 'active' | 'activeVersionId' | 'activeVersion'>>;
-
 @Service()
 export class WorkflowService {
 	constructor(
@@ -211,6 +206,15 @@ export class WorkflowService {
 		);
 	}
 
+	/**
+	 * Updates the workflow content (such as name, nodes, connections, settings, etc.).
+	 *
+	 * This method never updates the workflow's active fields (active, activeVersionId) directly.
+	 * However, if settings change and the workflow has an active version, the workflow will be
+	 * automatically reactivated to ensure the ActiveWorkflowManager uses the updated settings.
+	 * For explicit activation or deactivation, use the activate/deactivate methods.
+	 */
+
 	// eslint-disable-next-line complexity
 	async update(
 		user: User,
@@ -221,9 +225,16 @@ export class WorkflowService {
 			parentFolderId?: string;
 			forceSave?: boolean;
 			publicApi?: boolean;
+			publishIfActive?: boolean;
 		} = {},
 	): Promise<WorkflowEntity> {
-		const { tagIds, parentFolderId, forceSave = false, publicApi = false } = options;
+		const {
+			tagIds,
+			parentFolderId,
+			forceSave = false,
+			publicApi = false,
+			publishIfActive = false,
+		} = options;
 		const workflow = await this.workflowFinderService.findWorkflowForUser(
 			workflowId,
 			user,
@@ -252,8 +263,6 @@ export class WorkflowService {
 			);
 		}
 
-		const isDraftPublishDisabled = !this.globalConfig.workflows.draftPublishEnabled;
-
 		if (
 			Object.keys(omit(workflowUpdateData, ['id', 'versionId', 'active', 'activeVersionId']))
 				.length > 0
@@ -272,22 +281,9 @@ export class WorkflowService {
 				},
 			);
 		}
-		// Convert 'active' boolean from frontend to 'activeVersionId' for backend
-		// Forbid updating active fields with FF on
-		if (isDraftPublishDisabled && 'active' in workflowUpdateData) {
-			if (workflowUpdateData.active) {
-				workflowUpdateData.activeVersionId = workflowUpdateData.versionId ?? workflow.versionId;
-			} else {
-				workflowUpdateData.activeVersionId = null;
-			}
-		}
 
 		const versionChanged =
 			workflowUpdateData.versionId && workflowUpdateData.versionId !== workflow.versionId;
-		const wasActive = workflow.activeVersionId !== null;
-		const isNowActive = workflowUpdateData.active ?? wasActive;
-		const activationStatusChanged = isNowActive !== wasActive;
-		const needsActiveVersionUpdate = activationStatusChanged || (versionChanged && isNowActive);
 
 		if (versionChanged) {
 			// To save a version, we need both nodes and connections
@@ -308,18 +304,12 @@ export class WorkflowService {
 			};
 		}
 
-		await this.externalHooks.run('workflow.update', [workflowUpdateData]);
+		// Check if settings actually changed
+		const settingsChanged =
+			workflowUpdateData.settings !== undefined &&
+			!isEqual(workflow.settings, workflowUpdateData.settings);
 
-		/**
-		 * If the workflow being updated is stored as `active`, remove it from
-		 * active workflows in memory, and re-add it after the update.
-		 *
-		 * If a trigger or poller in the workflow was updated, the new value
-		 * will take effect only on removing and re-adding.
-		 */
-		if (isDraftPublishDisabled && wasActive) {
-			await this.activeWorkflowManager.remove(workflowId);
-		}
+		await this.externalHooks.run('workflow.update', [workflowUpdateData]);
 
 		const workflowSettings = workflowUpdateData.settings ?? {};
 		const keysAllowingDefault = [
@@ -359,11 +349,8 @@ export class WorkflowService {
 			'versionId',
 			'description',
 			'updatedAt',
+			// do not update active fields
 		];
-		// Forbid updating active fields with FF on
-		if (isDraftPublishDisabled) {
-			fieldsToUpdate.push('activeVersionId', 'active');
-		}
 
 		const updatePayload: QueryDeepPartialEntity<WorkflowEntity> = pick(
 			workflowUpdateData,
@@ -374,19 +361,13 @@ export class WorkflowService {
 		if (versionChanged) {
 			await this.workflowHistoryService.saveVersion(user, workflowUpdateData, workflowId);
 		}
-		if (isDraftPublishDisabled && needsActiveVersionUpdate) {
-			const versionIdToFetch = versionChanged ? workflowUpdateData.versionId : workflow.versionId;
-			const version = await this.workflowHistoryService.getVersion(
-				user,
-				workflowId,
-				versionIdToFetch,
-			);
-			updatePayload.activeVersion = WorkflowHelpers.getActiveVersionUpdateValue(
-				workflow,
-				version,
-				isNowActive,
-			);
+
+		const publishCurrent = workflow.activeVersionId && publishIfActive;
+		if (publishCurrent) {
+			updatePayload.active = true;
+			updatePayload.activeVersionId = workflowUpdateData.versionId;
 		}
+
 		if (parentFolderId) {
 			const project = await this.sharedWorkflowRepository.getWorkflowOwningProject(workflow.id);
 			if (parentFolderId !== PROJECT_ROOT) {
@@ -434,50 +415,16 @@ export class WorkflowService {
 			workflow: updatedWorkflow,
 			publicApi,
 		});
-		// Skip activation/deactivation logic if draft/publish feature flag is enabled
-		if (isDraftPublishDisabled) {
-			if (activationStatusChanged && isNowActive) {
-				this.eventService.emit('workflow-activated', {
-					user,
-					workflowId,
-					workflow: updatedWorkflow,
-					publicApi: false,
-				});
-			} else if (activationStatusChanged && !isNowActive) {
-				// Workflow is being deactivated
-				this.eventService.emit('workflow-deactivated', {
-					user,
-					workflowId,
-					workflow: updatedWorkflow,
-					publicApi,
-				});
-				assert(workflow.activeVersionId !== null);
-				await this.workflowPublishHistoryRepository.addRecord({
-					workflowId,
-					versionId: workflow.activeVersionId,
-					event: 'deactivated',
-					userId: user.id,
-				});
-			}
 
-			if (isNowActive) {
-				// When the workflow is supposed to be active add it again
-				await this._addToActiveWorkflowManager(
-					user,
-					workflowId,
-					updatedWorkflow,
-					wasActive ? 'update' : 'activate',
-					// If workflow could not be activated, set it again to inactive
-					// and revert the versionId and activeVersionId change so UI remains consistent
-					{
-						versionId: workflow.versionId,
-						active: false,
-						activeVersionId: null,
-						activeVersion: null,
-					},
-					publicApi,
-				);
-			}
+		// Activate workflow if requested, or
+		// Reactivate workflow if settings changed and workflow has an active version
+		if (updatedWorkflow.activeVersionId && (publishCurrent || settingsChanged)) {
+			await this.activateWorkflow(
+				user,
+				workflowId,
+				{ versionId: updatedWorkflow.activeVersionId },
+				publicApi,
+			);
 		}
 		return updatedWorkflow;
 	}
@@ -491,7 +438,6 @@ export class WorkflowService {
 		workflowId: string,
 		workflow: WorkflowEntity,
 		mode: 'activate' | 'update',
-		rollbackPayload: RollbackPayload,
 		publicApi: boolean = false,
 	): Promise<void> {
 		let didPublish = false;
@@ -500,6 +446,11 @@ export class WorkflowService {
 			await this.activeWorkflowManager.add(workflowId, mode);
 			didPublish = true;
 		} catch (error) {
+			const rollbackPayload = {
+				active: false,
+				activeVersionId: null,
+				activeVersion: null,
+			};
 			const previouslyActiveId = workflow.activeVersionId;
 			await this.workflowRepository.update(workflowId, rollbackPayload);
 
@@ -557,7 +508,6 @@ export class WorkflowService {
 		options?: { versionId?: string; name?: string; description?: string },
 		publicApi: boolean = false,
 	): Promise<WorkflowEntity> {
-		const isDraftPublishEnabled = this.globalConfig.workflows.draftPublishEnabled;
 		const workflow = await this.workflowFinderService.findWorkflowForUser(
 			workflowId,
 			user,
@@ -575,15 +525,24 @@ export class WorkflowService {
 			);
 		}
 
-		const versionToActivate = isDraftPublishEnabled
-			? (options?.versionId ?? workflow.versionId)
-			: workflow.versionId;
+		const versionToActivate = options?.versionId ?? workflow.versionId;
+		const wasActive = workflow.activeVersionId !== null;
 
-		if (workflow.activeVersionId === versionToActivate) {
-			return workflow;
+		try {
+			await this.workflowHistoryService.getVersion(user, workflow.id, versionToActivate, {
+				includePublishHistory: false,
+			});
+		} catch (error) {
+			if (error instanceof WorkflowHistoryVersionNotFoundError) {
+				throw new NotFoundError('Version not found');
+			}
+			throw error;
+		}
+
+		if (wasActive) {
+			await this.activeWorkflowManager.remove(workflowId);
 		}
 
-		const wasActive = workflow.activeVersionId !== null;
 		const activationMode = wasActive ? 'update' : 'activate';
 
 		await this.workflowRepository.update(workflowId, {
@@ -614,24 +573,10 @@ export class WorkflowService {
 			workflowId,
 			updatedWorkflow,
 			activationMode,
-			isDraftPublishEnabled
-				? {
-						active: workflow.active,
-						activeVersionId: workflow.activeVersionId,
-						activeVersion: workflow.activeVersion,
-					}
-				: {
-						active: false,
-						activeVersionId: null,
-						activeVersion: null,
-					},
 			publicApi,
 		);
 
-		if (
-			isDraftPublishEnabled &&
-			(options?.name !== undefined || options?.description !== undefined)
-		) {
+		if (options?.name !== undefined || options?.description !== undefined) {
 			const updateFields: WorkflowHistoryUpdate = {};
 			if (options.name !== undefined) updateFields.name = options.name;
 			if (options.description !== undefined) updateFields.description = options.description;
diff --git a/packages/cli/test/integration/commands/publish/workflow.test.ts b/packages/cli/test/integration/commands/publish/workflow.test.ts
new file mode 100644
index 00000000000..d1ff459b989
--- /dev/null
+++ b/packages/cli/test/integration/commands/publish/workflow.test.ts
@@ -0,0 +1,111 @@
+import {
+	mockInstance,
+	testDb,
+	createWorkflowWithTriggerAndHistory,
+	getWorkflowById,
+} from '@n8n/backend-test-utils';
+
+import { PublishWorkflowCommand } from '@/commands/publish/workflow';
+import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
+import { setupTestCommand } from '@test-integration/utils/test-command';
+
+mockInstance(LoadNodesAndCredentials);
+const command = setupTestCommand(PublishWorkflowCommand);
+
+beforeEach(async () => {
+	await testDb.truncate(['WorkflowEntity', 'WorkflowHistory']);
+});
+
+test('publish:workflow can publish a specific workflow version', async () => {
+	//
+	// ARRANGE
+	//
+	const workflow = await createWorkflowWithTriggerAndHistory();
+
+	//
+	// ACT
+	//
+	await command.run([`--id=${workflow.id}`, `--versionId=${workflow.versionId}`]);
+
+	//
+	// ASSERT
+	//
+	const updatedWorkflow = await getWorkflowById(workflow.id);
+
+	expect(updatedWorkflow).toMatchObject({
+		activeVersionId: workflow.versionId,
+		active: true,
+	});
+});
+
+test('publish:workflow does not publish when --all flag is used', async () => {
+	//
+	// ARRANGE
+	//
+	const workflow = await createWorkflowWithTriggerAndHistory();
+
+	//
+	// ACT
+	//
+	await command.run(['--all', `--id=${workflow.id}`, `--versionId=${workflow.versionId}`]);
+
+	//
+	// ASSERT
+	//
+	// Verify the workflow was not published (--all flag prevents publishing)
+	const unchangedWorkflow = await getWorkflowById(workflow.id);
+	expect(unchangedWorkflow).toMatchObject({
+		activeVersionId: null,
+		active: false,
+	});
+});
+
+test('publish:workflow publishes current version when --versionId is missing', async () => {
+	//
+	// ARRANGE
+	//
+	const workflow = await createWorkflowWithTriggerAndHistory();
+
+	//
+	// ACT
+	//
+	await command.run([`--id=${workflow.id}`]);
+
+	//
+	// ASSERT
+	//
+	const updatedWorkflow = await getWorkflowById(workflow.id);
+	expect(updatedWorkflow).toMatchObject({
+		activeVersionId: workflow.versionId,
+		active: true,
+	});
+});
+
+test('unpublish:workflow throws error when workflow does not exist', async () => {
+	//
+	// ARRANGE
+	//
+	const nonExistentWorkflowId = 'non-existent-workflow-id';
+
+	//
+	// ACT & ASSERT
+	//
+	await expect(command.run([`--id=${nonExistentWorkflowId}`])).rejects.toThrow(
+		`Workflow "${nonExistentWorkflowId}" not found.`,
+	);
+});
+
+test('publish:workflow throws error when version does not exist', async () => {
+	//
+	// ARRANGE
+	//
+	const workflow = await createWorkflowWithTriggerAndHistory();
+	const nonExistentVersionId = 'non-existent-version';
+
+	//
+	// ACT & ASSERT
+	//
+	await expect(
+		command.run([`--id=${workflow.id}`, `--versionId=${nonExistentVersionId}`]),
+	).rejects.toThrow(`Version "${nonExistentVersionId}" not found for workflow "${workflow.id}".`);
+});
diff --git a/packages/cli/test/integration/commands/unpublish/workflow.test.ts b/packages/cli/test/integration/commands/unpublish/workflow.test.ts
new file mode 100644
index 00000000000..2807ebea6ca
--- /dev/null
+++ b/packages/cli/test/integration/commands/unpublish/workflow.test.ts
@@ -0,0 +1,144 @@
+import {
+	mockInstance,
+	testDb,
+	createManyActiveWorkflows,
+	getWorkflowById,
+} from '@n8n/backend-test-utils';
+
+import { UnpublishWorkflowCommand } from '@/commands/unpublish/workflow';
+import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials';
+import { setupTestCommand } from '@test-integration/utils/test-command';
+
+mockInstance(LoadNodesAndCredentials);
+const command = setupTestCommand(UnpublishWorkflowCommand);
+
+beforeEach(async () => {
+	await testDb.truncate(['WorkflowEntity', 'WorkflowHistory']);
+});
+
+test('unpublish:workflow can unpublish all workflows', async () => {
+	//
+	// ARRANGE
+	//
+	const workflows = await createManyActiveWorkflows(2);
+
+	//
+	// ACT
+	//
+	await command.run(['--all']);
+
+	//
+	// ASSERT
+	//
+	const workflow1 = await getWorkflowById(workflows[0].id);
+	const workflow2 = await getWorkflowById(workflows[1].id);
+
+	expect(workflow1).toMatchObject({
+		activeVersionId: null,
+		active: false,
+	});
+
+	expect(workflow2).toMatchObject({
+		activeVersionId: null,
+		active: false,
+	});
+});
+
+test('unpublish:workflow can unpublish a specific workflow', async () => {
+	//
+	// ARRANGE
+	//
+	const workflows = await createManyActiveWorkflows(2);
+
+	//
+	// ACT
+	//
+	await command.run([`--id=${workflows[0].id}`]);
+
+	//
+	// ASSERT
+	//
+	const unpublishedWorkflow = await getWorkflowById(workflows[0].id);
+	const activeWorkflow = await getWorkflowById(workflows[1].id);
+
+	expect(unpublishedWorkflow).toMatchObject({
+		activeVersionId: null,
+		active: false,
+	});
+	expect(activeWorkflow).toMatchObject({
+		activeVersionId: workflows[1].versionId,
+		active: true,
+	});
+});
+
+test('unpublish:workflow does nothing when neither --all nor --id is provided', async () => {
+	//
+	// ARRANGE
+	//
+	const workflows = await createManyActiveWorkflows(2);
+
+	//
+	// ACT
+	//
+	await command.run([]);
+
+	//
+	// ASSERT
+	//
+	// Verify workflows are still active
+	const workflow1 = await getWorkflowById(workflows[0].id);
+	const workflow2 = await getWorkflowById(workflows[1].id);
+
+	expect(workflow1).toMatchObject({
+		activeVersionId: workflows[0].versionId,
+		active: true,
+	});
+
+	expect(workflow2).toMatchObject({
+		activeVersionId: workflows[1].versionId,
+		active: true,
+	});
+});
+
+test('unpublish:workflow does nothing when both --all and --id are provided', async () => {
+	//
+	// ARRANGE
+	//
+	const workflows = await createManyActiveWorkflows(2);
+
+	//
+	// ACT
+	//
+	await command.run(['--all', '--id=123']);
+
+	//
+	// ASSERT
+	//
+	// Verify workflows are still active
+	const workflow1 = await getWorkflowById(workflows[0].id);
+	const workflow2 = await getWorkflowById(workflows[1].id);
+
+	expect(workflow1).toMatchObject({
+		activeVersionId: workflows[0].versionId,
+		active: true,
+	});
+
+	expect(workflow2).toMatchObject({
+		activeVersionId: workflows[1].versionId,
+		active: true,
+	});
+});
+
+test('unpublish:workflow throws error when workflow does not exist', async () => {
+	//
+	// ARRANGE
+	//
+	const nonExistentWorkflowId = 'non-existent-workflow-id';
+
+	//
+	// ACT & ASSERT
+	//
+	await expect(command.run([`--id=${nonExistentWorkflowId}`])).rejects.toThrow(
+		`Workflow "${nonExistentWorkflowId}" not found.`,
+	);
+});
diff --git a/packages/cli/test/integration/commands/update/workflow.test.ts b/packages/cli/test/integration/commands/update/workflow.test.ts
index ee6fab23760..290ed1ad98e 100644
--- a/packages/cli/test/integration/commands/update/workflow.test.ts
+++ b/packages/cli/test/integration/commands/update/workflow.test.ts
@@ -19,7 +19,7 @@ beforeEach(async () => {
 	await testDb.truncate(['WorkflowEntity', 'WorkflowHistory']);
 });
 
-test('update:workflow can activate all workflows', async () => {
+test('update:workflow does not publish when trying to publish all workflows', async () => {
 	//
 	// ARRANGE
 	//
@@ -27,8 +27,6 @@ test('update:workflow can activate all workflows', async () => {
 		createWorkflowWithTriggerAndHistory({}),
 		createWorkflowWithTriggerAndHistory({}),
 	]);
-	expect(workflows[0].activeVersionId).toBeNull();
-	expect(workflows[1].activeVersionId).toBeNull();
 
 	//
 	// ACT
@@ -38,24 +36,16 @@ test('update:workflow can activate all workflows', async () => {
 	//
 	// ASSERT
 	//
-	// Verify activeVersionId is now set to the current versionId
+	// Verify workflows were NOT published (publishing all is no longer supported)
 	const workflowRepo = Container.get(WorkflowRepository);
-	const workflow1 = await workflowRepo.findOne({
-		where: { id: workflows[0].id },
-		relations: ['activeVersion'],
-	});
-	const workflow2 = await workflowRepo.findOne({
-		where: { id: workflows[1].id },
-		relations: ['activeVersion'],
-	});
+	const workflow1 = await workflowRepo.findOneBy({ id: workflows[0].id });
+	const workflow2 = await workflowRepo.findOneBy({ id: workflows[1].id });
 
-	expect(workflow1?.activeVersionId).toBe(workflows[0].versionId);
-	expect(workflow1?.activeVersion?.versionId).toBe(workflows[0].versionId);
-	expect(workflow2?.activeVersionId).toBe(workflows[1].versionId);
-	expect(workflow2?.activeVersion?.versionId).toBe(workflows[1].versionId);
+	expect(workflow1?.activeVersionId).toBeNull();
+	expect(workflow2?.activeVersionId).toBeNull();
 });
 
-test('update:workflow can deactivate all workflows', async () => {
+test('update:workflow can unpublish all workflows', async () => {
 	//
 	// ARRANGE
 	//
@@ -92,33 +82,29 @@ test('update:workflow can deactivate all workflows', async () => {
 	expect(workflow2?.activeVersion).toBeNull();
 });
 
-test('update:workflow can activate a specific workflow', async () => {
+test('update:workflow publishes current version when --active=true (backwards compatibility)', async () => {
 	//
 	// ARRANGE
 	//
-	const workflows = (
-		await Promise.all([
-			createWorkflowWithTriggerAndHistory(),
-			createWorkflowWithTriggerAndHistory(),
-		])
-	).sort((wf1, wf2) => wf1.id.localeCompare(wf2.id));
+	const workflow = await createWorkflowWithTriggerAndHistory();
 
 	//
 	// ACT
 	//
-	await command.run([`--id=${workflows[0].id}`, '--active=true']);
+	await command.run([`--id=${workflow.id}`, '--active=true']);
 
 	//
 	// ASSERT
 	//
-	const after = (await getAllWorkflows()).sort((wf1, wf2) => wf1.id.localeCompare(wf2.id));
-	expect(after).toMatchObject([
-		{ activeVersionId: workflows[0].versionId },
-		{ activeVersionId: null },
-	]);
+	// Verify workflow was published with current version
+	const workflowRepo = Container.get(WorkflowRepository);
+	const updatedWorkflow = await workflowRepo.findOneBy({ id: workflow.id });
+
+	expect(updatedWorkflow?.activeVersionId).toBe(workflow.versionId);
+	expect(updatedWorkflow?.active).toBe(true);
 });
 
-test('update:workflow can deactivate a specific workflow', async () => {
+test('update:workflow can unpublish a specific workflow', async () => {
 	//
 	// ARRANGE
 	//
diff --git a/packages/cli/test/integration/commands/worker.cmd.test.ts b/packages/cli/test/integration/commands/worker.cmd.test.ts
index 61533061439..ec29649fdfd 100644
--- a/packages/cli/test/integration/commands/worker.cmd.test.ts
+++ b/packages/cli/test/integration/commands/worker.cmd.test.ts
@@ -25,6 +25,7 @@ import { setupTestCommand } from '@test-integration/utils/test-command';
 Container.get(ExecutionsConfig).mode = 'queue';
 config.set('binaryDataManager.availableModes', 'filesystem');
 Container.get(TaskRunnersConfig).enabled = true;
+Container.get(TaskRunnersConfig).isNativePythonRunnerEnabled = false;
 mockInstance(LoadNodesAndCredentials);
 const binaryDataService = mockInstance(BinaryDataService);
 const communityPackagesService = mockInstance(CommunityPackagesService);
diff --git a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
index 56404c00200..9f6f4594afd 100644
--- a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
+++ b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts
@@ -3,14 +3,16 @@ import {
 	createWorkflowWithHistory,
 	createActiveWorkflow,
 	createManyActiveWorkflows,
-	createWorkflowWithActiveVersion,
 	createWorkflow,
 	testDb,
+	getWorkflowById,
 } from '@n8n/backend-test-utils';
 import { GlobalConfig } from '@n8n/config';
 import { WorkflowRepository, WorkflowDependencyRepository, WorkflowDependencies } from '@n8n/db';
 import { Container } from '@n8n/di';
 
+import { createWorkflowHistoryItem } from '@test-integration/db/workflow-history';
+
 import { createTestRun } from '../../shared/db/evaluation';
 
 describe('WorkflowRepository', () => {
@@ -26,73 +28,96 @@ describe('WorkflowRepository', () => {
 		await testDb.terminate();
 	});
 
-	describe('activateAll', () => {
-		it('should activate all workflows', async () => {
+	describe('publishVersion', () => {
+		it('should publish a specific workflow version', async () => {
 			//
 			// ARRANGE
 			//
 			const workflowRepository = Container.get(WorkflowRepository);
-			const workflows = await Promise.all([
-				createWorkflowWithTriggerAndHistory(),
-				createWorkflowWithTriggerAndHistory(),
-			]);
-			expect(workflows[0].activeVersionId).toBeNull();
-			expect(workflows[1].activeVersionId).toBeNull();
+			const workflow = await createWorkflowWithTriggerAndHistory();
+			const targetVersionId = 'custom-version-123';
+			await createWorkflowHistoryItem(workflow.id, { versionId: targetVersionId });
 
 			//
 			// ACT
 			//
-			await workflowRepository.activateAll();
+			await workflowRepository.publishVersion(workflow.id, targetVersionId);
 
 			//
 			// ASSERT
 			//
-			const workflow1 = await workflowRepository.findOne({
-				where: { id: workflows[0].id },
-			});
-			const workflow2 = await workflowRepository.findOne({
-				where: { id: workflows[1].id },
-			});
+			const updatedWorkflow = await getWorkflowById(workflow.id);
 
-			expect(workflow1?.activeVersionId).toBe(workflows[0].versionId);
-			expect(workflow2?.activeVersionId).toBe(workflows[1].versionId);
+			expect(updatedWorkflow?.activeVersionId).toBe(targetVersionId);
+			expect(updatedWorkflow?.active).toBe(true);
 		});
 
-		it('should not change activeVersionId for already-active workflows', async () => {
+		it('should update activeVersionId when publishing an already published workflow', async () => {
 			//
 			// ARRANGE
 			//
 			const workflowRepository = Container.get(WorkflowRepository);
-			const activeVersionId = 'old-active-version-id';
-
-			// Create workflow with different active and current versions
-			const workflow = await createWorkflowWithActiveVersion(activeVersionId, {});
-			const currentVersionId = workflow.versionId;
-
-			expect(workflow.active).toBe(true);
-			expect(workflow.activeVersionId).toBe(activeVersionId);
-			expect(workflow.versionId).toBe(currentVersionId);
+			const workflow = await createActiveWorkflow();
+			const newVersionId = 'new-version-id';
+			await createWorkflowHistoryItem(workflow.id, { versionId: newVersionId });
 
 			//
 			// ACT
 			//
-			await workflowRepository.activateAll();
+			await workflowRepository.publishVersion(workflow.id, newVersionId);
 
 			//
 			// ASSERT
 			//
-			// activeVersionId should remain unchanged
-			const after = await workflowRepository.findOne({
-				where: { id: workflow.id },
-			});
+			const updatedWorkflow = await getWorkflowById(workflow.id);
 
-			expect(after?.activeVersionId).toBe(activeVersionId); // Unchanged
-			expect(after?.versionId).toBe(currentVersionId);
+			expect(updatedWorkflow?.activeVersionId).toBe(newVersionId);
+			expect(updatedWorkflow?.active).toBe(true);
+			expect(updatedWorkflow?.versionId).toBe(workflow.versionId);
+		});
+
+		it('should throw error when version does not exist for workflow', async () => {
+			//
+			// ARRANGE
+			//
+			const workflowRepository = Container.get(WorkflowRepository);
+			const workflow = await createWorkflowWithTriggerAndHistory();
+			const nonExistentVersionId = 'non-existent-version';
+
+			//
+			// ACT & ASSERT
+			//
+			await expect(
+				workflowRepository.publishVersion(workflow.id, nonExistentVersionId),
+			).rejects.toThrow(
+				`Version "${nonExistentVersionId}" not found for workflow "${workflow.id}".`,
+			);
+		});
+
+		it('should publish current version when versionId is not provided', async () => {
+			//
+			// ARRANGE
+			//
+			const workflowRepository = Container.get(WorkflowRepository);
+			const workflow = await createWorkflowWithTriggerAndHistory();
+
+			//
+			// ACT
+			//
+			await workflowRepository.publishVersion(workflow.id);
+
+			//
+			// ASSERT
+			//
+			const updatedWorkflow = await getWorkflowById(workflow.id);
+
+			expect(updatedWorkflow?.activeVersionId).toBe(workflow.versionId);
+			expect(updatedWorkflow?.active).toBe(true);
 		});
 	});
 
-	describe('deactivateAll', () => {
-		it('should deactivate all workflows and clear activeVersionId', async () => {
+	describe('unpublishAll', () => {
+		it('should unpublish all workflows and clear activeVersionId', async () => {
 			//
 			// ARRANGE
 			//
@@ -106,7 +131,7 @@ describe('WorkflowRepository', () => {
 			//
 			// ACT
 			//
-			await workflowRepository.deactivateAll();
+			await workflowRepository.unpublishAll();
 			//
 			// ASSERT
 			//
diff --git a/packages/cli/test/integration/public-api/workflows.test.ts b/packages/cli/test/integration/public-api/workflows.test.ts
index b5b1ebda874..97b24da0762 100644
--- a/packages/cli/test/integration/public-api/workflows.test.ts
+++ b/packages/cli/test/integration/public-api/workflows.test.ts
@@ -5,11 +5,13 @@ import {
 	testDb,
 	mockInstance,
 	createActiveWorkflow,
+	createWorkflowWithHistory,
 } from '@n8n/backend-test-utils';
 import { GlobalConfig } from '@n8n/config';
 import type { Project, TagEntity, User, WorkflowHistory } from '@n8n/db';
 import { ProjectRepository, WorkflowHistoryRepository, SharedWorkflowRepository } from '@n8n/db';
 import { Container } from '@n8n/di';
+import { Not } from '@n8n/typeorm';
 import { InstanceSettings } from 'n8n-core';
 import type { INode } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
@@ -97,9 +99,9 @@ describe('GET /workflows', () => {
 
 	test('should return all owned workflows', async () => {
 		await Promise.all([
-			createWorkflow({}, member),
-			createWorkflow({}, member),
-			createWorkflow({}, member),
+			createWorkflowWithHistory({}, member),
+			createWorkflowWithHistory({}, member),
+			createWorkflowWithHistory({}, member),
 		]);
 
 		const response = await authMemberAgent.get('/workflows');
@@ -139,9 +141,9 @@ describe('GET /workflows', () => {
 
 	test('should return all owned workflows with pagination', async () => {
 		await Promise.all([
-			createWorkflow({}, member),
-			createWorkflow({}, member),
-			createWorkflow({}, member),
+			createWorkflowWithHistory({}, member),
+			createWorkflowWithHistory({}, member),
+			createWorkflowWithHistory({}, member),
 		]);
 
 		const response = await authMemberAgent.get('/workflows?limit=1');
@@ -197,8 +199,8 @@ describe('GET /workflows', () => {
 		const tag = await createTag({});
 
 		const [workflow] = await Promise.all([
-			createWorkflow({ tags: [tag] }, member),
-			createWorkflow({}, member),
+			createWorkflowWithHistory({ tags: [tag] }, member),
+			createWorkflowWithHistory({}, member),
 		]);
 
 		const response = await authMemberAgent.get(`/workflows?tags=${tag.name}`);
@@ -240,11 +242,11 @@ describe('GET /workflows', () => {
 		const tagNames = tags.map((tag) => tag.name).join(',');
 
 		const [workflow1, workflow2] = await Promise.all([
-			createWorkflow({ tags }, member),
-			createWorkflow({ tags }, member),
-			createWorkflow({}, member),
-			createWorkflow({ tags: [tags[0]] }, member),
-			createWorkflow({ tags: [tags[1]] }, member),
+			createWorkflowWithHistory({ tags }, member),
+			createWorkflowWithHistory({ tags }, member),
+			createWorkflowWithHistory({}, member),
+			createWorkflowWithHistory({ tags: [tags[0]] }, member),
+			createWorkflowWithHistory({ tags: [tags[1]] }, member),
 		]);
 
 		const response = await authMemberAgent.get(`/workflows?tags=${tagNames}`);
@@ -296,8 +298,8 @@ describe('GET /workflows', () => {
 		});
 
 		await Promise.all([
-			createWorkflow({ name: 'First workflow' }, firstProject),
-			createWorkflow({ name: 'Second workflow' }, secondProject),
+			createWorkflowWithHistory({ name: 'First workflow' }, firstProject),
+			createWorkflowWithHistory({ name: 'Second workflow' }, secondProject),
 		]);
 
 		const firstResponse = await authOwnerAgent.get(`/workflows?projectId=${firstProject.id}`);
@@ -319,8 +321,8 @@ describe('GET /workflows', () => {
 		});
 
 		await Promise.all([
-			createWorkflow({}, member),
-			createWorkflow({ name: 'Other workflow' }, otherProject),
+			createWorkflowWithHistory({}, member),
+			createWorkflowWithHistory({ name: 'Other workflow' }, otherProject),
 		]);
 
 		const response = await authMemberAgent.get(`/workflows?projectId=${otherProject.id}`);
@@ -333,7 +335,10 @@ describe('GET /workflows', () => {
 	test('should return all owned workflows filtered by name', async () => {
 		const workflowName = 'Workflow 1';
 
-		await Promise.all([createWorkflow({ name: workflowName }, member), createWorkflow({}, member)]);
+		await Promise.all([
+			createWorkflowWithHistory({ name: workflowName }, member),
+			createWorkflowWithHistory({}, member),
+		]);
 
 		const response = await authMemberAgent.get(`/workflows?name=${workflowName}`);
 
@@ -369,11 +374,11 @@ describe('GET /workflows', () => {
 
 	test('should return all workflows for owner', async () => {
 		await Promise.all([
-			createWorkflow({}, owner),
-			createWorkflow({}, member),
-			createWorkflow({}, owner),
-			createWorkflow({}, member),
-			createWorkflow({}, owner),
+			createWorkflowWithHistory({}, owner),
+			createWorkflowWithHistory({}, member),
+			createWorkflowWithHistory({}, owner),
+			createWorkflowWithHistory({}, member),
+			createWorkflowWithHistory({}, owner),
 		]);
 
 		const response = await authOwnerAgent.get('/workflows');
@@ -413,7 +418,7 @@ describe('GET /workflows', () => {
 
 	test('should return all owned workflows without pinned data', async () => {
 		await Promise.all([
-			createWorkflow(
+			createWorkflowWithHistory(
 				{
 					pinData: {
 						Webhook1: [{ json: { first: 'first' } }],
@@ -421,7 +426,7 @@ describe('GET /workflows', () => {
 				},
 				member,
 			),
-			createWorkflow(
+			createWorkflowWithHistory(
 				{
 					pinData: {
 						Webhook2: [{ json: { second: 'second' } }],
@@ -429,7 +434,7 @@ describe('GET /workflows', () => {
 				},
 				member,
 			),
-			createWorkflow(
+			createWorkflowWithHistory(
 				{
 					pinData: {
 						Webhook3: [{ json: { third: 'third' } }],
@@ -453,7 +458,7 @@ describe('GET /workflows', () => {
 	});
 
 	test('should return activeVersion for all workflows', async () => {
-		const inactiveWorkflow = await createWorkflow({}, member);
+		const inactiveWorkflow = await createWorkflowWithHistory({}, member);
 		const activeWorkflow = await createWorkflowWithTriggerAndHistory({}, member);
 
 		await authMemberAgent.post(`/workflows/${activeWorkflow.id}/activate`);
@@ -485,7 +490,7 @@ describe('GET /workflows', () => {
 	});
 
 	test('should return activeVersion when filtering by active=true', async () => {
-		await createWorkflow({}, member);
+		await createWorkflowWithHistory({}, member);
 		const activeWorkflow = await createWorkflowWithTriggerAndHistory({}, member);
 
 		await authMemberAgent.post(`/workflows/${activeWorkflow.id}/activate`);
@@ -516,7 +521,7 @@ describe('GET /workflows/:id', () => {
 
 	test('should retrieve workflow', async () => {
 		// create and assign workflow to owner
-		const workflow = await createWorkflow({}, member);
+		const workflow = await createWorkflowWithHistory({}, member);
 
 		const response = await authMemberAgent.get(`/workflows/${workflow.id}`);
 
@@ -551,7 +556,7 @@ describe('GET /workflows/:id', () => {
 
 	test('should retrieve non-owned workflow for owner', async () => {
 		// create and assign workflow to owner
-		const workflow = await createWorkflow({}, member);
+		const workflow = await createWorkflowWithHistory({}, member);
 
 		const response = await authOwnerAgent.get(`/workflows/${workflow.id}`);
 
@@ -584,7 +589,7 @@ describe('GET /workflows/:id', () => {
 
 	test('should retrieve workflow without pinned data', async () => {
 		// create and assign workflow to owner
-		const workflow = await createWorkflow(
+		const workflow = await createWorkflowWithHistory(
 			{
 				pinData: {
 					Webhook1: [{ json: { first: 'first' } }],
@@ -603,7 +608,7 @@ describe('GET /workflows/:id', () => {
 	});
 
 	test('should return activeVersion as null for inactive workflow', async () => {
-		const workflow = await createWorkflow({}, member);
+		const workflow = await createWorkflowWithHistory({}, member);
 
 		const response = await authMemberAgent.get(`/workflows/${workflow.id}`);
 
@@ -732,7 +737,7 @@ describe('DELETE /workflows/:id', () => {
 
 	test('should delete the workflow', async () => {
 		// create and assign workflow to owner
-		const workflow = await createWorkflow({}, member);
+		const workflow = await createWorkflowWithHistory({}, member);
 
 		const response = await authMemberAgent.delete(`/workflows/${workflow.id}`);
 
@@ -772,7 +777,7 @@ describe('DELETE /workflows/:id', () => {
 
 	test('should delete non-owned workflow when owner', async () => {
 		// create and assign workflow to owner
-		const workflow = await createWorkflow({}, member);
+		const workflow = await createWorkflowWithHistory({}, member);
 
 		const response = await authMemberAgent.delete(`/workflows/${workflow.id}`);
 
@@ -825,13 +830,13 @@ describe('POST /workflows/:id/activate', () => {
 	});
 
 	test('should fail due to trying to activate a workflow without any nodes', async () => {
-		const workflow = await createWorkflow({ nodes: [] }, owner);
+		const workflow = await createWorkflowWithHistory({ nodes: [] }, owner);
 		const response = await authOwnerAgent.post(`/workflows/${workflow.id}/activate`);
 		expect(response.statusCode).toBe(400);
 	});
 
 	test('should fail due to trying to activate a workflow without a trigger', async () => {
-		const workflow = await createWorkflow(
+		const workflow = await createWorkflowWithHistory(
 			{
 				nodes: [
 					{
@@ -1341,7 +1346,7 @@ describe('PUT /workflows/:id', () => {
 	});
 
 	test('should update workflow', async () => {
-		const workflow = await createWorkflow({}, member);
+		const workflow = await createWorkflowWithHistory({}, member);
 		const payload = {
 			name: 'name updated',
 			nodes: [
@@ -1419,61 +1424,7 @@ describe('PUT /workflows/:id', () => {
 		);
 	});
 
-	test('should always create workflow history version', async () => {
-		const workflow = await createWorkflow({}, member);
-		const payload = {
-			name: 'name updated',
-			nodes: [
-				{
-					id: 'uuid-1234',
-					parameters: {},
-					name: 'Start',
-					type: 'n8n-nodes-base.start',
-					typeVersion: 1,
-					position: [240, 300],
-				},
-				{
-					id: 'uuid-1234',
-					parameters: {},
-					name: 'Cron',
-					type: 'n8n-nodes-base.cron',
-					typeVersion: 1,
-					position: [400, 300],
-				},
-			],
-			connections: {},
-			staticData: '{"id":1}',
-			settings: {
-				saveExecutionProgress: false,
-				saveManualExecutions: false,
-				saveDataErrorExecution: 'all',
-				saveDataSuccessExecution: 'all',
-				executionTimeout: 3600,
-				timezone: 'America/New_York',
-			},
-		};
-
-		const response = await authMemberAgent.put(`/workflows/${workflow.id}`).send(payload);
-
-		const { id } = response.body;
-
-		expect(response.statusCode).toBe(200);
-
-		expect(id).toBe(workflow.id);
-		expect(
-			await Container.get(WorkflowHistoryRepository).count({ where: { workflowId: id } }),
-		).toBe(1);
-		const historyVersion = await Container.get(WorkflowHistoryRepository).findOne({
-			where: {
-				workflowId: id,
-			},
-		});
-		expect(historyVersion).not.toBeNull();
-		expect(historyVersion!.connections).toEqual(payload.connections);
-		expect(historyVersion!.nodes).toEqual(payload.nodes);
-	});
-
-	test('should update activeVersionId when updating an active workflow', async () => {
+	test('should update active version if workflow is published', async () => {
 		const workflow = await createActiveWorkflow({}, member);
 
 		const updatedPayload = {
@@ -1498,64 +1449,24 @@ describe('PUT /workflows/:id', () => {
 			.send(updatedPayload);
 
 		expect(updateResponse.statusCode).toBe(200);
+		expect(updateResponse.body.active).toBe(true);
+		expect(updateResponse.body.activeVersionId).not.toBeNull();
+		expect(updateResponse.body.activeVersionId).not.toBe(workflow.versionId);
+		expect(updateResponse.body.nodes).toEqual(updatedPayload.nodes);
 
-		await authMemberAgent.post(`/workflows/${workflow.id}/activate`);
-
-		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
+		const versionInTheDb = await Container.get(WorkflowHistoryRepository).findOne({
 			where: {
-				projectId: memberPersonalProject.id,
 				workflowId: workflow.id,
+				versionId: Not(workflow.versionId),
 			},
-			relations: ['workflow', 'workflow.activeVersion'],
 		});
 
-		expect(sharedWorkflow?.workflow.activeVersionId).toBe(sharedWorkflow?.workflow.versionId);
-		expect(sharedWorkflow?.workflow.activeVersionId).not.toBe(workflow.activeVersionId);
-		expect(sharedWorkflow?.workflow.activeVersion?.nodes).toEqual(updatedPayload.nodes);
+		expect(versionInTheDb).not.toBeNull();
+		expect(updateResponse.body.activeVersionId).toBe(versionInTheDb!.versionId);
+		expect(versionInTheDb!.nodes).toEqual(updatedPayload.nodes);
 	});
 
-	test('should not update activeVersionId when updating an inactive workflow', async () => {
-		const workflow = await createWorkflow({}, member);
-
-		// Update workflow without activating it
-		const updatedPayload = {
-			name: 'Updated inactive workflow',
-			nodes: [
-				{
-					id: 'uuid-inactive',
-					parameters: {},
-					name: 'Start Node',
-					type: 'n8n-nodes-base.start',
-					typeVersion: 1,
-					position: [200, 300],
-				},
-			],
-			connections: {},
-			staticData: workflow.staticData,
-			settings: workflow.settings,
-		};
-
-		const updateResponse = await authMemberAgent
-			.put(`/workflows/${workflow.id}`)
-			.send(updatedPayload);
-
-		expect(updateResponse.statusCode).toBe(200);
-		expect(updateResponse.body.active).toBe(false);
-		expect(updateResponse.body.activeVersionId).toBeNull();
-
-		// Verify activeVersion is still null
-		const sharedWorkflow = await Container.get(SharedWorkflowRepository).findOne({
-			where: {
-				projectId: memberPersonalProject.id,
-				workflowId: workflow.id,
-			},
-			relations: ['workflow'],
-		});
-
-		expect(sharedWorkflow?.workflow.activeVersionId).toBeNull();
-	});
-
-	test('should not allow setting active field via PUT request', async () => {
+	test('should not allow updating active field', async () => {
 		const workflow = await createWorkflowWithTriggerAndHistory({}, member);
 
 		const updatePayload = {
@@ -1587,7 +1498,7 @@ describe('PUT /workflows/:id', () => {
 	});
 
 	test('should update non-owned workflow if owner', async () => {
-		const workflow = await createWorkflow({}, member);
+		const workflow = await createWorkflowWithHistory({}, member);
 
 		const payload = {
 			name: 'name owner updated',
@@ -1677,7 +1588,7 @@ describe('PUT /workflows/:id', () => {
 	});
 
 	test('should merge settings when updating workflow', async () => {
-		const workflow = await createWorkflow(
+		const workflow = await createWorkflowWithHistory(
 			{
 				name: 'Test Workflow',
 				nodes: [],
@@ -1744,7 +1655,7 @@ describe('GET /workflows/:id/tags', () => {
 	test('should return all tags of owned workflow', async () => {
 		const tags = await Promise.all([await createTag({}), await createTag({})]);
 
-		const workflow = await createWorkflow({ tags }, member);
+		const workflow = await createWorkflowWithHistory({ tags }, member);
 
 		const response = await authMemberAgent.get(`/workflows/${workflow.id}/tags`);
 
@@ -1766,7 +1677,7 @@ describe('GET /workflows/:id/tags', () => {
 	});
 
 	test('should return empty array if workflow does not have tags', async () => {
-		const workflow = await createWorkflow({}, member);
+		const workflow = await createWorkflowWithHistory({}, member);
 
 		const response = await authMemberAgent.get(`/workflows/${workflow.id}/tags`);
 
diff --git a/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts
index 110a4d41bd5..d46996dae33 100644
--- a/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts
+++ b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts
@@ -241,7 +241,10 @@ test('should report security settings', async () => {
 			templatesEnabled: true,
 			publicApiEnabled: false,
 		},
-		nodes: { nodesExclude: 'none', nodesInclude: 'none' },
+		nodes: {
+			nodesExclude: 'n8n-nodes-base.executeCommand, n8n-nodes-base.localFileTrigger',
+			nodesInclude: 'none',
+		},
 		telemetry: { diagnosticsEnabled: true },
 	});
 });
diff --git a/packages/cli/test/integration/task-runners/js-task-runner-execution.integration.test.ts b/packages/cli/test/integration/task-runners/js-task-runner-execution.integration.test.ts
index fd708e7d15c..9f2f3909f84 100644
--- a/packages/cli/test/integration/task-runners/js-task-runner-execution.integration.test.ts
+++ b/packages/cli/test/integration/task-runners/js-task-runner-execution.integration.test.ts
@@ -30,6 +30,7 @@ describe('JS TaskRunner execution on internal mode', () => {
 	runnerConfig.mode = 'internal';
 	runnerConfig.enabled = true;
 	runnerConfig.port = 45678;
+	runnerConfig.isNativePythonRunnerEnabled = false;
 
 	const taskRunnerModule = Container.get(TaskRunnerModule);
 	const taskRequester = Container.get(LocalTaskRequester);
diff --git a/packages/cli/test/integration/task-runners/task-runner-module.internal.test.ts b/packages/cli/test/integration/task-runners/task-runner-module.internal.test.ts
index 688a6346c85..b65fde27d4e 100644
--- a/packages/cli/test/integration/task-runners/task-runner-module.internal.test.ts
+++ b/packages/cli/test/integration/task-runners/task-runner-module.internal.test.ts
@@ -10,6 +10,7 @@ describe('TaskRunnerModule in internal mode', () => {
 	runnerConfig.port = 0; // Random port
 	runnerConfig.mode = 'internal';
 	runnerConfig.enabled = true;
+	runnerConfig.isNativePythonRunnerEnabled = false;
 	const module = Container.get(TaskRunnerModule);
 
 	afterEach(async () => {
diff --git a/packages/cli/test/integration/workflows/workflow.service.test.ts b/packages/cli/test/integration/workflows/workflow.service.test.ts
index 36a81e335af..aab59faf82a 100644
--- a/packages/cli/test/integration/workflows/workflow.service.test.ts
+++ b/packages/cli/test/integration/workflows/workflow.service.test.ts
@@ -1,9 +1,4 @@
-import {
-	createWorkflowWithHistory,
-	createActiveWorkflow,
-	testDb,
-	mockInstance,
-} from '@n8n/backend-test-utils';
+import { createWorkflowWithHistory, testDb, mockInstance } from '@n8n/backend-test-utils';
 import { GlobalConfig } from '@n8n/config';
 import {
 	SharedWorkflowRepository,
@@ -63,71 +58,9 @@ beforeAll(async () => {
 afterEach(async () => {
 	await testDb.truncate(['WorkflowEntity', 'WorkflowHistory']);
 	jest.restoreAllMocks();
-
-	globalConfig.workflows.draftPublishEnabled = false;
 });
 
 describe('update()', () => {
-	test('should remove and re-add to active workflows on `active: true` payload', async () => {
-		const owner = await createOwner();
-		const workflow = await createActiveWorkflow({}, owner);
-
-		const addRecordSpy = jest.spyOn(workflowPublishHistoryRepository, 'addRecord');
-		const removeSpy = jest.spyOn(activeWorkflowManager, 'remove');
-		const addSpy = jest.spyOn(activeWorkflowManager, 'add');
-
-		const updateData = {
-			active: true,
-			versionId: workflow.versionId,
-		};
-
-		await workflowService.update(owner, updateData as WorkflowEntity, workflow.id);
-
-		expect(removeSpy).toHaveBeenCalledTimes(1);
-		const [removedWorkflowId] = removeSpy.mock.calls[0];
-		expect(removedWorkflowId).toBe(workflow.id);
-
-		expect(addSpy).toHaveBeenCalledTimes(1);
-		const [addedWorkflowId, activationMode] = addSpy.mock.calls[0];
-		expect(addedWorkflowId).toBe(workflow.id);
-		expect(activationMode).toBe('update');
-
-		expect(addRecordSpy).toBeCalledWith({
-			event: 'activated',
-			workflowId: workflow.id,
-			versionId: workflow.versionId,
-			userId: owner.id,
-		});
-	});
-
-	test('should remove from active workflows on `active: false` payload', async () => {
-		const owner = await createOwner();
-		const workflow = await createActiveWorkflow({}, owner);
-
-		const addRecordSpy = jest.spyOn(workflowPublishHistoryRepository, 'addRecord');
-		const removeSpy = jest.spyOn(activeWorkflowManager, 'remove');
-		const addSpy = jest.spyOn(activeWorkflowManager, 'add');
-
-		const updateData = {
-			active: false,
-			versionId: workflow.versionId,
-		};
-
-		await workflowService.update(owner, updateData as WorkflowEntity, workflow.id);
-
-		expect(removeSpy).toHaveBeenCalledTimes(1);
-		const [removedWorkflowId] = removeSpy.mock.calls[0];
-		expect(removedWorkflowId).toBe(workflow.id);
-
-		expect(addSpy).not.toHaveBeenCalled();
-		expect(addRecordSpy).toBeCalledWith({
-			event: 'deactivated',
-			workflowId: workflow.id,
-			versionId: workflow.versionId,
-			userId: owner.id,
-		});
-	});
-
 	test('should fetch missing connections from DB when updating nodes', async () => {
 		const owner = await createOwner();
 		const workflow = await createWorkflowWithHistory({}, owner);
@@ -157,29 +90,6 @@ describe('update()', () => {
 		expect(updatedWorkflow.versionId).not.toBe(workflow.versionId);
 	});
 
-	test('should not save workflow history version when updating only active status', async () => {
-		const owner = await createOwner();
-		const workflow = await createWorkflowWithHistory({}, owner);
-
-		const addRecordSpy = jest.spyOn(workflowPublishHistoryRepository, 'addRecord');
-		const saveVersionSpy = jest.spyOn(workflowHistoryService, 'saveVersion');
-
-		const updateData = {
-			active: true,
-			versionId: workflow.versionId,
-		};
-
-		await workflowService.update(owner, updateData as WorkflowEntity, workflow.id);
-
-		expect(saveVersionSpy).not.toHaveBeenCalled();
-		expect(addRecordSpy).toBeCalledWith({
-			event: 'activated',
-			workflowId: workflow.id,
-			versionId: workflow.versionId,
-			userId: owner.id,
-		});
-	});
-
 	test('should save workflow history version with backfilled data when versionId changes', async () => {
 		const owner = await createOwner();
 		const workflow = await createWorkflowWithHistory({}, owner);
@@ -209,7 +119,7 @@ describe('update()', () => {
 });
 
 describe('activateWorkflow()', () => {
-	test('should activate current workflow version', async () => {
+	test('should activate current workflow version if no version provided', async () => {
 		const owner = await createOwner();
 		const workflow = await createWorkflowWithHistory({}, owner);
 
@@ -227,34 +137,7 @@ describe('activateWorkflow()', () => {
 		});
 	});
 
-	test('should ignore provided workflow versionId', async () => {
-		const owner = await createOwner();
-		const workflow = await createWorkflowWithHistory({}, owner);
-
-		const addRecordSpy = jest.spyOn(workflowPublishHistoryRepository, 'addRecord');
-
-		const newVersionId = uuid();
-		await createWorkflowHistoryItem(workflow.id, { versionId: newVersionId });
-
-		const updatedWorkflow = await workflowService.activateWorkflow(owner, workflow.id, {
-			versionId: newVersionId,
-		});
-
-		expect(updatedWorkflow.active).toBe(true);
-		expect(updatedWorkflow.activeVersionId).toBe(workflow.versionId);
-		expect(updatedWorkflow.versionId).toBe(workflow.versionId);
-
-		expect(addRecordSpy).toBeCalledWith({
-			event: 'activated',
-			workflowId: workflow.id,
-			versionId: workflow.versionId,
-			userId: owner.id,
-		});
-	});
-
-	test('with draft/publish enabled: should activate the provided workflow version', async () => {
-		globalConfig.workflows.draftPublishEnabled = true;
-
+	test('should activate the provided workflow version', async () => {
 		const owner = await createOwner();
 		const workflow = await createWorkflowWithHistory({}, owner);
 
diff --git a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
index abd98d05dd4..334d5c9346c 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts
@@ -1419,53 +1419,6 @@ describe('PATCH /workflows/:workflowId', () => {
 			expect(historyVersion!.nodes).toEqual(payload.nodes);
 		});
 	});
-
-	describe('activate workflow', () => {
-		test('should activate workflow without changing version ID', async () => {
-			const workflow = await createWorkflowWithHistory({}, owner);
-			const payload = {
-				versionId: workflow.versionId,
-				active: true,
-			};
-
-			const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
-
-			expect(response.statusCode).toBe(200);
-			expect(activeWorkflowManager.add).toBeCalled();
-
-			const {
-				data: { id, versionId, active, activeVersionId },
-			} = response.body;
-
-			expect(id).toBe(workflow.id);
-			expect(versionId).toBe(workflow.versionId);
-			expect(active).toBe(true);
-			expect(activeVersionId).toBe(workflow.versionId);
-		});
-
-		test('should deactivate workflow without changing version ID', async () => {
-			const workflow = await createActiveWorkflow({}, owner);
-			const payload = {
-				versionId: workflow.versionId,
-				active: false,
-			};
-
-			const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
-
-			expect(response.statusCode).toBe(200);
-			expect(activeWorkflowManager.add).not.toBeCalled();
-			expect(activeWorkflowManager.remove).toBeCalled();
-
-			const {
-				data: { id, versionId, active, activeVersionId },
-			} = response.body;
-
-			expect(id).toBe(workflow.id);
-			expect(versionId).toBe(workflow.versionId);
-			expect(active).toBe(false);
-			expect(activeVersionId).toBeNull();
-		});
-	});
 });
 
 describe('PUT /:workflowId/transfer', () => {
diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts
index 872b97b741d..33eefd3559d 100644
--- a/packages/cli/test/integration/workflows/workflows.controller.test.ts
+++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts
@@ -6,14 +6,12 @@ import {
 	createActiveWorkflow,
 	setActiveVersion,
 	createWorkflowWithHistory,
-	createWorkflowWithTriggerAndHistory,
 	shareWorkflowWithProjects,
 	shareWorkflowWithUsers,
 	randomCredentialPayload,
 	testDb,
 	mockInstance,
 } from '@n8n/backend-test-utils';
-import { GlobalConfig } from '@n8n/config';
 import type {
 	User,
 	ListQueryDb,
@@ -74,7 +72,6 @@ let projectRepository: ProjectRepository;
 let workflowRepository: WorkflowRepository;
 let workflowHistoryRepository: WorkflowHistoryRepository;
 let eventService: EventService;
-let globalConfig: GlobalConfig;
 let folderListMissingRole: Role;
 let workflowPublishHistoryRepository: WorkflowPublishHistoryRepository;
 
@@ -94,7 +91,6 @@ beforeEach(async () => {
 	workflowRepository = Container.get(WorkflowRepository);
 	workflowHistoryRepository = Container.get(WorkflowHistoryRepository);
 	eventService = Container.get(EventService);
-	globalConfig = Container.get(GlobalConfig);
 	workflowPublishHistoryRepository = Container.get(WorkflowPublishHistoryRepository);
 	owner = await createOwner();
 	authOwnerAgent = testServer.authAgentFor(owner);
@@ -107,9 +103,6 @@ beforeEach(async () => {
 		displayName: 'Workflow Read-Only',
 		description: 'Can only read and list workflows',
 	});
-
-	// Default: draft/publish feature disabled
-	globalConfig.workflows.draftPublishEnabled = false;
 });
 
 afterEach(() => {
@@ -1514,7 +1507,10 @@ describe('GET /workflows', () => {
 		});
 
 		test('should handle skip with take parameter', async () => {
-			const response = await authOwnerAgent.get('/workflows').query('skip=2&take=2').expect(200);
+			const response = await authOwnerAgent
+				.get('/workflows')
+				.query('skip=2&take=2&sortBy=name:asc')
+				.expect(200);
 
 			const body = response.body as { data: WorkflowEntity[]; count: number };
 			expect(body.count).toBe(5);
@@ -2372,7 +2368,7 @@ describe('GET /workflows?includeFolders=true', () => {
 		test('should handle skip with take parameter', async () => {
 			const response = await authOwnerAgent
 				.get('/workflows')
-				.query('skip=2&take=4&includeFolders=true');
+				.query('skip=2&take=4&includeFolders=true&sortBy=name:asc');
 
 			const body = response.body as { data: WorkflowEntity[]; count: number };
 			expect(body.count).toBe(6);
@@ -2519,180 +2515,27 @@ describe('PATCH /workflows/:workflowId', () => {
 		expect(versionCounter).toBe(workflow.versionCounter + 1);
 	});
 
-	test('should activate workflow without changing version ID', async () => {
-		const addRecordSpy = jest.spyOn(workflowPublishHistoryRepository, 'addRecord');
-
-		const workflow = await createWorkflowWithHistory({}, owner);
-		const payload = {
-			versionId: workflow.versionId,
-			active: true,
-		};
-
-		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
-
-		expect(response.statusCode).toBe(200);
-		expect(activeWorkflowManagerLike.add).toBeCalled();
-
-		const {
-			data: { id, versionId, active, activeVersionId },
-		} = response.body;
-
-		expect(id).toBe(workflow.id);
-		expect(versionId).toBe(workflow.versionId);
-		expect(active).toBe(true);
-		expect(activeVersionId).toBe(workflow.versionId);
-		expect(addRecordSpy).toBeCalledWith({
-			event: 'activated',
-			userId: owner.id,
-			versionId: workflow.versionId,
-			workflowId: workflow.id,
-		});
-	});
-
-	test('should deactivate workflow without changing version ID', async () => {
+	test('should update workflow without updating its active version', async () => {
 		const addRecordSpy = jest.spyOn(workflowPublishHistoryRepository, 'addRecord');
 		const workflow = await createActiveWorkflow({}, owner);
+		await setActiveVersion(workflow.id, workflow.versionId);
+
 		const payload = {
+			name: 'Updated Workflow',
 			versionId: workflow.versionId,
-			active: false,
 		};
 
 		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
 
 		expect(response.statusCode).toBe(200);
+		expect(activeWorkflowManagerLike.remove).not.toBeCalled();
 		expect(activeWorkflowManagerLike.add).not.toBeCalled();
-		expect(activeWorkflowManagerLike.remove).toBeCalled();
+		expect(addRecordSpy).not.toBeCalled();
 
-		const {
-			data: { id, versionId, active, activeVersionId },
-		} = response.body;
-
-		expect(id).toBe(workflow.id);
-		expect(versionId).toBe(workflow.versionId);
-		expect(active).toBe(false);
-		expect(activeVersionId).toBeNull();
-		expect(addRecordSpy).toBeCalledWith({
-			event: 'deactivated',
-			userId: owner.id,
-			versionId: workflow.versionId,
-			workflowId: workflow.id,
-		});
-	});
-
-	test('should set activeVersionId when activating via PATCH', async () => {
-		const workflow = await createWorkflowWithTriggerAndHistory({}, owner);
-
-		const payload = {
-			versionId: workflow.versionId,
-			active: true,
-		};
-
-		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
-
-		expect(response.statusCode).toBe(200);
-		expect(activeWorkflowManagerLike.add).toBeCalled();
-
-		const {
-			data: { id, activeVersionId },
-		} = response.body;
-
-		expect(id).toBe(workflow.id);
-		expect(activeVersionId).toBe(workflow.versionId);
-
-		// Verify activeVersion is set
-		const updatedWorkflow = await workflowRepository.findOne({
-			where: { id: workflow.id },
-			relations: ['activeVersion'],
-		});
-
-		expect(updatedWorkflow?.activeVersionId).toBe(workflow.versionId);
-		expect(updatedWorkflow?.activeVersion).not.toBeNull();
-		expect(updatedWorkflow?.activeVersion?.versionId).toBe(workflow.versionId);
-		expect(updatedWorkflow?.activeVersion?.nodes).toEqual(workflow.nodes);
-		expect(updatedWorkflow?.activeVersion?.connections).toEqual(workflow.connections);
-	});
-
-	test('should clear activeVersionId when deactivating via PATCH', async () => {
-		const workflow = await createActiveWorkflow({}, owner);
-
-		await setActiveVersion(workflow.id, workflow.versionId);
-
-		const payload = {
-			versionId: workflow.versionId,
-			active: false,
-		};
-
-		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
-
-		expect(response.statusCode).toBe(200);
-		expect(activeWorkflowManagerLike.remove).toBeCalled();
-
-		const {
-			data: { id, activeVersionId },
-		} = response.body;
-
-		expect(id).toBe(workflow.id);
-		expect(activeVersionId).toBeNull();
-
-		// Verify activeVersion is cleared
-		const updatedWorkflow = await workflowRepository.findOne({
-			where: { id: workflow.id },
-		});
-
-		expect(updatedWorkflow?.activeVersionId).toBeNull();
-	});
-
-	test('should update activeVersionId when updating an active workflow', async () => {
-		const workflow = await createActiveWorkflow({}, owner);
-
-		await setActiveVersion(workflow.id, workflow.versionId);
-
-		// Verify initial state
-		const initialWorkflow = await workflowRepository.findOne({
-			where: { id: workflow.id },
-			relations: ['activeVersion'],
-		});
-		expect(initialWorkflow?.activeVersion?.versionId).toBe(workflow.versionId);
-
-		// Update workflow nodes
-		const updatedNodes: INode[] = [
-			{
-				id: 'uuid-updated',
-				parameters: { triggerTimes: { item: [{ mode: 'everyHour' }] } },
-				name: 'Cron Updated',
-				type: 'n8n-nodes-base.cron',
-				typeVersion: 1,
-				position: [500, 400],
-			},
-		];
-
-		const payload = {
-			versionId: workflow.versionId,
-			nodes: updatedNodes,
-			connections: {},
-		};
-
-		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
-
-		expect(response.statusCode).toBe(200);
-
-		const {
-			data: { id, versionId: newVersionId },
-		} = response.body;
-
-		expect(id).toBe(workflow.id);
-		expect(newVersionId).not.toBe(workflow.versionId);
-
-		// Verify activeVersion points to the new version
-		const updatedWorkflow = await workflowRepository.findOne({
-			where: { id: workflow.id },
-			relations: ['activeVersion'],
-		});
-
-		expect(updatedWorkflow?.active).toBe(true);
-		expect(updatedWorkflow?.activeVersionId).not.toBeNull();
-		expect(updatedWorkflow?.activeVersion?.versionId).toBe(newVersionId);
-		expect(updatedWorkflow?.activeVersion?.nodes).toEqual(updatedNodes);
+		const { data } = response.body;
+		expect(data.name).toBe('Updated Workflow');
+		expect(data.versionId).not.toBe(workflow.versionId); // New version created
+		expect(data.activeVersionId).toBe(workflow.versionId); // Should remain active
 	});
 
 	test('should update workflow meta', async () => {
@@ -2791,127 +2634,106 @@ describe('PATCH /workflows/:workflowId', () => {
 		expect(response.statusCode).toBe(500);
 	});
 
-	describe('with draft/publish feature enabled', () => {
-		beforeEach(() => {
-			globalConfig.workflows.draftPublishEnabled = true;
+	test('should not activate when updating with active: true', async () => {
+		const workflow = await createWorkflow({}, owner);
+		const payload = {
+			versionId: workflow.versionId,
+			active: true,
+		};
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+
+		expect(response.statusCode).toBe(200);
+		expect(activeWorkflowManagerLike.add).not.toBeCalled();
+
+		const { data } = response.body;
+		expect(data.active).toBe(false);
+		expect(data.activeVersionId).toBeNull();
+	});
+
+	test('should not deactivate workflow when updating with active: false', async () => {
+		const addRecordSpy = jest.spyOn(workflowPublishHistoryRepository, 'addRecord');
+		const workflow = await createActiveWorkflow({}, owner);
+		await setActiveVersion(workflow.id, workflow.versionId);
+
+		const payload = {
+			versionId: workflow.versionId,
+			active: false,
+		};
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+
+		expect(response.statusCode).toBe(200);
+		expect(activeWorkflowManagerLike.remove).not.toBeCalled();
+		expect(addRecordSpy).not.toBeCalled();
+
+		const { data } = response.body;
+		expect(data.active).toBe(true);
+		expect(data.activeVersionId).toBe(workflow.versionId);
+	});
+
+	test('should not modify activeVersionId when explicitly provided', async () => {
+		const workflow = await createWorkflowWithHistory({}, owner);
+		const payload = {
+			versionId: workflow.versionId,
+			activeVersionId: workflow.versionId,
+		};
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+
+		expect(response.statusCode).toBe(200);
+		expect(activeWorkflowManagerLike.add).not.toBeCalled();
+
+		const { data } = response.body;
+		expect(data.activeVersionId).toBeNull(); // Should not be activated
+	});
+
+	test('should reactivate workflow when settings change', async () => {
+		const workflow = await createActiveWorkflow({}, owner);
+		await setActiveVersion(workflow.id, workflow.versionId);
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send({
+			versionId: workflow.versionId,
+			settings: {
+				timezone: 'America/New_York',
+			},
 		});
 
-		afterEach(() => {
-			globalConfig.workflows.draftPublishEnabled = false;
+		expect(response.statusCode).toBe(200);
+
+		expect(activeWorkflowManagerLike.remove).toHaveBeenCalledWith(workflow.id);
+		expect(activeWorkflowManagerLike.add).toHaveBeenCalledWith(workflow.id, 'update');
+	});
+
+	test('should not reactivate when settings unchanged', async () => {
+		const workflow = await createActiveWorkflow({}, owner);
+		await setActiveVersion(workflow.id, workflow.versionId);
+
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send({
+			versionId: workflow.versionId,
+			name: 'New Name',
 		});
 
-		test('should not update activeVersionId when updating with active: true', async () => {
-			const workflow = await createWorkflow({}, owner);
-			const payload = {
-				versionId: workflow.versionId,
-				active: true,
-			};
+		expect(response.statusCode).toBe(200);
 
-			const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
+		expect(activeWorkflowManagerLike.remove).not.toHaveBeenCalled();
+		expect(activeWorkflowManagerLike.add).not.toHaveBeenCalled();
+	});
 
-			expect(response.statusCode).toBe(200);
-			expect(activeWorkflowManagerLike.add).not.toBeCalled();
+	test('should not reactivate inactive workflow even when settings change', async () => {
+		const workflow = await createWorkflow({}, owner);
 
-			const { data } = response.body;
-			expect(data.activeVersionId).toBeNull();
+		const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send({
+			versionId: workflow.versionId,
+			settings: {
+				timezone: 'America/New_York',
+			},
 		});
 
-		test('should not deactivate workflow when updating with active: false', async () => {
-			const addRecordSpy = jest.spyOn(workflowPublishHistoryRepository, 'addRecord');
-			const workflow = await createActiveWorkflow({}, owner);
-			await setActiveVersion(workflow.id, workflow.versionId);
+		expect(response.statusCode).toBe(200);
 
-			const payload = {
-				versionId: workflow.versionId,
-				active: false,
-			};
-
-			const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
-
-			expect(response.statusCode).toBe(200);
-			expect(activeWorkflowManagerLike.remove).not.toBeCalled();
-
-			const { data } = response.body;
-			expect(data.activeVersionId).toBe(workflow.versionId);
-			expect(addRecordSpy).not.toBeCalled();
-		});
-
-		test('should NOT write "active" field to database when updating with active: true', async () => {
-			const workflow = await createWorkflowWithHistory({}, owner);
-			const payload = {
-				versionId: workflow.versionId,
-				active: true,
-			};
-
-			const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
-
-			expect(response.statusCode).toBe(200);
-
-			const updatedWorkflow = await workflowRepository.findOne({
-				where: { id: workflow.id },
-			});
-
-			expect(updatedWorkflow?.active).toBe(false);
-			expect(updatedWorkflow?.activeVersionId).toBeNull();
-		});
-
-		test('should NOT write "active" field to database when updating with active: false', async () => {
-			const workflow = await createActiveWorkflow({}, owner);
-			const payload = {
-				versionId: workflow.versionId,
-				active: false,
-			};
-
-			const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
-
-			expect(response.statusCode).toBe(200);
-
-			const updatedWorkflow = await workflowRepository.findOne({
-				where: { id: workflow.id },
-			});
-
-			expect(updatedWorkflow?.active).toBe(true);
-			expect(updatedWorkflow?.activeVersionId).toBe(workflow.activeVersionId);
-		});
-
-		test('should not modify activeVersionId when explicitly provided', async () => {
-			const workflow = await createWorkflowWithHistory({}, owner);
-			const payload = {
-				versionId: workflow.versionId,
-				activeVersionId: workflow.versionId,
-			};
-
-			const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
-
-			expect(response.statusCode).toBe(200);
-			expect(activeWorkflowManagerLike.add).not.toBeCalled();
-
-			const { data } = response.body;
-			expect(data.activeVersionId).toBeNull(); // Should not be activated
-		});
-
-		test('should allow updating active workflow without updating its active version', async () => {
-			const addRecordSpy = jest.spyOn(workflowPublishHistoryRepository, 'addRecord');
-			const workflow = await createActiveWorkflow({}, owner);
-			await setActiveVersion(workflow.id, workflow.versionId);
-
-			const payload = {
-				name: 'Updated Active Workflow',
-				versionId: workflow.versionId,
-			};
-
-			const response = await authOwnerAgent.patch(`/workflows/${workflow.id}`).send(payload);
-
-			expect(response.statusCode).toBe(200);
-			expect(activeWorkflowManagerLike.remove).not.toBeCalled();
-			expect(activeWorkflowManagerLike.add).not.toBeCalled();
-
-			const { data } = response.body;
-			expect(data.name).toBe('Updated Active Workflow');
-			expect(data.versionId).not.toBe(workflow.versionId); // New version created
-			expect(data.activeVersionId).toBe(workflow.versionId); // Should remain active
-			expect(addRecordSpy).not.toBeCalled();
-		});
+		expect(activeWorkflowManagerLike.remove).not.toHaveBeenCalled();
+		expect(activeWorkflowManagerLike.add).not.toHaveBeenCalled();
 	});
 });
 
@@ -2919,22 +2741,25 @@ describe('POST /workflows/:workflowId/activate', () => {
 	test('should activate workflow with provided versionId', async () => {
 		const addRecordSpy = jest.spyOn(workflowPublishHistoryRepository, 'addRecord');
 		const workflow = await createWorkflowWithHistory({}, owner);
+		const newVersionId = uuid();
+		await createWorkflowHistoryItem(workflow.id, { versionId: newVersionId });
 
 		const response = await authOwnerAgent
 			.post(`/workflows/${workflow.id}/activate`)
-			.send({ versionId: workflow.versionId });
+			.send({ versionId: newVersionId });
 
 		expect(response.statusCode).toBe(200);
 		expect(activeWorkflowManagerLike.add).toBeCalledWith(workflow.id, 'activate');
 
 		const { data } = response.body;
 		expect(data.id).toBe(workflow.id);
-		expect(data.activeVersionId).toBe(workflow.versionId);
-		expect(data.activeVersion.versionId).toBe(workflow.versionId);
+		expect(data.activeVersionId).toBe(newVersionId);
+		expect(data.activeVersion.versionId).toBe(newVersionId);
+
 		expect(addRecordSpy).toBeCalledWith({
 			event: 'activated',
 			userId: owner.id,
-			versionId: workflow.versionId,
+			versionId: newVersionId,
 			workflowId: workflow.id,
 		});
 	});
@@ -2967,6 +2792,19 @@ describe('POST /workflows/:workflowId/activate', () => {
 		expect(response.statusCode).toBe(404);
 	});
 
+	test('should return 404 if version does not exist', async () => {
+		const workflow = await createWorkflowWithHistory({}, owner);
+		const newVersionId = uuid();
+
+		const response = await authOwnerAgent
+			.post(`/workflows/${workflow.id}/activate`)
+			.send({ versionId: newVersionId });
+
+		expect(response.statusCode).toBe(404);
+		expect(response.body.message).toBe('Version not found');
+		expect(activeWorkflowManagerLike.add).not.toBeCalled();
+	});
+
 	test('should return 403 when user does not have update permission', async () => {
 		const workflow = await createWorkflow({}, owner);
 
@@ -2994,175 +2832,16 @@ describe('POST /workflows/:workflowId/activate', () => {
 		expect(updatedWorkflow?.activeVersion?.versionId).toBe(workflow.versionId);
 	});
 
-	describe('with draft/publish feature enabled', () => {
-		beforeEach(() => {
-			globalConfig.workflows.draftPublishEnabled = true;
-		});
-
-		afterEach(() => {
-			globalConfig.workflows.draftPublishEnabled = false;
-		});
-
-		test('should activate workflow with provided versionId', async () => {
-			const workflow = await createWorkflowWithHistory({}, owner);
-			const newVersionId = uuid();
-			await createWorkflowHistoryItem(workflow.id, { versionId: newVersionId });
-
-			const response = await authOwnerAgent
-				.post(`/workflows/${workflow.id}/activate`)
-				.send({ versionId: newVersionId });
-
-			expect(response.statusCode).toBe(200);
-			expect(activeWorkflowManagerLike.add).toBeCalledWith(workflow.id, 'activate');
-
-			const { data } = response.body;
-			expect(data.id).toBe(workflow.id);
-			expect(data.activeVersionId).toBe(newVersionId);
-			expect(data.activeVersion.versionId).toBe(newVersionId);
-		});
-
-		test('should update version name when provided during activation', async () => {
-			const workflow = await createWorkflowWithHistory({}, owner);
-			const newVersionName = 'Production Version';
-
-			const response = await authOwnerAgent
-				.post(`/workflows/${workflow.id}/activate`)
-				.send({ versionId: workflow.versionId, name: newVersionName });
-
-			expect(response.statusCode).toBe(200);
-			expect(activeWorkflowManagerLike.add).toBeCalledWith(workflow.id, 'activate');
-
-			const { data } = response.body;
-			expect(data.activeVersionId).toBe(workflow.versionId);
-
-			const historyVersion = await workflowHistoryRepository.findOne({
-				where: { workflowId: workflow.id, versionId: workflow.versionId },
-			});
-
-			expect(historyVersion?.name).toBe(newVersionName);
-		});
-
-		test('should update version description when provided during activation', async () => {
-			const workflow = await createWorkflowWithHistory({}, owner);
-			const newDescription = 'This is the stable production release';
-
-			const response = await authOwnerAgent
-				.post(`/workflows/${workflow.id}/activate`)
-				.send({ versionId: workflow.versionId, description: newDescription });
-
-			expect(response.statusCode).toBe(200);
-			expect(activeWorkflowManagerLike.add).toBeCalledWith(workflow.id, 'activate');
-
-			const { data } = response.body;
-			expect(data.activeVersionId).toBe(workflow.versionId);
-
-			const historyVersion = await workflowHistoryRepository.findOne({
-				where: { workflowId: workflow.id, versionId: workflow.versionId },
-			});
-
-			expect(historyVersion?.description).toBe(newDescription);
-		});
-
-		test('should update both version name and description when provided during activation', async () => {
-			const workflow = await createWorkflowWithHistory({}, owner);
-			const newVersionName = 'Production Version';
-			const newDescription = 'Major update with new features';
-
-			const response = await authOwnerAgent.post(`/workflows/${workflow.id}/activate`).send({
-				versionId: workflow.versionId,
-				name: newVersionName,
-				description: newDescription,
-			});
-
-			expect(response.statusCode).toBe(200);
-			expect(activeWorkflowManagerLike.add).toBeCalledWith(workflow.id, 'activate');
-
-			const { data } = response.body;
-			expect(data.activeVersionId).toBe(workflow.versionId);
-
-			const historyVersion = await workflowHistoryRepository.findOne({
-				where: { workflowId: workflow.id, versionId: workflow.versionId },
-			});
-
-			expect(historyVersion?.name).toBe(newVersionName);
-			expect(historyVersion?.description).toBe(newDescription);
-		});
-
-		test('should not update version name and description when activation fails', async () => {
-			const workflow = await createWorkflowWithHistory({}, owner);
-			const newVersionName = 'Production Version';
-			const newDescription = 'Major update with new features';
-
-			activeWorkflowManagerLike.add.mockRejectedValueOnce(new Error('Validation failed'));
-
-			await authOwnerAgent.post(`/workflows/${workflow.id}/activate`).send({
-				versionId: workflow.versionId,
-				name: newVersionName,
-				description: newDescription,
-			});
-
-			const updatedVersion = await workflowHistoryRepository.findOne({
-				where: { versionId: workflow.versionId },
-			});
-
-			expect(updatedVersion?.name).toBeNull();
-			expect(updatedVersion?.description).toBeNull();
-		});
-
-		test('should preserve current active version when activation fails', async () => {
-			const workflow = await createActiveWorkflow({}, owner);
-
-			const newVersionId = uuid();
-			await createWorkflowHistoryItem(workflow.id, { versionId: newVersionId });
-
-			const emitSpy = jest.spyOn(eventService, 'emit');
-
-			activeWorkflowManagerLike.add.mockRejectedValueOnce(new Error('Validation failed'));
-
-			const response = await authOwnerAgent
-				.post(`/workflows/${workflow.id}/activate`)
-				.send({ versionId: newVersionId });
-
-			expect(response.statusCode).toBe(400);
-			expect(response.body.message).toBe('Validation failed');
-
-			const updatedWorkflow = await workflowRepository.findOne({
-				where: { id: workflow.id },
-				relations: ['activeVersion'],
-			});
-
-			expect(updatedWorkflow?.active).toBe(true);
-			expect(updatedWorkflow?.activeVersionId).toBe(workflow.versionId);
-			expect(updatedWorkflow?.activeVersion?.versionId).toBe(workflow.versionId);
-
-			expect(emitSpy).not.toHaveBeenCalledWith('workflow-deactivated', expect.anything());
-		});
-
-		test('should call active workflow manager with update mode if workflow is active', async () => {
-			const workflow = await createActiveWorkflow({}, owner);
-
-			const newVersionId = uuid();
-			await createWorkflowHistoryItem(workflow.id, { versionId: newVersionId });
-
-			await authOwnerAgent
-				.post(`/workflows/${workflow.id}/activate`)
-				.send({ versionId: newVersionId });
-
-			expect(activeWorkflowManagerLike.add).toBeCalledWith(workflow.id, 'update');
-		});
-	});
-
-	test('should ignore version id, name and description', async () => {
+	test('should update version name when provided during activation', async () => {
 		const workflow = await createWorkflowWithHistory({}, owner);
-		const newVersionId = uuid();
 		const newVersionName = 'Production Version';
-		const newDescription = 'Major update with new features';
 
-		const response = await authOwnerAgent.post(`/workflows/${workflow.id}/activate`).send({
-			versionId: newVersionId,
-			name: newVersionName,
-			description: newDescription,
-		});
+		const response = await authOwnerAgent
+			.post(`/workflows/${workflow.id}/activate`)
+			.send({ versionId: workflow.versionId, name: newVersionName });
+
+		expect(response.statusCode).toBe(200);
+		expect(activeWorkflowManagerLike.add).toBeCalledWith(workflow.id, 'activate');
 
 		const { data } = response.body;
 		expect(data.activeVersionId).toBe(workflow.versionId);
@@ -3171,8 +2850,123 @@ describe('POST /workflows/:workflowId/activate', () => {
 			where: { workflowId: workflow.id, versionId: workflow.versionId },
 		});
 
-		expect(historyVersion?.name).toBeNull();
-		expect(historyVersion?.description).toBeNull();
+		expect(historyVersion?.name).toBe(newVersionName);
+	});
+
+	test('should update version description when provided during activation', async () => {
+		const workflow = await createWorkflowWithHistory({}, owner);
+		const newDescription = 'This is the stable production release';
+
+		const response = await authOwnerAgent
+			.post(`/workflows/${workflow.id}/activate`)
+			.send({ versionId: workflow.versionId, description: newDescription });
+
+		expect(response.statusCode).toBe(200);
+		expect(activeWorkflowManagerLike.add).toBeCalledWith(workflow.id, 'activate');
+
+		const { data } = response.body;
+		expect(data.activeVersionId).toBe(workflow.versionId);
+
+		const historyVersion = await workflowHistoryRepository.findOne({
+			where: { workflowId: workflow.id, versionId: workflow.versionId },
+		});
+
+		expect(historyVersion?.description).toBe(newDescription);
+	});
+
+	test('should update both version name and description when provided during activation', async () => {
+		const workflow = await createWorkflowWithHistory({}, owner);
+		const newVersionName = 'Production Version';
+		const newDescription = 'Major update with new features';
+
+		const response = await authOwnerAgent.post(`/workflows/${workflow.id}/activate`).send({
+			versionId: workflow.versionId,
+			name: newVersionName,
+			description: newDescription,
+		});
+
+		expect(response.statusCode).toBe(200);
+		expect(activeWorkflowManagerLike.add).toBeCalledWith(workflow.id, 'activate');
+
+		const { data } = response.body;
+		expect(data.activeVersionId).toBe(workflow.versionId);
+
+		const historyVersion = await workflowHistoryRepository.findOne({
+			where: { workflowId: workflow.id, versionId: workflow.versionId },
+		});
+
+		expect(historyVersion?.name).toBe(newVersionName);
+		expect(historyVersion?.description).toBe(newDescription);
+	});
+
+	test('should not update version name and description when activation fails', async () => {
+		const workflow = await createWorkflowWithHistory({}, owner);
+		const newVersionName = 'Production Version';
+		const newDescription = 'Major update with new features';
+
+		activeWorkflowManagerLike.add.mockRejectedValueOnce(new Error('Validation failed'));
+
+		await authOwnerAgent.post(`/workflows/${workflow.id}/activate`).send({
+			versionId: workflow.versionId,
+			name: newVersionName,
+			description: newDescription,
+		});
+
+		const updatedVersion = await workflowHistoryRepository.findOne({
+			where: { versionId: workflow.versionId },
+		});
+
+		expect(updatedVersion?.name).toBeNull();
+		expect(updatedVersion?.description).toBeNull();
+	});
+
+	test('should deactivate workflow when activation fails', async () => {
+		const workflow = await createActiveWorkflow({}, owner);
+
+		const newVersionId = uuid();
+		await createWorkflowHistoryItem(workflow.id, { versionId: newVersionId });
+
+		const emitSpy = jest.spyOn(eventService, 'emit');
+
+		activeWorkflowManagerLike.add.mockRejectedValueOnce(new Error('Validation failed'));
+
+		const response = await authOwnerAgent
+			.post(`/workflows/${workflow.id}/activate`)
+			.send({ versionId: newVersionId });
+
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toBe('Validation failed');
+
+		const updatedWorkflow = await workflowRepository.findOne({
+			where: { id: workflow.id },
+			relations: ['activeVersion'],
+		});
+
+		// Workflow should be deactivated after failed activation
+		expect(updatedWorkflow?.active).toBe(false);
+		expect(updatedWorkflow?.activeVersionId).toBeNull();
+
+		// Should emit deactivation event
+		expect(emitSpy).toHaveBeenCalledWith('workflow-deactivated', expect.anything());
+
+		// Verify workflow was removed once (no re-add)
+		expect(activeWorkflowManagerLike.remove).toHaveBeenCalledWith(workflow.id);
+		expect(activeWorkflowManagerLike.add).toHaveBeenCalledTimes(1);
+	});
+
+	test('should call active workflow manager with update mode if workflow is active', async () => {
+		const workflow = await createActiveWorkflow({}, owner);
+
+		const newVersionId = uuid();
+		await createWorkflowHistoryItem(workflow.id, { versionId: newVersionId });
+
+		await authOwnerAgent
+			.post(`/workflows/${workflow.id}/activate`)
+			.send({ versionId: newVersionId });
+
+		// First remove active version
+		expect(activeWorkflowManagerLike.remove).toBeCalledWith(workflow.id);
+		expect(activeWorkflowManagerLike.add).toBeCalledWith(workflow.id, 'update');
 	});
 
 	test('should call active workflow manager with activate mode if workflow is not active', async () => {
@@ -3183,6 +2977,7 @@ describe('POST /workflows/:workflowId/activate', () => {
 			.post(`/workflows/${workflow.id}/activate`)
 			.send({ versionId: workflow.versionId });
 
+		expect(activeWorkflowManagerLike.remove).not.toBeCalledWith(workflow.id);
 		expect(activeWorkflowManagerLike.add).toBeCalledWith(workflow.id, 'activate');
 		expect(addRecordSpy).toBeCalledWith({
 			event: 'activated',
@@ -3569,8 +3364,8 @@ describe('POST /workflows/:workflowId/unarchive', () => {
 		const { data: unarchivedWorkflow } = unarchiveResponse.body;
 
 		const activateResponse = await authOwnerAgent
-			.patch(`/workflows/${workflow.id}`)
-			.send({ active: true, versionId: unarchivedWorkflow.versionId })
+			.post(`/workflows/${workflow.id}/activate`)
+			.send({ versionId: unarchivedWorkflow.versionId })
 			.expect(200);
 
 		expect(activateResponse.body.data.active).toBe(true);
diff --git a/packages/cli/test/setup-test-folder.ts b/packages/cli/test/setup-test-folder.ts
index 80b9953333e..6d88d1ddf3c 100644
--- a/packages/cli/test/setup-test-folder.ts
+++ b/packages/cli/test/setup-test-folder.ts
@@ -10,7 +10,7 @@ mkdirSync(baseDir, { recursive: true });
 const testDir = mkdtempSync(baseDir);
 mkdirSync(join(testDir, '.n8n'));
 process.env.N8N_USER_FOLDER = testDir;
-process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
+process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'true';
 
 writeFileSync(
 	join(testDir, '.n8n/config'),
diff --git a/packages/core/src/binary-data/__tests__/binary-data.config.test.ts b/packages/core/src/binary-data/__tests__/binary-data.config.test.ts
index c5e6996654b..9b6b66f7603 100644
--- a/packages/core/src/binary-data/__tests__/binary-data.config.test.ts
+++ b/packages/core/src/binary-data/__tests__/binary-data.config.test.ts
@@ -23,13 +23,12 @@ describe('BinaryDataConfig', () => {
 	it('should use default values when no env variables are defined', () => {
 		const config = Container.get(BinaryDataConfig);
 
-		expect(config.availableModes).toEqual(['filesystem']);
-		expect(config.mode).toBe('default');
+		expect(config.availableModes).toEqual(['filesystem', 's3', 'database']);
+		expect(config.mode).toBe('filesystem');
 		expect(config.localStoragePath).toBe('/test/n8n/binaryData');
 	});
 
 	it('should use values from env variables when defined', () => {
-		process.env.N8N_AVAILABLE_BINARY_DATA_MODES = 'filesystem,s3';
 		process.env.N8N_DEFAULT_BINARY_DATA_MODE = 's3';
 		process.env.N8N_BINARY_DATA_STORAGE_PATH = '/custom/storage/path';
 		process.env.N8N_BINARY_DATA_SIGNING_SECRET = 'super-secret';
@@ -37,7 +36,7 @@ describe('BinaryDataConfig', () => {
 		const config = Container.get(BinaryDataConfig);
 
 		expect(config.mode).toEqual('s3');
-		expect(config.availableModes).toEqual(['filesystem', 's3']);
+		expect(config.availableModes).toEqual(['filesystem', 's3', 'database']);
 		expect(config.localStoragePath).toEqual('/custom/storage/path');
 		expect(config.signingSecret).toBe('super-secret');
 	});
@@ -48,25 +47,14 @@ describe('BinaryDataConfig', () => {
 		expect(config.signingSecret).toBe('96eHYcXMF6J1Pn6dhdkOEt6H2BMa6kR5oR0ce7llWyA=');
 	});
 
-	it('should fallback to default for mode', () => {
+	it('should fallback to filesystem for invalid mode', () => {
 		process.env.N8N_DEFAULT_BINARY_DATA_MODE = 'invalid-mode';
 
 		const config = Container.get(BinaryDataConfig);
 
-		expect(config.mode).toEqual('default');
+		expect(config.mode).toEqual('filesystem');
 		expect(console.warn).toHaveBeenCalledWith(
 			expect.stringContaining('Invalid value for N8N_DEFAULT_BINARY_DATA_MODE'),
 		);
 	});
-
-	it('should fallback to default for available modes', () => {
-		process.env.N8N_AVAILABLE_BINARY_DATA_MODES = 'filesystem,invalid-mode,s3';
-
-		const config = Container.get(BinaryDataConfig);
-
-		expect(config.availableModes).toEqual(['filesystem']);
-		expect(console.warn).toHaveBeenCalledWith(
-			expect.stringContaining('Invalid value for N8N_AVAILABLE_BINARY_DATA_MODES'),
-		);
-	});
 });
diff --git a/packages/core/src/binary-data/binary-data.config.ts b/packages/core/src/binary-data/binary-data.config.ts
index 5ce6046ae6b..fb438afa5b2 100644
--- a/packages/core/src/binary-data/binary-data.config.ts
+++ b/packages/core/src/binary-data/binary-data.config.ts
@@ -1,4 +1,4 @@
-import { Config, Env } from '@n8n/config';
+import { Config, Env, ExecutionsConfig } from '@n8n/config';
 import { createHash } from 'node:crypto';
 import path from 'node:path';
 import { z } from 'zod';
@@ -21,12 +21,11 @@ const dbMaxFileSizeSchema = z
 @Config
 export class BinaryDataConfig {
 	/** Available modes of binary data storage, as comma separated strings. */
-	@Env('N8N_AVAILABLE_BINARY_DATA_MODES', availableModesSchema)
-	availableModes: z.infer<typeof availableModesSchema> = ['filesystem'];
+	availableModes: z.infer<typeof availableModesSchema> = ['filesystem', 's3', 'database'];
 
-	/** Storage mode for binary data. */
+	/** Storage mode for binary data. Defaults to 'filesystem' in regular mode, 'database' in scaling mode. */
 	@Env('N8N_DEFAULT_BINARY_DATA_MODE', binaryDataModesSchema)
-	mode: z.infer<typeof binaryDataModesSchema> = 'default';
+	mode!: z.infer<typeof binaryDataModesSchema>;
 
 	/** Path for binary data storage in "filesystem" mode. */
 	@Env('N8N_BINARY_DATA_STORAGE_PATH')
@@ -43,10 +42,12 @@ export class BinaryDataConfig {
 	@Env('N8N_BINARY_DATA_DATABASE_MAX_FILE_SIZE', dbMaxFileSizeSchema)
 	dbMaxFileSize: number = 512;
 
-	constructor({ encryptionKey, n8nFolder }: InstanceSettings) {
+	constructor({ encryptionKey, n8nFolder }: InstanceSettings, executionsConfig: ExecutionsConfig) {
 		this.localStoragePath = path.join(n8nFolder, 'binaryData');
 		this.signingSecret = createHash('sha256')
 			.update(`url-signing:${encryptionKey}`)
 			.digest('base64');
+
+		this.mode ??= executionsConfig.mode === 'queue' ? 'database' : 'filesystem';
 	}
 }
diff --git a/packages/core/src/binary-data/binary-data.service.ts b/packages/core/src/binary-data/binary-data.service.ts
index 7dfc4eab549..4496dfc5435 100644
--- a/packages/core/src/binary-data/binary-data.service.ts
+++ b/packages/core/src/binary-data/binary-data.service.ts
@@ -1,5 +1,5 @@
 import { Logger } from '@n8n/backend-common';
-import { Container, Service } from '@n8n/di';
+import { Service } from '@n8n/di';
 import jwt from 'jsonwebtoken';
 import type { StringValue as TimeUnitValue } from 'ms';
 import { BINARY_ENCODING, UnexpectedError } from 'n8n-workflow';
@@ -17,7 +17,7 @@ import { InvalidManagerError } from '../errors/invalid-manager.error';
 
 @Service()
 export class BinaryDataService {
-	private mode: BinaryData.ServiceMode = 'default';
+	private mode: BinaryData.ServiceMode = 'filesystem-v2';
 
 	private managers: Record<string, BinaryData.Manager> = {};
 
@@ -36,29 +36,12 @@ export class BinaryDataService {
 
 		this.mode = config.mode === 'filesystem' ? 'filesystem-v2' : config.mode;
 
-		if (config.availableModes.includes('filesystem')) {
-			const { FileSystemManager } = await import('./file-system.manager');
+		const { FileSystemManager } = await import('./file-system.manager');
+		this.managers.filesystem = new FileSystemManager(config.localStoragePath, this.errorReporter);
+		this.managers['filesystem-v2'] = this.managers.filesystem;
+		await this.managers.filesystem.init();
 
-			this.managers.filesystem = new FileSystemManager(config.localStoragePath, this.errorReporter);
-			this.managers['filesystem-v2'] = this.managers.filesystem;
-
-			await this.managers.filesystem.init();
-		}
-
-		if (config.availableModes.includes('s3')) {
-			const { ObjectStoreManager } = await import('./object-store.manager');
-			const { ObjectStoreService } = await import('./object-store/object-store.service.ee');
-
-			this.managers.s3 = new ObjectStoreManager(Container.get(ObjectStoreService));
-
-			await this.managers.s3.init();
-		}
-
-		/**
-		 * DB manager is set directly at `BaseCommand` in `cli`.
-		 * to prevent a circular dependency (`core` -> `@n8n/db`
-		 * -> `core`) until we reorganize our dependency graph.
-		 */
+		// DB and S3 managers are set via `setManager()` from `cli`
 	}
 
 	createSignedToken(binaryData: IBinaryData, expiresIn: TimeUnitValue = '1 day') {
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/file-system-helper-functions.test.ts b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/file-system-helper-functions.test.ts
index e3c1e072e81..6710ff04fdf 100644
--- a/packages/core/src/execution-engine/node-execution-context/utils/__tests__/file-system-helper-functions.test.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/__tests__/file-system-helper-functions.test.ts
@@ -1,3 +1,4 @@
+import { SecurityConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 import type { INode } from 'n8n-workflow';
 import { createReadStream } from 'node:fs';
@@ -9,7 +10,6 @@ import {
 	BLOCK_FILE_ACCESS_TO_N8N_FILES,
 	CONFIG_FILES,
 	CUSTOM_EXTENSION_ENV,
-	RESTRICT_FILE_ACCESS_TO,
 	UM_EMAIL_TEMPLATES_INVITE,
 	UM_EMAIL_TEMPLATES_PWRESET,
 } from '@/constants';
@@ -23,6 +23,7 @@ jest.mock('node:fs/promises');
 const originalProcessEnv = { ...process.env };
 
 let instanceSettings: InstanceSettings;
+let securityConfig: SecurityConfig;
 beforeEach(() => {
 	process.env = { ...originalProcessEnv };
 
@@ -33,6 +34,8 @@ beforeEach(() => {
 	(fsRealpath as jest.Mock).mockImplementation((path: string) => path);
 
 	instanceSettings = Container.get(InstanceSettings);
+	securityConfig = Container.get(SecurityConfig);
+	securityConfig.restrictFileAccessTo = '';
 });
 
 describe('isFilePathBlocked', () => {
@@ -51,25 +54,25 @@ describe('isFilePathBlocked', () => {
 	});
 
 	it('should handle empty allowed paths', async () => {
-		delete process.env[RESTRICT_FILE_ACCESS_TO];
+		securityConfig.restrictFileAccessTo = '';
 		const result = await isFilePathBlocked('/some/random/path');
 		expect(result).toBe(false);
 	});
 
 	it('should handle multiple allowed paths', async () => {
-		process.env[RESTRICT_FILE_ACCESS_TO] = '/path1;/path2;/path3';
+		securityConfig.restrictFileAccessTo = '/path1;/path2;/path3';
 		const allowedPath = '/path2/somefile';
 		expect(await isFilePathBlocked(allowedPath)).toBe(false);
 	});
 
 	it('should handle empty strings in allowed paths', async () => {
-		process.env[RESTRICT_FILE_ACCESS_TO] = '/path1;;/path2';
+		securityConfig.restrictFileAccessTo = '/path1;;/path2';
 		const allowedPath = '/path2/somefile';
 		expect(await isFilePathBlocked(allowedPath)).toBe(false);
 	});
 
 	it('should trim whitespace in allowed paths', async () => {
-		process.env[RESTRICT_FILE_ACCESS_TO] = ' /path1 ; /path2 ; /path3 ';
+		securityConfig.restrictFileAccessTo = ' /path1 ; /path2 ; /path3 ';
 		const allowedPath = '/path2/somefile';
 		expect(await isFilePathBlocked(allowedPath)).toBe(false);
 	});
@@ -81,14 +84,14 @@ describe('isFilePathBlocked', () => {
 	});
 
 	it('should return true when path is in allowed paths but still restricted', async () => {
-		process.env[RESTRICT_FILE_ACCESS_TO] = '/some/allowed/path';
+		securityConfig.restrictFileAccessTo = '/some/allowed/path';
 		const restrictedPath = instanceSettings.n8nFolder;
 		expect(await isFilePathBlocked(restrictedPath)).toBe(true);
 	});
 
 	it('should return false when path is in allowed paths', async () => {
 		const allowedPath = '/some/allowed/path';
-		process.env[RESTRICT_FILE_ACCESS_TO] = allowedPath;
+		securityConfig.restrictFileAccessTo = allowedPath;
 		expect(await isFilePathBlocked(allowedPath)).toBe(false);
 	});
 
@@ -125,7 +128,7 @@ describe('isFilePathBlocked', () => {
 		const homeVarName = process.platform === 'win32' ? 'USERPROFILE' : 'HOME';
 		const userHome = process.env.N8N_USER_FOLDER ?? process.env[homeVarName] ?? process.cwd();
 
-		process.env[RESTRICT_FILE_ACCESS_TO] = userHome;
+		securityConfig.restrictFileAccessTo = userHome;
 		process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] = 'true';
 		const restrictedPath = instanceSettings.n8nFolder;
 		expect(await isFilePathBlocked(restrictedPath)).toBe(true);
@@ -135,7 +138,7 @@ describe('isFilePathBlocked', () => {
 		const homeVarName = process.platform === 'win32' ? 'USERPROFILE' : 'HOME';
 		const userHome = process.env.N8N_USER_FOLDER ?? process.env[homeVarName] ?? process.cwd();
 
-		process.env[RESTRICT_FILE_ACCESS_TO] = userHome;
+		securityConfig.restrictFileAccessTo = userHome;
 		process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] = 'true';
 		const restrictedPath = join(userHome, 'somefile.txt');
 		expect(await isFilePathBlocked(restrictedPath)).toBe(false);
@@ -145,14 +148,14 @@ describe('isFilePathBlocked', () => {
 		const homeVarName = process.platform === 'win32' ? 'USERPROFILE' : 'HOME';
 		const userHome = process.env.N8N_USER_FOLDER ?? process.env[homeVarName] ?? process.cwd();
 
-		process.env[RESTRICT_FILE_ACCESS_TO] = userHome;
+		securityConfig.restrictFileAccessTo = userHome;
 		process.env[BLOCK_FILE_ACCESS_TO_N8N_FILES] = 'true';
 		const restrictedPath = join(userHome, '.n8n_x');
 		expect(await isFilePathBlocked(restrictedPath)).toBe(false);
 	});
 
 	it('should return true for a symlink in a allowed path to a restricted path', async () => {
-		process.env[RESTRICT_FILE_ACCESS_TO] = '/path1';
+		securityConfig.restrictFileAccessTo = '/path1';
 		const allowedPath = '/path1/symlink';
 		const actualPath = '/path2/realfile';
 		(fsRealpath as jest.Mock).mockImplementation((path: string) =>
@@ -173,7 +176,7 @@ describe('isFilePathBlocked', () => {
 	it('should handle non-existent file when it is not allowed', async () => {
 		const filePath = '/non/existent/file';
 		const allowedPath = '/some/allowed/path';
-		process.env[RESTRICT_FILE_ACCESS_TO] = allowedPath;
+		securityConfig.restrictFileAccessTo = allowedPath;
 		const error = new Error('ENOENT');
 		// @ts-expect-error undefined property
 		error.code = 'ENOENT';
@@ -216,7 +219,7 @@ describe('getFileSystemHelperFunctions', () => {
 		});
 
 		it('should throw when file access is blocked', async () => {
-			process.env[RESTRICT_FILE_ACCESS_TO] = '/allowed/path';
+			securityConfig.restrictFileAccessTo = '/allowed/path';
 			(fsAccess as jest.Mock).mockResolvedValueOnce({});
 			await expect(helperFunctions.createReadStream('/blocked/path')).rejects.toThrow(
 				'Access to the file is not allowed',
@@ -224,7 +227,7 @@ describe('getFileSystemHelperFunctions', () => {
 		});
 
 		it('should not reveal if file exists if it is within restricted path', async () => {
-			process.env[RESTRICT_FILE_ACCESS_TO] = '/allowed/path';
+			securityConfig.restrictFileAccessTo = '/allowed/path';
 
 			const error = new Error('ENOENT');
 			// @ts-expect-error undefined property
diff --git a/packages/core/src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts b/packages/core/src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts
index 97e4472183d..24c0c27360d 100644
--- a/packages/core/src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts
+++ b/packages/core/src/execution-engine/node-execution-context/utils/file-system-helper-functions.ts
@@ -1,4 +1,5 @@
 import { isContainedWithin, safeJoinPath } from '@n8n/backend-common';
+import { SecurityConfig } from '@n8n/config';
 import { Container } from '@n8n/di';
 import type { FileSystemHelperFunctions, INode } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
@@ -8,6 +9,7 @@ import {
 	writeFile as fsWriteFile,
 	realpath as fsRealpath,
 } from 'node:fs/promises';
+import { homedir } from 'node:os';
 import { resolve } from 'node:path';
 
 import {
@@ -15,21 +17,21 @@ import {
 	BLOCK_FILE_ACCESS_TO_N8N_FILES,
 	CONFIG_FILES,
 	CUSTOM_EXTENSION_ENV,
-	RESTRICT_FILE_ACCESS_TO,
 	UM_EMAIL_TEMPLATES_INVITE,
 	UM_EMAIL_TEMPLATES_PWRESET,
 } from '@/constants';
 import { InstanceSettings } from '@/instance-settings';
 
 const getAllowedPaths = () => {
-	const restrictFileAccessTo = process.env[RESTRICT_FILE_ACCESS_TO];
-	if (!restrictFileAccessTo) {
-		return [];
-	}
+	const { restrictFileAccessTo } = Container.get(SecurityConfig);
+	if (restrictFileAccessTo === '') return [];
+
 	const allowedPaths = restrictFileAccessTo
 		.split(';')
 		.map((path) => path.trim())
-		.filter((path) => path);
+		.filter((path) => path)
+		.map((path) => (path.startsWith('~') ? path.replace('~', homedir()) : path));
+
 	return allowedPaths;
 };
 
diff --git a/packages/core/src/instance-settings/__tests__/instance-settings.test.ts b/packages/core/src/instance-settings/__tests__/instance-settings.test.ts
index 24923d2e3d5..8ddf20ab881 100644
--- a/packages/core/src/instance-settings/__tests__/instance-settings.test.ts
+++ b/packages/core/src/instance-settings/__tests__/instance-settings.test.ts
@@ -57,7 +57,10 @@ describe('InstanceSettings', () => {
 		it('should check if the settings file has the correct permissions', () => {
 			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
 			mockFs.statSync.mockReturnValueOnce({ mode: 0o600 } as fs.Stats);
-			const settings = createInstanceSettings({ encryptionKey: 'test_key' });
+			const settings = createInstanceSettings({
+				encryptionKey: 'test_key',
+				enforceSettingsFilePermissions: true,
+			});
 			expect(settings.encryptionKey).toEqual('test_key');
 			expect(settings.instanceId).toEqual(
 				'6ce26c63596f0cc4323563c529acfca0cccb0e57f6533d79a60a42c9ff862ae7',
@@ -65,18 +68,22 @@ describe('InstanceSettings', () => {
 			expect(mockFs.statSync).toHaveBeenCalledWith('/test/.n8n/config');
 		});
 
-		it('should check the permissions but not fix them if settings file has incorrect permissions by default', () => {
+		it('should check the permissions and fix them if settings file has incorrect permissions by default', () => {
 			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
 			mockFs.statSync.mockReturnValueOnce({ mode: 0o644 } as fs.Stats);
-			createInstanceSettings();
+			createInstanceSettings({
+				enforceSettingsFilePermissions: true,
+			});
 			expect(mockFs.statSync).toHaveBeenCalledWith('/test/.n8n/config');
-			expect(mockFs.chmodSync).not.toHaveBeenCalled();
+			expect(mockFs.chmodSync).toHaveBeenCalledWith('/test/.n8n/config', 0o600);
 		});
 
 		it("should not check the permissions if 'N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS' is false", () => {
 			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
 			mockFs.readFileSync.mockReturnValueOnce(JSON.stringify({ encryptionKey: 'test_key' }));
-			createInstanceSettings();
+			createInstanceSettings({
+				enforceSettingsFilePermissions: false,
+			});
 			expect(mockFs.statSync).not.toHaveBeenCalled();
 			expect(mockFs.chmodSync).not.toHaveBeenCalled();
 		});
@@ -100,8 +107,11 @@ describe('InstanceSettings', () => {
 			mockFs.writeFileSync.mockReturnValue();
 		});
 
-		it('should create a new settings file without explicit permissions if N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS is not set', () => {
-			const settings = createInstanceSettings({ encryptionKey: 'key_2' });
+		it('should create a new settings file with explicit permissions if N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS is not set', () => {
+			const settings = createInstanceSettings({
+				encryptionKey: 'key_2',
+				enforceSettingsFilePermissions: true,
+			});
 			expect(settings.encryptionKey).not.toEqual('test_key');
 			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
 			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
@@ -109,14 +119,17 @@ describe('InstanceSettings', () => {
 				expect.stringContaining('"encryptionKey":'),
 				{
 					encoding: 'utf-8',
-					mode: undefined,
+					mode: 0o600,
 				},
 			);
 		});
 
 		it('should create a new settings file without explicit permissions if N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false', () => {
 			process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
-			const settings = createInstanceSettings({ encryptionKey: 'key_2' });
+			const settings = createInstanceSettings({
+				encryptionKey: 'key_2',
+				enforceSettingsFilePermissions: false,
+			});
 			expect(settings.encryptionKey).not.toEqual('test_key');
 			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
 			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
@@ -148,7 +161,10 @@ describe('InstanceSettings', () => {
 		});
 
 		it('should pick up the encryption key from config', () => {
-			const settings = createInstanceSettings({ encryptionKey: 'env_key' });
+			const settings = createInstanceSettings({
+				encryptionKey: 'env_key',
+				enforceSettingsFilePermissions: true,
+			});
 			expect(settings.encryptionKey).toEqual('env_key');
 			expect(settings.instanceId).toEqual(
 				'2c70e12b7a0646f92279f427c7b38e7334d8e5389cff167a1dc30e73f826b683',
@@ -160,22 +176,7 @@ describe('InstanceSettings', () => {
 				expect.stringContaining('"encryptionKey":'),
 				{
 					encoding: 'utf-8',
-					mode: undefined,
-				},
-			);
-		});
-
-		it("should not set the permissions of the settings file if 'N8N_IGNORE_SETTINGS_FILE_PERMISSIONS' is true", () => {
-			process.env.N8N_IGNORE_SETTINGS_FILE_PERMISSIONS = 'true';
-			const settings = createInstanceSettings({ encryptionKey: 'key_2' });
-			expect(settings.encryptionKey).not.toEqual('test_key');
-			expect(mockFs.mkdirSync).toHaveBeenCalledWith('/test/.n8n', { recursive: true });
-			expect(mockFs.writeFileSync).toHaveBeenCalledWith(
-				'/test/.n8n/config',
-				expect.stringContaining('"encryptionKey":'),
-				{
-					encoding: 'utf-8',
-					mode: undefined,
+					mode: 0o600,
 				},
 			);
 		});
diff --git a/packages/core/src/instance-settings/instance-settings.ts b/packages/core/src/instance-settings/instance-settings.ts
index 4fc1c9095ca..e4c905bb6ed 100644
--- a/packages/core/src/instance-settings/instance-settings.ts
+++ b/packages/core/src/instance-settings/instance-settings.ts
@@ -273,19 +273,15 @@ export class InstanceSettings {
 	 * Ensures that the settings file has the r/w permissions only for the owner.
 	 */
 	private ensureSettingsFilePermissions() {
-		// If the flag is explicitly set to false, skip the check
-		if (this.enforceSettingsFilePermissions.isSet && !this.enforceSettingsFilePermissions.enforce) {
-			return;
-		}
-		if (this.isWindows()) {
-			// Ignore windows as it does not support chmod. We have already logged a warning
-			return;
-		}
+		if (!this.enforceSettingsFilePermissions.enforce) return;
+
+		if (this.isWindows()) return; // ignore windows as it does not support chmod
 
 		const permissionsResult = toResult(() => {
 			const stats = statSync(this.settingsFile);
 			return stats?.mode & 0o777;
 		});
+
 		// If we can't determine the permissions, log a warning and skip the check
 		if (!permissionsResult.ok) {
 			this.logger.warn(
@@ -295,32 +291,22 @@ export class InstanceSettings {
 		}
 
 		const arePermissionsCorrect = permissionsResult.result === 0o600;
-		if (arePermissionsCorrect) {
-			return;
-		}
 
-		// If the permissions are incorrect and the flag is not set, log a warning
-		if (!this.enforceSettingsFilePermissions.isSet) {
-			this.logger.warn(
-				`Permissions 0${permissionsResult.result.toString(8)} for n8n settings file ${this.settingsFile} are too wide. This is ignored for now, but in the future n8n will attempt to change the permissions automatically. To automatically enforce correct permissions now set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=true (recommended), or turn this check off set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.`,
-			);
-			// The default is false so we skip the enforcement for now
-			return;
-		}
+		if (arePermissionsCorrect) return;
 
-		if (this.enforceSettingsFilePermissions.enforce) {
+		this.logger.error(
+			`Permissions 0${permissionsResult.result.toString(8)} for n8n settings file ${this.settingsFile} are too wide. Changing permissions to 0600..`,
+		);
+
+		const chmodResult = toResult(() => chmodSync(this.settingsFile, 0o600));
+
+		if (!chmodResult.ok) {
+			// Some filesystems don't support permissions. In this case we log the
+			// error and ignore it. We might want to prevent the app startup in the
+			// future in this case.
 			this.logger.warn(
-				`Permissions 0${permissionsResult.result.toString(8)} for n8n settings file ${this.settingsFile} are too wide. Changing permissions to 0600..`,
+				`Could not enforce settings file permissions: ${chmodResult.error.message}. To skip this check, set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.`,
 			);
-			const chmodResult = toResult(() => chmodSync(this.settingsFile, 0o600));
-			if (!chmodResult.ok) {
-				// Some filesystems don't support permissions. In this case we log the
-				// error and ignore it. We might want to prevent the app startup in the
-				// future in this case.
-				this.logger.warn(
-					`Could not enforce settings file permissions: ${chmodResult.error.message}. To skip this check, set N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS=false.`,
-				);
-			}
 		}
 	}
 
diff --git a/packages/frontend/@n8n/i18n/src/locales/en.json b/packages/frontend/@n8n/i18n/src/locales/en.json
index 66cbc0cd1d4..4f126150dbd 100644
--- a/packages/frontend/@n8n/i18n/src/locales/en.json
+++ b/packages/frontend/@n8n/i18n/src/locales/en.json
@@ -138,6 +138,8 @@
 	"generic.your": "Your",
 	"generic.apiKey": "API Key",
 	"generic.search": "Search",
+	"generic.showMore": "Show more",
+	"generic.showLess": "Show less",
 	"about.aboutN8n": "About n8n",
 	"about.close": "Close",
 	"about.license": "License",
@@ -162,6 +164,7 @@
 	"activationModal.saveExecutions": "save executions.",
 	"activationModal.theseExecutionsWillNotShowUp": "These executions will not show up immediately in the editor,",
 	"activationModal.workflowActivated": "Workflow activated",
+	"activationModal.workflowPublished": "Workflow published",
 	"activationModal.yourTriggerWillNowFire": "Your trigger will now fire production executions automatically.",
 	"activationModal.yourTriggersWillNowFire": "Your triggers will now fire production executions automatically.",
 	"activationModal.yourWorkflowWillNowListenForEvents": "Your workflow will now listen for events from {serviceName} and trigger executions.",
@@ -1311,6 +1314,7 @@
 	"menuActions.delete": "Delete",
 	"menuActions.archive": "Archive",
 	"menuActions.unarchive": "Unarchive",
+	"menuActions.unpublish": "Unpublish",
 	"multipleParameter.addItem": "Add item",
 	"multipleParameter.currentlyNoItemsExist": "Currently no items exist",
 	"multipleParameter.deleteItem": "Delete item",
@@ -3156,12 +3160,17 @@
 	"workflowHistory.content.actions": "Actions",
 	"workflowHistory.item.id": "ID: {id}",
 	"workflowHistory.item.createdAt": "{date} at {time}",
+	"workflowHistory.item.savedAtLabel": "Saved:",
+	"workflowHistory.item.publishedAtLabel": "Published:",
 	"workflowHistory.item.actions.restore": "Restore this version",
+	"workflowHistory.item.actions.publish": "Publish this version",
+	"workflowHistory.item.actions.unpublish": "Unpublish workflow",
 	"workflowHistory.item.actions.clone": "Clone to new workflow",
 	"workflowHistory.item.actions.open": "Open version in new tab",
 	"workflowHistory.item.actions.download": "Download",
 	"workflowHistory.item.unsaved.title": "Unsaved version",
 	"workflowHistory.item.latest": "Latest saved",
+	"workflowHistory.item.active": "Published",
 	"workflowHistory.empty": "No versions yet.",
 	"workflowHistory.hint": "Save the workflow to create the first version!",
 	"workflowHistory.limit": "Version history is limited to {days} days",
@@ -3170,17 +3179,23 @@
 	"workflowHistory.action.error.title": "Failed to {action}",
 	"workflowHistory.action.restore.modal.title": "Restore previous workflow version?",
 	"workflowHistory.action.restore.modal.subtitle": "Your workflow will revert to the version from {date}",
-	"workflowHistory.action.restore.modal.text": "Your workflow is currently active, so production executions will immediately start using the restored version. If you'd like to deactivate it before restoring, click {buttonText}.",
+	"workflowHistory.action.restore.modal.publishedNote": "This will not affect the published version",
 	"workflowHistory.action.restore.modal.button.deactivateAndRestore": "Deactivate and restore",
 	"workflowHistory.action.restore.modal.button.restore": "Restore",
 	"workflowHistory.action.restore.modal.button.cancel": "Cancel",
 	"workflowHistory.action.restore.success.title": "Successfully restored workflow version",
 	"workflowHistory.action.clone.success.title": "Successfully cloned workflow version",
 	"workflowHistory.action.clone.success.message": "Open cloned workflow in a new tab",
+	"workflowHistory.action.unpublish.success.title": "Workflow unpublished successfully",
+	"workflowHistory.action.unpublish.modal.title": "Unpublish {versionName}",
+	"workflowHistory.action.unpublish.modal.description": "This will prevent all production executions to this workflow until you publish again.",
+	"workflowHistory.action.unpublish.modal.button.unpublish": "Unpublish",
 	"workflowHistory.button.tooltip.empty": "This workflow currently has no history to view. Once you've made your first save, you'll be able to view previous versions",
 	"workflowHistory.button.tooltip": "Workflow history to view and restore previous versions of your workflows",
+	"workflowHistory.publishModal.title": "Publish {versionName}",
 	"workflows.heading": "Workflows",
 	"workflows.add": "Add workflow",
+	"workflows.publish": "Publish",
 	"workflows.project.add": "Add workflow to project",
 	"workflows.item.open": "Open",
 	"workflows.item.share": "Share...",
@@ -3197,6 +3212,8 @@
 	"workflows.item.availableInMCP": "Available in MCP",
 	"workflows.item.enableMCPAccess": "Enable MCP access",
 	"workflows.item.disableMCPAccess": "Remove MCP access",
+	"workflows.item.published": "Published",
+	"workflows.item.notPublished": "Not published",
 	"workflows.itemSuggestion.try": "Try template",
 	"workflows.templateRecoV2.starterTemplates": "Starter templates",
 	"workflows.templateRecoV2.seeMoreStarterTemplates": "See more starter templates",
@@ -3297,6 +3314,12 @@
 	"workflows.preBuiltAgents.callout": "Get started faster with our",
 	"workflows.preBuiltAgents.linkText": "pre-built agents",
 	"workflowSelectorParameterInput.createNewSubworkflow.name": "My Sub-Workflow",
+	"workflows.publishModal.title": "Publish workflow",
+	"workflows.publishModal.noTriggerMessage": "This workflow has no trigger nodes that require publishing",
+	"workflows.publishModal.versionNameLabel": "Version name",
+	"workflows.publishModal.descriptionPlaceholder": "Describe changes (optional)",
+	"workflows.publishModal.noChanges": "No changes to publish",
+	"workflows.publishModal.lastPublished": "Last published by {author}, {date} at {time}",
 	"importCurlModal.title": "Import cURL command",
 	"importCurlModal.input.label": "cURL Command",
 	"importCurlModal.input.placeholder": "Paste the cURL command here",
diff --git a/packages/frontend/@n8n/rest-api-client/src/api/workflowHistory.ts b/packages/frontend/@n8n/rest-api-client/src/api/workflowHistory.ts
index 9df5c2845e0..15ee05c8de8 100644
--- a/packages/frontend/@n8n/rest-api-client/src/api/workflowHistory.ts
+++ b/packages/frontend/@n8n/rest-api-client/src/api/workflowHistory.ts
@@ -8,6 +8,18 @@ export type WorkflowHistory = {
 	authors: string;
 	createdAt: string;
 	updatedAt: string;
+	workflowPublishHistory: WorkflowPublishHistory[];
+	name: string | null;
+	description: string | null;
+};
+
+export type WorkflowPublishHistory = {
+	createdAt: string;
+	id: number;
+	event: 'activated' | 'deactivated';
+	userId: string | null;
+	versionId: string;
+	workflowId: string;
 };
 
 export type WorkflowVersionId = WorkflowHistory['versionId'];
@@ -18,7 +30,9 @@ export type WorkflowVersion = WorkflowHistory & {
 	connections: IConnections;
 };
 
-export type WorkflowHistoryActionTypes = ['restore', 'clone', 'open', 'download'];
+export type WorkflowHistoryActionTypes = Array<
+	'restore' | 'publish' | 'unpublish' | 'clone' | 'open' | 'download'
+>;
 
 export type WorkflowHistoryRequestParams = { take: number; skip?: number };
 
diff --git a/packages/frontend/editor-ui/src/Interface.ts b/packages/frontend/editor-ui/src/Interface.ts
index 1f120054c94..1970d850865 100644
--- a/packages/frontend/editor-ui/src/Interface.ts
+++ b/packages/frontend/editor-ui/src/Interface.ts
@@ -62,6 +62,7 @@ import type {
 	FolderListItem,
 	ResourceParentFolder,
 } from '@/features/core/folders/folders.types';
+import type { WorkflowHistory } from '@n8n/rest-api-client/api/workflowHistory';
 
 export * from '@n8n/design-system/types';
 
@@ -260,6 +261,7 @@ export interface IWorkflowDb {
 		createdAt?: string;
 		updatedAt?: string;
 	};
+	activeVersion?: WorkflowHistory | null;
 }
 
 // For workflow list we don't need the full workflow data
diff --git a/packages/frontend/editor-ui/src/app/api/workflows.ts b/packages/frontend/editor-ui/src/app/api/workflows.ts
index 51b5d6fd1f0..934ee1a6a14 100644
--- a/packages/frontend/editor-ui/src/app/api/workflows.ts
+++ b/packages/frontend/editor-ui/src/app/api/workflows.ts
@@ -115,3 +115,27 @@ export async function getLastSuccessfulExecution(
 		`/workflows/${workflowId}/executions/last-successful`,
 	);
 }
+
+export async function activateWorkflow(
+	context: IRestApiContext,
+	workflowId: string,
+	data: { versionId: string; name?: string; description?: string },
+): Promise<IWorkflowDb> {
+	return await makeRestApiRequest<IWorkflowDb>(
+		context,
+		'POST',
+		`/workflows/${workflowId}/activate`,
+		data,
+	);
+}
+
+export async function deactivateWorkflow(
+	context: IRestApiContext,
+	workflowId: string,
+): Promise<IWorkflowDb> {
+	return await makeRestApiRequest<IWorkflowDb>(
+		context,
+		'POST',
+		`/workflows/${workflowId}/deactivate`,
+	);
+}
diff --git a/packages/frontend/editor-ui/src/app/components/ActivationModal.vue b/packages/frontend/editor-ui/src/app/components/ActivationModal.vue
index d679cee39e8..c77e84d3d2e 100644
--- a/packages/frontend/editor-ui/src/app/components/ActivationModal.vue
+++ b/packages/frontend/editor-ui/src/app/components/ActivationModal.vue
@@ -19,16 +19,23 @@ import { useI18n } from '@n8n/i18n';
 
 import { ElCheckbox } from 'element-plus';
 import { N8nButton, N8nText } from '@n8n/design-system';
+import { IS_DRAFT_PUBLISH_ENABLED } from '@/app/constants';
 const checked = ref(false);
 
 const executionsStore = useExecutionsStore();
 const workflowsStore = useWorkflowsStore();
 const nodeTypesStore = useNodeTypesStore();
 const uiStore = useUIStore();
-
 const router = useRouter();
 const i18n = useI18n();
 
+const modalTitle = computed(() => {
+	if (IS_DRAFT_PUBLISH_ENABLED) {
+		return i18n.baseText('activationModal.workflowPublished');
+	}
+	return i18n.baseText('activationModal.workflowActivated');
+});
+
 const triggerContent = computed(() => {
 	const foundTriggers = getActivatableTriggerNodes(workflowsStore.workflowTriggerNodes);
 	if (!foundTriggers.length) {
@@ -94,11 +101,7 @@ const handleCheckboxChange = (checkboxValue: string | number | boolean) => {
 </script>
 
 <template>
-	<Modal
-		:name="WORKFLOW_ACTIVE_MODAL_KEY"
-		:title="i18n.baseText('activationModal.workflowActivated')"
-		width="460px"
-	>
+	<Modal :name="WORKFLOW_ACTIVE_MODAL_KEY" :title="modalTitle" width="460px">
 		<template #content>
 			<div>
 				<N8nText>{{ triggerContent }}</N8nText>
diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/ActionsDropdownMenu.vue b/packages/frontend/editor-ui/src/app/components/MainHeader/ActionsDropdownMenu.vue
new file mode 100644
index 00000000000..327f2f46cbe
--- /dev/null
+++ b/packages/frontend/editor-ui/src/app/components/MainHeader/ActionsDropdownMenu.vue
@@ -0,0 +1,434 @@
+<script lang="ts" setup>
+import { computed, ref, useCssModule } from 'vue';
+import { type ActionDropdownItem, N8nActionDropdown } from '@n8n/design-system';
+import type { WorkflowDataUpdate } from '@n8n/rest-api-client';
+import { useToast } from '@/app/composables/useToast';
+import { useI18n } from '@n8n/i18n';
+import { createEventBus } from '@n8n/utils/event-bus';
+import {
+	WORKFLOW_MENU_ACTIONS,
+	VIEWS,
+	DUPLICATE_MODAL_KEY,
+	IMPORT_WORKFLOW_URL_MODAL_KEY,
+	WORKFLOW_SETTINGS_MODAL_KEY,
+	WORKFLOW_HISTORY_VERSION_UNPUBLISH,
+	IS_DRAFT_PUBLISH_ENABLED,
+	WORKFLOW_SHARE_MODAL_KEY,
+	EnterpriseEditionFeature,
+} from '@/app/constants';
+import { hasPermission } from '@/app/utils/rbac/permissions';
+import { useRoute } from 'vue-router';
+import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
+import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
+import type { PermissionsRecord } from '@n8n/permissions';
+import { useUIStore } from '@/app/stores/ui.store';
+import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/collaboration/projects/projects.constants';
+import { ResourceType } from '@/features/collaboration/projects/projects.utils';
+import type { IWorkflowToShare, IWorkflowDb } from '@/Interface';
+import { telemetry } from '@/app/plugins/telemetry';
+import router from '@/app/router';
+import { sanitizeFilename } from '@n8n/utils';
+import saveAs from 'file-saver';
+import { nodeViewEventBus } from '@/app/event-bus';
+import type { FolderShortInfo } from '@/features/core/folders/folders.types';
+import { useWorkflowsStore } from '@/app/stores/workflows.store';
+import { useRootStore } from '@n8n/stores/useRootStore';
+import { useTagsStore } from '@/features/shared/tags/tags.store';
+import { useSettingsStore } from '@/app/stores/settings.store';
+import { useUsersStore } from '@/features/settings/users/users.store';
+import { useTelemetry } from '@/app/composables/useTelemetry';
+import { useWorkflowHelpers } from '@/app/composables/useWorkflowHelpers';
+import { useWorkflowActivate } from '@/app/composables/useWorkflowActivate';
+import { getWorkflowId } from '@/app/components/MainHeader/utils';
+
+const props = defineProps<{
+	workflowPermissions: PermissionsRecord['workflow'];
+	isNewWorkflow: boolean;
+	readOnly?: boolean;
+	isArchived: IWorkflowDb['isArchived'];
+	id: IWorkflowDb['id'];
+	name: IWorkflowDb['name'];
+	tags: IWorkflowDb['tags'];
+	currentFolder?: FolderShortInfo;
+	meta: IWorkflowDb['meta'];
+}>();
+
+const emit = defineEmits<{
+	'workflow:saved': [];
+}>();
+
+const importFileRef = ref<HTMLInputElement | undefined>();
+const toast = useToast();
+const locale = useI18n();
+const route = useRoute();
+const projectsStore = useProjectsStore();
+const sourceControlStore = useSourceControlStore();
+const workflowsStore = useWorkflowsStore();
+const uiStore = useUIStore();
+const $style = useCssModule();
+const rootStore = useRootStore();
+const tagsStore = useTagsStore();
+const settingsStore = useSettingsStore();
+const usersStore = useUsersStore();
+const workflowHelpers = useWorkflowHelpers();
+const workflowActivate = useWorkflowActivate();
+const changeOwnerEventBus = createEventBus();
+const workflowTelemetry = useTelemetry();
+
+const onWorkflowPage = computed(() => {
+	return route.meta && (route.meta.nodeView || route.meta.keepWorkflowAlive === true);
+});
+
+const onExecutionsTab = computed(() => {
+	return [
+		VIEWS.EXECUTION_HOME.toString(),
+		VIEWS.WORKFLOW_EXECUTIONS.toString(),
+		VIEWS.EXECUTION_PREVIEW,
+	].includes((route.name as string) || '');
+});
+
+const activeVersion = computed(() => workflowsStore.workflow.activeVersion);
+
+const isDraftPublishEnabled = IS_DRAFT_PUBLISH_ENABLED;
+
+const isSharingEnabled = computed(
+	() => settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.Sharing],
+);
+
+function handleFileImport() {
+	const inputRef = importFileRef.value;
+	if (inputRef?.files && inputRef.files.length !== 0) {
+		const reader = new FileReader();
+		reader.onload = () => {
+			let workflowData: WorkflowDataUpdate;
+			try {
+				workflowData = JSON.parse(reader.result as string);
+			} catch (error) {
+				toast.showMessage({
+					title: locale.baseText('mainSidebar.showMessage.handleFileImport.title'),
+					message: locale.baseText('mainSidebar.showMessage.handleFileImport.message'),
+					type: 'error',
+				});
+				return;
+			} finally {
+				reader.onload = null;
+				inputRef.value = '';
+			}
+
+			nodeViewEventBus.emit('importWorkflowData', { data: workflowData });
+		};
+		reader.readAsText(inputRef.files[0]);
+	}
+}
+
+const workflowMenuItems = computed<Array<ActionDropdownItem<WORKFLOW_MENU_ACTIONS>>>(() => {
+	const actions: Array<ActionDropdownItem<WORKFLOW_MENU_ACTIONS>> = [
+		{
+			id: WORKFLOW_MENU_ACTIONS.DOWNLOAD,
+			label: locale.baseText('menuActions.download'),
+			disabled: !onWorkflowPage.value,
+		},
+	];
+
+	if (isDraftPublishEnabled && isSharingEnabled.value) {
+		actions.push({
+			id: WORKFLOW_MENU_ACTIONS.SHARE,
+			label: locale.baseText('workflowDetails.share'),
+			disabled: !onWorkflowPage.value,
+		});
+	}
+
+	if (props.workflowPermissions.move && projectsStore.isTeamProjectFeatureEnabled) {
+		actions.push({
+			id: WORKFLOW_MENU_ACTIONS.CHANGE_OWNER,
+			label: locale.baseText('workflows.item.changeOwner'),
+			disabled: props.isNewWorkflow,
+		});
+	}
+
+	if (!props.readOnly && !props.isArchived) {
+		actions.push({
+			id: WORKFLOW_MENU_ACTIONS.RENAME,
+			label: locale.baseText('generic.rename'),
+			disabled: !onWorkflowPage.value || props.workflowPermissions.update !== true,
+		});
+	}
+
+	if (
+		(props.workflowPermissions.update === true && !props.readOnly && !props.isArchived) ||
+		props.isNewWorkflow
+	) {
+		actions.unshift({
+			id: WORKFLOW_MENU_ACTIONS.DUPLICATE,
+			label: locale.baseText('menuActions.duplicate'),
+			disabled: !onWorkflowPage.value || !props.id,
+		});
+
+		actions.push(
+			{
+				id: WORKFLOW_MENU_ACTIONS.IMPORT_FROM_URL,
+				label: locale.baseText('menuActions.importFromUrl'),
+				disabled: !onWorkflowPage.value || onExecutionsTab.value,
+			},
+			{
+				id: WORKFLOW_MENU_ACTIONS.IMPORT_FROM_FILE,
+				label: locale.baseText('menuActions.importFromFile'),
+				disabled: !onWorkflowPage.value || onExecutionsTab.value,
+			},
+		);
+	}
+
+	if (hasPermission(['rbac'], { rbac: { scope: 'sourceControl:push' } })) {
+		actions.push({
+			id: WORKFLOW_MENU_ACTIONS.PUSH,
+			label: locale.baseText('menuActions.push'),
+			disabled:
+				!sourceControlStore.isEnterpriseSourceControlEnabled ||
+				!onWorkflowPage.value ||
+				onExecutionsTab.value ||
+				sourceControlStore.preferences.branchReadOnly,
+		});
+	}
+
+	actions.push({
+		id: WORKFLOW_MENU_ACTIONS.SETTINGS,
+		label: locale.baseText('generic.settings'),
+		disabled: !onWorkflowPage.value || props.isNewWorkflow,
+	});
+
+	if (
+		isDraftPublishEnabled &&
+		activeVersion.value &&
+		props.workflowPermissions.update &&
+		!props.readOnly
+	) {
+		actions.push({
+			id: WORKFLOW_MENU_ACTIONS.UNPUBLISH,
+			label: locale.baseText('menuActions.unpublish'),
+			disabled: !onWorkflowPage.value,
+		});
+	}
+
+	if ((props.workflowPermissions.delete === true && !props.readOnly) || props.isNewWorkflow) {
+		if (props.isArchived) {
+			actions.push({
+				id: WORKFLOW_MENU_ACTIONS.UNARCHIVE,
+				label: locale.baseText('menuActions.unarchive'),
+				disabled: !onWorkflowPage.value || props.isNewWorkflow,
+			});
+			actions.push({
+				id: WORKFLOW_MENU_ACTIONS.DELETE,
+				label: locale.baseText('menuActions.delete'),
+				disabled: !onWorkflowPage.value || props.isNewWorkflow,
+				customClass: $style.deleteItem,
+				divided: true,
+			});
+		} else {
+			actions.push({
+				id: WORKFLOW_MENU_ACTIONS.ARCHIVE,
+				label: locale.baseText('menuActions.archive'),
+				disabled: !onWorkflowPage.value || props.isNewWorkflow,
+				customClass: $style.deleteItem,
+				divided: true,
+			});
+		}
+	}
+
+	return actions;
+});
+
+async function onWorkflowMenuSelect(action: WORKFLOW_MENU_ACTIONS): Promise<void> {
+	switch (action) {
+		case WORKFLOW_MENU_ACTIONS.DUPLICATE: {
+			uiStore.openModalWithData({
+				name: DUPLICATE_MODAL_KEY,
+				data: {
+					id: props.id,
+					name: props.name,
+					tags: props.tags,
+					parentFolderId: props.currentFolder?.id,
+				},
+			});
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.RENAME: {
+			nodeViewEventBus.emit('renameWorkflow');
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.DOWNLOAD: {
+			const workflowData = await workflowHelpers.getWorkflowDataToSave();
+			const { tags, ...data } = workflowData;
+			const exportData: IWorkflowToShare = {
+				...data,
+				meta: {
+					...props.meta,
+					instanceId: rootStore.instanceId,
+				},
+				tags: (tags ?? []).map((tagId) => {
+					const { usageCount, ...tag } = tagsStore.tagsById[tagId];
+
+					return tag;
+				}),
+			};
+
+			const blob = new Blob([JSON.stringify(exportData, null, 2)], {
+				type: 'application/json;charset=utf-8',
+			});
+
+			let name = props.name || 'unsaved_workflow';
+			name = sanitizeFilename(name);
+
+			telemetry.track('User exported workflow', { workflow_id: workflowData.id });
+			saveAs(blob, name + '.json');
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.IMPORT_FROM_URL: {
+			uiStore.openModal(IMPORT_WORKFLOW_URL_MODAL_KEY);
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.IMPORT_FROM_FILE: {
+			nodeViewEventBus.emit('importWorkflowFromFile');
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.PUSH: {
+			try {
+				emit('workflow:saved');
+
+				// Navigate to route with sourceControl param - modal will handle data loading and loading states
+				void router.push({
+					query: {
+						...route.query,
+						sourceControl: 'push',
+					},
+				});
+			} catch (error) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				switch (error.message) {
+					case 'source_control_not_connected':
+						toast.showError(
+							{ ...error, message: '' },
+							locale.baseText('settings.sourceControl.error.not.connected.title'),
+							locale.baseText('settings.sourceControl.error.not.connected.message'),
+						);
+						break;
+					default:
+						toast.showError(error, locale.baseText('error'));
+				}
+			}
+
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.SETTINGS: {
+			uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.SHARE: {
+			uiStore.openModalWithData({
+				name: WORKFLOW_SHARE_MODAL_KEY,
+				data: { id: props.id },
+			});
+
+			workflowTelemetry.track('User opened sharing modal', {
+				workflow_id: props.id,
+				user_id_sharer: usersStore.currentUser?.id,
+				sub_view: route.name === VIEWS.WORKFLOWS ? 'Workflows listing' : 'Workflow editor',
+			});
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.ARCHIVE: {
+			nodeViewEventBus.emit('archiveWorkflow');
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.UNARCHIVE: {
+			nodeViewEventBus.emit('unarchiveWorkflow');
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.DELETE: {
+			nodeViewEventBus.emit('deleteWorkflow');
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.CHANGE_OWNER: {
+			const workflowId = getWorkflowId(props.id, route.params.name);
+			if (!workflowId) {
+				return;
+			}
+			changeOwnerEventBus.once(
+				'resource-moved',
+				async () => await router.push({ name: VIEWS.WORKFLOWS }),
+			);
+
+			uiStore.openModalWithData({
+				name: PROJECT_MOVE_RESOURCE_MODAL,
+				data: {
+					resource: workflowsStore.workflowsById[workflowId],
+					resourceType: ResourceType.Workflow,
+					resourceTypeLabel: locale.baseText('generic.workflow').toLowerCase(),
+					eventBus: changeOwnerEventBus,
+				},
+			});
+			break;
+		}
+		case WORKFLOW_MENU_ACTIONS.UNPUBLISH: {
+			const workflowId = getWorkflowId(props.id, route.params.name);
+			if (!workflowId || !activeVersion.value) {
+				return;
+			}
+
+			const unpublishEventBus = createEventBus();
+			unpublishEventBus.once('unpublish', async () => {
+				const success = await workflowActivate.unpublishWorkflowFromHistory(workflowId);
+				uiStore.closeModal(WORKFLOW_HISTORY_VERSION_UNPUBLISH);
+				if (success) {
+					toast.showMessage({
+						title: locale.baseText('workflowHistory.action.unpublish.success.title'),
+						type: 'success',
+					});
+				}
+			});
+
+			uiStore.openModalWithData({
+				name: WORKFLOW_HISTORY_VERSION_UNPUBLISH,
+				data: {
+					versionName: activeVersion.value.name,
+					eventBus: unpublishEventBus,
+				},
+			});
+			break;
+		}
+		default:
+			break;
+	}
+}
+
+defineExpose({
+	importFileRef,
+});
+</script>
+<template>
+	<div :class="[$style.group]">
+		<input
+			ref="importFileRef"
+			:class="$style.hiddenInput"
+			type="file"
+			data-test-id="workflow-import-input"
+			@change="handleFileImport()"
+		/>
+		<N8nActionDropdown
+			:items="workflowMenuItems"
+			data-test-id="workflow-menu"
+			@select="onWorkflowMenuSelect"
+		/>
+	</div>
+</template>
+<style lang="scss" module>
+.deleteItem {
+	color: var(--color--danger);
+}
+.group {
+	display: flex;
+	gap: var(--spacing--xs);
+}
+.hiddenInput {
+	display: none;
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDetails.test.ts b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDetails.test.ts
index edb7e76540b..4bf654ddb23 100644
--- a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDetails.test.ts
+++ b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDetails.test.ts
@@ -27,13 +27,18 @@ vi.mock('vue-router', async (importOriginal) => ({
 	useRoute: vi.fn().mockReturnValue({
 		params: { name: 'test' },
 		query: { parentFolderId: '1' },
+		meta: {
+			nodeView: true,
+		},
 	}),
 	useRouter: vi.fn().mockReturnValue({
 		replace: vi.fn(),
 		push: vi.fn().mockResolvedValue(undefined),
 		currentRoute: {
 			value: {
-				params: { name: 'test' },
+				params: {
+					name: 'test',
+				},
 				query: { parentFolderId: '1' },
 			},
 		},
@@ -109,6 +114,13 @@ const renderComponent = createComponentRenderer(WorkflowDetails, {
 				template: '<div><slot name="append" /></div>',
 			},
 		},
+		directives: {
+			loading: {
+				mounted() {},
+				updated() {},
+				unmounted() {},
+			},
+		},
 	},
 });
 
@@ -125,6 +137,8 @@ const workflow = {
 	tags: ['1', '2'],
 	active: false,
 	isArchived: false,
+	scopes: [],
+	meta: {},
 };
 
 describe('WorkflowDetails', () => {
@@ -148,7 +162,7 @@ describe('WorkflowDetails', () => {
 	});
 
 	it('renders workflow name and tags', async () => {
-		(useRoute as Mock).mockReturnValue({
+		(useRoute as Mock).mockReturnValueOnce({
 			query: { parentFolderId: '1' },
 		});
 		const { getByTestId, getByText } = renderComponent({
@@ -193,7 +207,8 @@ describe('WorkflowDetails', () => {
 			},
 		});
 
-		await userEvent.click(getByTestId('workflow-share-button'));
+		await userEvent.click(getByTestId('workflow-menu'));
+		await userEvent.click(getByTestId('workflow-menu-item-share'));
 		expect(openModalSpy).toHaveBeenCalledWith({
 			name: WORKFLOW_SHARE_MODAL_KEY,
 			data: { id: '1' },
@@ -202,11 +217,12 @@ describe('WorkflowDetails', () => {
 
 	describe('Workflow menu', () => {
 		beforeEach(() => {
-			(useRoute as Mock).mockReturnValue({
+			(useRoute as Mock).mockReturnValueOnce({
 				meta: {
 					nodeView: true,
 				},
 				query: { parentFolderId: '1' },
+				params: { name: 'test' },
 			});
 		});
 
@@ -242,6 +258,7 @@ describe('WorkflowDetails', () => {
 			expect(getByTestId('workflow-menu-item-duplicate')).toBeInTheDocument();
 			expect(getByTestId('workflow-menu-item-import-from-url')).toBeInTheDocument();
 			expect(getByTestId('workflow-menu-item-import-from-file')).toBeInTheDocument();
+			expect(queryByTestId('workflow-menu-item-share')).toBeInTheDocument();
 			expect(queryByTestId('workflow-menu-item-delete')).not.toBeInTheDocument();
 			expect(queryByTestId('workflow-menu-item-archive')).not.toBeInTheDocument();
 			expect(queryByTestId('workflow-menu-item-unarchive')).not.toBeInTheDocument();
@@ -596,7 +613,7 @@ describe('WorkflowDetails', () => {
 		it("should call onWorkflowMenuSelect on 'Change owner' option click", async () => {
 			const openModalSpy = vi.spyOn(uiStore, 'openModalWithData');
 
-			workflowsStore.workflowsById = { [workflow.id]: workflow as IWorkflowDb };
+			workflowsStore.workflowsById = { [workflow.id]: workflow as unknown as IWorkflowDb };
 
 			const { getByTestId } = renderComponent({
 				props: {
diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDetails.vue b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDetails.vue
index a60ccdc3832..c05d89052f1 100644
--- a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDetails.vue
+++ b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowDetails.vue
@@ -1,60 +1,36 @@
 <script lang="ts" setup>
 import BreakpointsObserver from '@/app/components/BreakpointsObserver.vue';
-import EnterpriseEdition from '@/app/components/EnterpriseEdition.ee.vue';
 import FolderBreadcrumbs from '@/features/core/folders/components/FolderBreadcrumbs.vue';
-import CollaborationPane from '@/features/collaboration/collaboration/components/CollaborationPane.vue';
-import WorkflowHistoryButton from '@/features/workflows/workflowHistory/components/WorkflowHistoryButton.vue';
 import PushConnectionTracker from '@/app/components/PushConnectionTracker.vue';
-import SaveButton from '@/app/components/SaveButton.vue';
-import WorkflowActivator from '@/app/components/WorkflowActivator.vue';
 import WorkflowProductionChecklist from '@/app/components/WorkflowProductionChecklist.vue';
 import WorkflowTagsContainer from '@/features/shared/tags/components/WorkflowTagsContainer.vue';
 import WorkflowTagsDropdown from '@/features/shared/tags/components/WorkflowTagsDropdown.vue';
 import {
-	DUPLICATE_MODAL_KEY,
-	EnterpriseEditionFeature,
-	IMPORT_WORKFLOW_URL_MODAL_KEY,
 	MAX_WORKFLOW_NAME_LENGTH,
 	MODAL_CONFIRM,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	VIEWS,
-	WORKFLOW_MENU_ACTIONS,
-	WORKFLOW_SETTINGS_MODAL_KEY,
-	WORKFLOW_SHARE_MODAL_KEY,
+	IS_DRAFT_PUBLISH_ENABLED,
 } from '@/app/constants';
-import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/collaboration/projects/projects.constants';
-import { ResourceType } from '@/features/collaboration/projects/projects.utils';
 
 import { useProjectsStore } from '@/features/collaboration/projects/projects.store';
-import { useSettingsStore } from '@/app/stores/settings.store';
-import { useSourceControlStore } from '@/features/integrations/sourceControl.ee/sourceControl.store';
-import { useTagsStore } from '@/features/shared/tags/tags.store';
-import { useUIStore } from '@/app/stores/ui.store';
-import { useUsersStore } from '@/features/settings/users/users.store';
-import { useWorkflowsStore } from '@/app/stores/workflows.store';
-import { useRootStore } from '@n8n/stores/useRootStore';
-
 import { useDocumentTitle } from '@/app/composables/useDocumentTitle';
 import { useMessage } from '@/app/composables/useMessage';
-import { usePageRedirectionHelper } from '@/app/composables/usePageRedirectionHelper';
 import { useTelemetry } from '@/app/composables/useTelemetry';
 import { useToast } from '@/app/composables/useToast';
-import { useWorkflowHelpers } from '@/app/composables/useWorkflowHelpers';
 import { useWorkflowSaving } from '@/app/composables/useWorkflowSaving';
 import { nodeViewEventBus } from '@/app/event-bus';
-import type { ActionDropdownItem, IWorkflowDb, IWorkflowToShare } from '@/Interface';
+import type { IWorkflowDb } from '@/Interface';
 import type { FolderShortInfo } from '@/features/core/folders/folders.types';
 import { useFoldersStore } from '@/features/core/folders/folders.store';
 import { useNpsSurveyStore } from '@/app/stores/npsSurvey.store';
 import { ProjectTypes } from '@/features/collaboration/projects/projects.types';
-import { sanitizeFilename } from '@n8n/utils/files/sanitize';
-import { hasPermission } from '@/app/utils/rbac/permissions';
 import type { PathItem } from '@n8n/design-system/components/N8nBreadcrumbs/Breadcrumbs.vue';
-import { type BaseTextKey, useI18n } from '@n8n/i18n';
+import WorkflowHeaderActions from '@/app/components/MainHeader/WorkflowHeaderActions.vue';
+import WorkflowHeaderDraftPublishActions from '@/app/components/MainHeader/WorkflowHeaderDraftPublishActions.vue';
+import { useI18n } from '@n8n/i18n';
 import { getResourcePermissions } from '@n8n/permissions';
-import type { WorkflowDataUpdate } from '@n8n/rest-api-client/api/workflows';
 import { createEventBus } from '@n8n/utils/event-bus';
-import { saveAs } from 'file-saver';
 import {
 	computed,
 	onBeforeUnmount,
@@ -64,18 +40,15 @@ import {
 	useTemplateRef,
 	watch,
 } from 'vue';
-import { I18nT } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import {
-	N8nActionDropdown,
-	N8nBadge,
-	N8nButton,
-	N8nInlineTextEdit,
-	N8nTooltip,
-} from '@n8n/design-system';
 import WorkflowDescriptionPopover from './WorkflowDescriptionPopover.vue';
 
+import { N8nBadge, N8nInlineTextEdit } from '@n8n/design-system';
+import { useSettingsStore } from '@/app/stores/settings.store';
+import { useUIStore } from '@/app/stores/ui.store';
+import { useWorkflowsStore } from '@/app/stores/workflows.store';
+import { getWorkflowId } from '@/app/components/MainHeader/utils';
 const WORKFLOW_NAME_BP_TO_WIDTH: { [key: string]: number } = {
 	XS: 150,
 	SM: 200,
@@ -103,12 +76,8 @@ const emit = defineEmits<{
 
 const $style = useCssModule();
 
-const rootStore = useRootStore();
 const settingsStore = useSettingsStore();
-const sourceControlStore = useSourceControlStore();
-const tagsStore = useTagsStore();
 const uiStore = useUIStore();
-const usersStore = useUsersStore();
 const workflowsStore = useWorkflowsStore();
 const projectsStore = useProjectsStore();
 const foldersStore = useFoldersStore();
@@ -124,16 +93,15 @@ const message = useMessage();
 const toast = useToast();
 const documentTitle = useDocumentTitle();
 const workflowSaving = useWorkflowSaving({ router });
-const workflowHelpers = useWorkflowHelpers();
-const pageRedirectionHelper = usePageRedirectionHelper();
 
 const isTagsEditEnabled = ref(false);
 const appliedTagIds = ref<string[]>([]);
 const tagsSaving = ref(false);
-const importFileRef = ref<HTMLInputElement | undefined>();
-
+const workflowHeaderActionsRef = useTemplateRef<
+	| InstanceType<typeof WorkflowHeaderActions>
+	| InstanceType<typeof WorkflowHeaderDraftPublishActions>
+>('workflowHeaderActions');
 const tagsEventBus = createEventBus();
-const changeOwnerEventBus = createEventBus();
 
 const hasChanged = (prev: string[], curr: string[]) => {
 	if (prev.length !== curr.length) {
@@ -152,115 +120,8 @@ const isWorkflowSaving = computed(() => {
 	return uiStore.isActionActive.workflowSaving;
 });
 
-const onWorkflowPage = computed(() => {
-	return route.meta && (route.meta.nodeView || route.meta.keepWorkflowAlive === true);
-});
-
-const onExecutionsTab = computed(() => {
-	return [
-		VIEWS.EXECUTION_HOME.toString(),
-		VIEWS.WORKFLOW_EXECUTIONS.toString(),
-		VIEWS.EXECUTION_PREVIEW,
-	].includes((route.name as string) || '');
-});
-
 const workflowPermissions = computed(() => getResourcePermissions(props.scopes).workflow);
 
-const workflowMenuItems = computed<Array<ActionDropdownItem<WORKFLOW_MENU_ACTIONS>>>(() => {
-	const actions: Array<ActionDropdownItem<WORKFLOW_MENU_ACTIONS>> = [
-		{
-			id: WORKFLOW_MENU_ACTIONS.DOWNLOAD,
-			label: locale.baseText('menuActions.download'),
-			disabled: !onWorkflowPage.value,
-		},
-	];
-
-	if (workflowPermissions.value.move && projectsStore.isTeamProjectFeatureEnabled) {
-		actions.push({
-			id: WORKFLOW_MENU_ACTIONS.CHANGE_OWNER,
-			label: locale.baseText('workflows.item.changeOwner'),
-			disabled: isNewWorkflow.value,
-		});
-	}
-
-	if (!props.readOnly && !props.isArchived) {
-		actions.push({
-			id: WORKFLOW_MENU_ACTIONS.RENAME,
-			label: locale.baseText('generic.rename'),
-			disabled: !onWorkflowPage.value || workflowPermissions.value.update !== true,
-		});
-	}
-
-	if (
-		(workflowPermissions.value.update === true && !props.readOnly && !props.isArchived) ||
-		isNewWorkflow.value
-	) {
-		actions.unshift({
-			id: WORKFLOW_MENU_ACTIONS.DUPLICATE,
-			label: locale.baseText('menuActions.duplicate'),
-			disabled: !onWorkflowPage.value || !props.id,
-		});
-
-		actions.push(
-			{
-				id: WORKFLOW_MENU_ACTIONS.IMPORT_FROM_URL,
-				label: locale.baseText('menuActions.importFromUrl'),
-				disabled: !onWorkflowPage.value || onExecutionsTab.value,
-			},
-			{
-				id: WORKFLOW_MENU_ACTIONS.IMPORT_FROM_FILE,
-				label: locale.baseText('menuActions.importFromFile'),
-				disabled: !onWorkflowPage.value || onExecutionsTab.value,
-			},
-		);
-	}
-
-	if (hasPermission(['rbac'], { rbac: { scope: 'sourceControl:push' } })) {
-		actions.push({
-			id: WORKFLOW_MENU_ACTIONS.PUSH,
-			label: locale.baseText('menuActions.push'),
-			disabled:
-				!sourceControlStore.isEnterpriseSourceControlEnabled ||
-				!onWorkflowPage.value ||
-				onExecutionsTab.value ||
-				sourceControlStore.preferences.branchReadOnly,
-		});
-	}
-
-	actions.push({
-		id: WORKFLOW_MENU_ACTIONS.SETTINGS,
-		label: locale.baseText('generic.settings'),
-		disabled: !onWorkflowPage.value || isNewWorkflow.value,
-	});
-
-	if ((workflowPermissions.value.delete === true && !props.readOnly) || isNewWorkflow.value) {
-		if (props.isArchived) {
-			actions.push({
-				id: WORKFLOW_MENU_ACTIONS.UNARCHIVE,
-				label: locale.baseText('menuActions.unarchive'),
-				disabled: !onWorkflowPage.value || isNewWorkflow.value,
-			});
-			actions.push({
-				id: WORKFLOW_MENU_ACTIONS.DELETE,
-				label: locale.baseText('menuActions.delete'),
-				disabled: !onWorkflowPage.value || isNewWorkflow.value,
-				customClass: $style.deleteItem,
-				divided: true,
-			});
-		} else {
-			actions.push({
-				id: WORKFLOW_MENU_ACTIONS.ARCHIVE,
-				label: locale.baseText('menuActions.archive'),
-				disabled: !onWorkflowPage.value || isNewWorkflow.value,
-				customClass: $style.deleteItem,
-				divided: true,
-			});
-		}
-	}
-
-	return actions;
-});
-
 const workflowTagIds = computed(() => {
 	return (props.tags ?? []).map((tag) => (typeof tag === 'string' ? tag : tag.id));
 });
@@ -292,24 +153,13 @@ watch(
 	},
 );
 
-function getWorkflowId(): string | undefined {
-	let id: string | undefined = undefined;
-	if (props.id !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
-		id = props.id;
-	} else if (route.params.name && route.params.name !== 'new') {
-		id = route.params.name as string;
-	}
-
-	return id;
-}
-
 async function onSaveButtonClick() {
 	// If the workflow is saving, do not allow another save
 	if (isWorkflowSaving.value) {
 		return;
 	}
 
-	const id = getWorkflowId();
+	const id = getWorkflowId(props.id, route.params.name);
 
 	const name = props.name;
 	const tags = props.tags as string[];
@@ -334,19 +184,6 @@ async function onSaveButtonClick() {
 	}
 }
 
-function onShareButtonClick() {
-	uiStore.openModalWithData({
-		name: WORKFLOW_SHARE_MODAL_KEY,
-		data: { id: props.id },
-	});
-
-	telemetry.track('User opened sharing modal', {
-		workflow_id: props.id,
-		user_id_sharer: usersStore.currentUser?.id,
-		sub_view: route.name === VIEWS.WORKFLOWS ? 'Workflows listing' : 'Workflow editor',
-	});
-}
-
 function onTagsEditEnable() {
 	appliedTagIds.value = (props.tags ?? []) as string[];
 	isTagsEditEnabled.value = true;
@@ -413,7 +250,7 @@ async function onNameSubmit(name: string) {
 	}
 
 	uiStore.addActiveAction('workflowSaving');
-	const id = getWorkflowId();
+	const id = getWorkflowId(props.id, route.params.name);
 	const saved = await workflowSaving.saveCurrentWorkflow({ name });
 	if (saved) {
 		showCreateWorkflowSuccessToast(id);
@@ -423,32 +260,6 @@ async function onNameSubmit(name: string) {
 	renameInput.value?.forceCancel();
 }
 
-async function handleFileImport(): Promise<void> {
-	const inputRef = importFileRef.value;
-	if (inputRef?.files && inputRef.files.length !== 0) {
-		const reader = new FileReader();
-		reader.onload = () => {
-			let workflowData: WorkflowDataUpdate;
-			try {
-				workflowData = JSON.parse(reader.result as string);
-			} catch (error) {
-				toast.showMessage({
-					title: locale.baseText('mainSidebar.showMessage.handleFileImport.title'),
-					message: locale.baseText('mainSidebar.showMessage.handleFileImport.message'),
-					type: 'error',
-				});
-				return;
-			} finally {
-				reader.onload = null;
-				inputRef.value = '';
-			}
-
-			nodeViewEventBus.emit('importWorkflowData', { data: workflowData });
-		};
-		reader.readAsText(inputRef.files[0]);
-	}
-}
-
 async function handleArchiveWorkflow() {
 	if (props.active) {
 		const archiveConfirmed = await message.confirm(
@@ -561,133 +372,6 @@ async function handleDeleteWorkflow() {
 	}
 }
 
-async function onWorkflowMenuSelect(action: WORKFLOW_MENU_ACTIONS): Promise<void> {
-	switch (action) {
-		case WORKFLOW_MENU_ACTIONS.DUPLICATE: {
-			uiStore.openModalWithData({
-				name: DUPLICATE_MODAL_KEY,
-				data: {
-					id: props.id,
-					name: props.name,
-					tags: props.tags,
-					parentFolderId: props.currentFolder?.id,
-				},
-			});
-			break;
-		}
-		case WORKFLOW_MENU_ACTIONS.RENAME: {
-			onNameToggle();
-			break;
-		}
-		case WORKFLOW_MENU_ACTIONS.DOWNLOAD: {
-			const workflowData = await workflowHelpers.getWorkflowDataToSave();
-			const { tags, ...data } = workflowData;
-			const exportData: IWorkflowToShare = {
-				...data,
-				meta: {
-					...props.meta,
-					instanceId: rootStore.instanceId,
-				},
-				tags: (tags ?? []).map((tagId) => {
-					const { usageCount, ...tag } = tagsStore.tagsById[tagId];
-
-					return tag;
-				}),
-			};
-
-			const blob = new Blob([JSON.stringify(exportData, null, 2)], {
-				type: 'application/json;charset=utf-8',
-			});
-
-			let name = props.name || 'unsaved_workflow';
-			name = sanitizeFilename(name);
-
-			telemetry.track('User exported workflow', { workflow_id: workflowData.id });
-			saveAs(blob, name + '.json');
-			break;
-		}
-		case WORKFLOW_MENU_ACTIONS.IMPORT_FROM_URL: {
-			uiStore.openModal(IMPORT_WORKFLOW_URL_MODAL_KEY);
-			break;
-		}
-		case WORKFLOW_MENU_ACTIONS.IMPORT_FROM_FILE: {
-			handleImportWorkflowFromFile();
-			break;
-		}
-		case WORKFLOW_MENU_ACTIONS.PUSH: {
-			try {
-				await onSaveButtonClick();
-
-				// Navigate to route with sourceControl param - modal will handle data loading and loading states
-				void router.push({
-					query: {
-						...route.query,
-						sourceControl: 'push',
-					},
-				});
-			} catch (error) {
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				switch (error.message) {
-					case 'source_control_not_connected':
-						toast.showError(
-							{ ...error, message: '' },
-							locale.baseText('settings.sourceControl.error.not.connected.title'),
-							locale.baseText('settings.sourceControl.error.not.connected.message'),
-						);
-						break;
-					default:
-						toast.showError(error, locale.baseText('error'));
-				}
-			}
-
-			break;
-		}
-		case WORKFLOW_MENU_ACTIONS.SETTINGS: {
-			uiStore.openModal(WORKFLOW_SETTINGS_MODAL_KEY);
-			break;
-		}
-		case WORKFLOW_MENU_ACTIONS.ARCHIVE: {
-			await handleArchiveWorkflow();
-			break;
-		}
-		case WORKFLOW_MENU_ACTIONS.UNARCHIVE: {
-			await handleUnarchiveWorkflow();
-			break;
-		}
-		case WORKFLOW_MENU_ACTIONS.DELETE: {
-			await handleDeleteWorkflow();
-			break;
-		}
-		case WORKFLOW_MENU_ACTIONS.CHANGE_OWNER: {
-			const workflowId = getWorkflowId();
-			if (!workflowId) {
-				return;
-			}
-			changeOwnerEventBus.once(
-				'resource-moved',
-				async () => await router.push({ name: VIEWS.WORKFLOWS }),
-			);
-
-			uiStore.openModalWithData({
-				name: PROJECT_MOVE_RESOURCE_MODAL,
-				data: {
-					resource: workflowsStore.workflowsById[workflowId],
-					resourceType: ResourceType.Workflow,
-					resourceTypeLabel: locale.baseText('generic.workflow').toLowerCase(),
-					eventBus: changeOwnerEventBus,
-				},
-			});
-			break;
-		}
-		default:
-			break;
-	}
-}
-
-function goToUpgrade() {
-	void pageRedirectionHelper.goToUpgrade('workflow_sharing', 'upgrade-workflow-sharing');
-}
-
 function getPersonalProjectToastContent() {
 	const title = locale.baseText('workflows.create.personal.toast.title');
 	if (!props.currentFolder) {
@@ -754,7 +438,9 @@ const onBreadcrumbsItemSelected = (item: PathItem) => {
 };
 
 const handleImportWorkflowFromFile = () => {
-	importFileRef.value?.click();
+	if (workflowHeaderActionsRef.value?.importFileRef) {
+		workflowHeaderActionsRef.value.importFileRef.click();
+	}
 };
 
 onMounted(() => {
@@ -774,12 +460,6 @@ onBeforeUnmount(() => {
 	nodeViewEventBus.off('renameWorkflow', onNameToggle);
 	nodeViewEventBus.off('addTag', onTagsEditEnable);
 });
-
-const onWorkflowActiveToggle = async (value: { id: string; active: boolean }) => {
-	if (!value.active) {
-		emit('workflow:deactivated');
-	}
-};
 </script>
 
 <template>
@@ -879,93 +559,40 @@ const onWorkflowActiveToggle = async (value: { id: string; active: boolean }) =>
 
 		<PushConnectionTracker class="actions">
 			<WorkflowProductionChecklist v-if="!isNewWorkflow" :workflow="workflowsStore.workflow" />
-			<span :class="`activator ${$style.group}`">
-				<WorkflowActivator
-					:is-archived="isArchived"
-					:workflow-active="active"
-					:workflow-id="id"
-					:workflow-permissions="workflowPermissions"
-					@update:workflow-active="onWorkflowActiveToggle"
-				/>
-			</span>
-			<EnterpriseEdition :features="[EnterpriseEditionFeature.Sharing]">
-				<div :class="$style.group">
-					<CollaborationPane v-if="!isNewWorkflow" />
-					<N8nButton
-						type="secondary"
-						data-test-id="workflow-share-button"
-						@click="onShareButtonClick"
-					>
-						{{ i18n.baseText('workflowDetails.share') }}
-					</N8nButton>
-				</div>
-				<template #fallback>
-					<N8nTooltip>
-						<N8nButton type="secondary" :class="['mr-2xs', $style.disabledShareButton]">
-							{{ i18n.baseText('workflowDetails.share') }}
-						</N8nButton>
-						<template #content>
-							<I18nT
-								:keypath="
-									uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable.description
-										.tooltip
-								"
-								tag="span"
-								scope="global"
-							>
-								<template #action>
-									<a @click="goToUpgrade">
-										{{
-											i18n.baseText(
-												uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable
-													.button as BaseTextKey,
-											)
-										}}
-									</a>
-								</template>
-							</I18nT>
-						</template>
-					</N8nTooltip>
-				</template>
-			</EnterpriseEdition>
-			<div :class="$style.group">
-				<SaveButton
-					type="primary"
-					:saved="!uiStore.stateIsDirty && !isNewWorkflow"
-					:disabled="
-						isWorkflowSaving ||
-						readOnly ||
-						isArchived ||
-						(!isNewWorkflow && !workflowPermissions.update)
-					"
-					:is-saving="isWorkflowSaving"
-					:with-shortcut="!readOnly && !isArchived && workflowPermissions.update"
-					:shortcut-tooltip="i18n.baseText('saveWorkflowButton.hint')"
-					data-test-id="workflow-save-button"
-					@click="onSaveButtonClick"
-				/>
-				<WorkflowHistoryButton :workflow-id="props.id" :is-new-workflow="isNewWorkflow" />
-			</div>
-			<div :class="[$style.workflowMenuContainer, $style.group]">
-				<input
-					ref="importFileRef"
-					:class="$style.hiddenInput"
-					type="file"
-					data-test-id="workflow-import-input"
-					@change="handleFileImport()"
-				/>
-				<N8nActionDropdown
-					:items="workflowMenuItems"
-					data-test-id="workflow-menu"
-					@select="onWorkflowMenuSelect"
-				/>
-			</div>
+			<WorkflowHeaderDraftPublishActions
+				v-if="IS_DRAFT_PUBLISH_ENABLED"
+				:id="id"
+				ref="workflowHeaderActions"
+				:tags="tags"
+				:name="name"
+				:meta="meta"
+				:read-only="readOnly"
+				:is-archived="isArchived"
+				:is-new-workflow="isNewWorkflow"
+				:workflow-permissions="workflowPermissions"
+				@workflow:saved="onSaveButtonClick"
+			/>
+			<WorkflowHeaderActions
+				v-else
+				:id="id"
+				ref="workflowHeaderActions"
+				:name="name"
+				:tags="tags"
+				:current-folder="currentFolder"
+				:meta="meta"
+				:read-only="readOnly"
+				:is-archived="isArchived"
+				:active="active"
+				:is-new-workflow="isNewWorkflow"
+				:workflow-permissions="workflowPermissions"
+				@workflow:saved="onSaveButtonClick"
+				@workflow:deactivated="emit('workflow:deactivated')"
+			/>
 		</PushConnectionTracker>
 	</div>
 </template>
 
 <style scoped lang="scss">
-$--text-line-height: 24px;
 $--header-spacing: 20px;
 
 .name-container {
@@ -982,18 +609,6 @@ $--header-spacing: 20px;
 	padding: var(--spacing--3xs) var(--spacing--4xs) var(--spacing--4xs);
 }
 
-.activator {
-	color: $custom-font-dark;
-	font-weight: var(--font-weight--regular);
-	font-size: 13px;
-	line-height: $--text-line-height;
-	align-items: center;
-
-	> span {
-		margin-right: 5px;
-	}
-}
-
 .add-tag {
 	font-size: 12px;
 	padding: 20px 0; // to be more clickable
@@ -1072,23 +687,6 @@ $--header-spacing: 20px;
 	padding: var(--spacing--3xs) var(--spacing--4xs) var(--spacing--4xs);
 }
 
-.group {
-	display: flex;
-	gap: var(--spacing--xs);
-}
-
-.hiddenInput {
-	display: none;
-}
-
-.deleteItem {
-	color: var(--color--danger);
-}
-
-.disabledShareButton {
-	cursor: not-allowed;
-}
-
 .closeNodeViewDiscovery {
 	position: absolute;
 	right: var(--spacing--xs);
diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowHeaderActions.vue b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowHeaderActions.vue
new file mode 100644
index 00000000000..2a4fd8dcc86
--- /dev/null
+++ b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowHeaderActions.vue
@@ -0,0 +1,194 @@
+<script lang="ts" setup>
+import { computed, useCssModule, useTemplateRef } from 'vue';
+import { useUIStore } from '@/app/stores/ui.store';
+import { type BaseTextKey, useI18n } from '@n8n/i18n';
+import { N8nButton, N8nTooltip } from '@n8n/design-system';
+import type { IWorkflowDb } from '@/Interface';
+import { EnterpriseEditionFeature, WORKFLOW_SHARE_MODAL_KEY, VIEWS } from '@/app/constants';
+import WorkflowActivator from '@/app/components/WorkflowActivator.vue';
+import EnterpriseEdition from '@/app/components/EnterpriseEdition.ee.vue';
+import CollaborationPane from '@/features/collaboration/collaboration/components/CollaborationPane.vue';
+import WorkflowHistoryButton from '@/features/workflows/workflowHistory/components/WorkflowHistoryButton.vue';
+import SaveButton from '@/app/components/SaveButton.vue';
+import { I18nT } from 'vue-i18n';
+import type { PermissionsRecord } from '@n8n/permissions';
+import { useTelemetry } from '@/app/composables/useTelemetry';
+import { useUsersStore } from '@/features/settings/users/users.store';
+import { useRoute } from 'vue-router';
+import { usePageRedirectionHelper } from '@/app/composables/usePageRedirectionHelper';
+import type { FolderShortInfo } from '@/features/core/folders/folders.types';
+import ActionsMenu from '@/app/components/MainHeader/ActionsDropdownMenu.vue';
+
+const i18n = useI18n();
+const uiStore = useUIStore();
+const telemetry = useTelemetry();
+const usersStore = useUsersStore();
+const route = useRoute();
+const pageRedirectionHelper = usePageRedirectionHelper();
+const $style = useCssModule();
+
+const props = defineProps<{
+	readOnly?: boolean;
+	id: IWorkflowDb['id'];
+	tags: IWorkflowDb['tags'];
+	name: IWorkflowDb['name'];
+	meta: IWorkflowDb['meta'];
+	active: IWorkflowDb['active'];
+	currentFolder?: FolderShortInfo;
+	isArchived: IWorkflowDb['isArchived'];
+	isNewWorkflow: boolean;
+	workflowPermissions: PermissionsRecord['workflow'];
+}>();
+
+const emit = defineEmits<{
+	'workflow:deactivated': [];
+	'workflow:saved': [];
+}>();
+
+const isWorkflowSaving = computed(() => {
+	return uiStore.isActionActive.workflowSaving;
+});
+
+const actionsMenuRef = useTemplateRef<InstanceType<typeof ActionsMenu>>('actionsMenu');
+const importFileRef = computed(() => actionsMenuRef.value?.importFileRef);
+
+const onWorkflowActiveToggle = async (value: { id: string; active: boolean }) => {
+	if (!value.active) {
+		emit('workflow:deactivated');
+	}
+};
+
+function onShareButtonClick() {
+	uiStore.openModalWithData({
+		name: WORKFLOW_SHARE_MODAL_KEY,
+		data: { id: props.id },
+	});
+
+	telemetry.track('User opened sharing modal', {
+		workflow_id: props.id,
+		user_id_sharer: usersStore.currentUser?.id,
+		sub_view: route.name === VIEWS.WORKFLOWS ? 'Workflows listing' : 'Workflow editor',
+	});
+}
+
+function goToUpgrade() {
+	void pageRedirectionHelper.goToUpgrade('workflow_sharing', 'upgrade-workflow-sharing');
+}
+
+defineExpose({
+	importFileRef,
+});
+</script>
+<template>
+	<div :class="$style.container">
+		<span :class="[$style.activator, $style.group]">
+			<WorkflowActivator
+				:is-archived="isArchived"
+				:workflow-active="active"
+				:workflow-id="id"
+				:workflow-permissions="workflowPermissions"
+				@update:workflow-active="onWorkflowActiveToggle"
+			/>
+		</span>
+		<EnterpriseEdition :features="[EnterpriseEditionFeature.Sharing]">
+			<div :class="$style.group">
+				<CollaborationPane v-if="!isNewWorkflow" />
+				<N8nButton
+					type="secondary"
+					data-test-id="workflow-share-button"
+					@click="onShareButtonClick"
+				>
+					{{ i18n.baseText('workflowDetails.share') }}
+				</N8nButton>
+			</div>
+			<template #fallback>
+				<N8nTooltip>
+					<N8nButton type="secondary" :class="['mr-2xs', $style.disabledShareButton]">
+						{{ i18n.baseText('workflowDetails.share') }}
+					</N8nButton>
+					<template #content>
+						<I18nT
+							:keypath="
+								uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable.description
+									.tooltip
+							"
+							tag="span"
+							scope="global"
+						>
+							<template #action>
+								<a @click="goToUpgrade">
+									{{
+										i18n.baseText(
+											uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable
+												.button as BaseTextKey,
+										)
+									}}
+								</a>
+							</template>
+						</I18nT>
+					</template>
+				</N8nTooltip>
+			</template>
+		</EnterpriseEdition>
+		<div :class="$style.group">
+			<SaveButton
+				type="primary"
+				:saved="!uiStore.stateIsDirty && !isNewWorkflow"
+				:disabled="
+					isWorkflowSaving ||
+					readOnly ||
+					isArchived ||
+					(!isNewWorkflow && !workflowPermissions.update)
+				"
+				:is-saving="isWorkflowSaving"
+				:with-shortcut="!readOnly && !isArchived && workflowPermissions.update"
+				:shortcut-tooltip="i18n.baseText('saveWorkflowButton.hint')"
+				data-test-id="workflow-save-button"
+				@click="$emit('workflow:saved')"
+			/>
+			<WorkflowHistoryButton :workflow-id="props.id" :is-new-workflow="isNewWorkflow" />
+			<ActionsMenu
+				:id="id"
+				ref="actionsMenu"
+				:workflow-permissions="workflowPermissions"
+				:is-new-workflow="isNewWorkflow"
+				:read-only="readOnly"
+				:is-archived="isArchived"
+				:name="name"
+				:tags="tags"
+				:current-folder="currentFolder"
+				:meta="meta"
+				@workflow:saved="$emit('workflow:saved')"
+			/>
+		</div>
+	</div>
+</template>
+
+<style module lang="scss">
+$--text-line-height: 24px;
+
+.container {
+	display: contents;
+}
+
+.activator {
+	color: $custom-font-dark;
+	font-weight: var(--font-weight--regular);
+	font-size: 13px;
+	line-height: $--text-line-height;
+	align-items: center;
+
+	> span {
+		margin-right: 5px;
+	}
+}
+
+.group {
+	display: flex;
+	gap: var(--spacing--xs);
+}
+
+.disabledShareButton {
+	cursor: not-allowed;
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowHeaderDraftPublishActions.test.ts b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowHeaderDraftPublishActions.test.ts
new file mode 100644
index 00000000000..a031443c600
--- /dev/null
+++ b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowHeaderDraftPublishActions.test.ts
@@ -0,0 +1,411 @@
+import { createComponentRenderer } from '@/__tests__/render';
+import { type MockedStore, mockedStore } from '@/__tests__/utils';
+import { createTestingPinia } from '@pinia/testing';
+import userEvent from '@testing-library/user-event';
+import { within } from '@testing-library/vue';
+import WorkflowHeaderDraftPublishActions from '@/app/components/MainHeader/WorkflowHeaderDraftPublishActions.vue';
+import { useWorkflowsStore } from '@/app/stores/workflows.store';
+import { useUIStore } from '@/app/stores/ui.store';
+import { WORKFLOW_PUBLISH_MODAL_KEY } from '@/app/constants';
+import { STORES } from '@n8n/stores';
+import type { INodeUi } from '@/Interface';
+
+vi.mock('vue-router', async (importOriginal) => ({
+	...(await importOriginal()),
+	useRoute: vi.fn().mockReturnValue({
+		params: { name: 'test' },
+		query: {},
+	}),
+	useRouter: vi.fn().mockReturnValue({
+		replace: vi.fn(),
+		push: vi.fn().mockResolvedValue(undefined),
+		currentRoute: {
+			value: {
+				params: { name: 'test' },
+				query: {},
+			},
+		},
+	}),
+}));
+
+const mockSaveCurrentWorkflow = vi.fn().mockResolvedValue(true);
+
+vi.mock('@/app/composables/useWorkflowSaving', () => ({
+	useWorkflowSaving: () => ({
+		saveCurrentWorkflow: mockSaveCurrentWorkflow,
+	}),
+}));
+
+const initialState = {
+	[STORES.SETTINGS]: {
+		settings: {
+			enterprise: {},
+		},
+	},
+};
+
+const defaultWorkflowProps = {
+	id: '1',
+	name: 'Test Workflow',
+	tags: [],
+	meta: {},
+	isArchived: false,
+	isNewWorkflow: false,
+	workflowPermissions: {
+		create: true,
+		read: true,
+		update: true,
+		delete: true,
+	},
+};
+
+const renderComponent = createComponentRenderer(WorkflowHeaderDraftPublishActions, {
+	props: defaultWorkflowProps,
+	pinia: createTestingPinia({ initialState }),
+	global: {
+		stubs: {
+			ActionsMenu: {
+				template: '<div data-test-id="actions-menu-stub"></div>',
+			},
+			WorkflowHistoryButton: {
+				template: '<div data-test-id="workflow-history-button-stub"></div>',
+			},
+		},
+	},
+});
+
+const createMockActiveVersion = (versionId: string) => ({
+	versionId,
+	authors: 'Test Author',
+	createdAt: new Date().toISOString(),
+	updatedAt: new Date().toISOString(),
+	workflowPublishHistory: [],
+	name: 'Published Version',
+	description: null,
+});
+
+describe('WorkflowHeaderDraftPublishActions', () => {
+	let workflowsStore: MockedStore<typeof useWorkflowsStore>;
+	let uiStore: MockedStore<typeof useUIStore>;
+
+	beforeEach(() => {
+		workflowsStore = mockedStore(useWorkflowsStore);
+		uiStore = mockedStore(useUIStore);
+
+		// Default workflow state
+		workflowsStore.workflow = {
+			id: '1',
+			name: 'Test Workflow',
+			active: false,
+			activeVersionId: null,
+			activeVersion: null,
+			versionId: 'version-1',
+			isArchived: false,
+			createdAt: Date.now(),
+			updatedAt: Date.now(),
+			nodes: [],
+			connections: {},
+		};
+		workflowsStore.workflowTriggerNodes = [];
+		uiStore.stateIsDirty = false;
+		uiStore.isActionActive = { workflowSaving: false };
+
+		mockSaveCurrentWorkflow.mockClear();
+		mockSaveCurrentWorkflow.mockResolvedValue(true);
+	});
+
+	afterEach(() => {
+		vi.clearAllMocks();
+	});
+
+	describe('Active version indicator', () => {
+		it('should not show active version indicator when there is no active version', () => {
+			workflowsStore.workflow.activeVersion = null;
+
+			const { queryByTestId } = renderComponent();
+
+			expect(queryByTestId('workflow-active-version-indicator')).not.toBeInTheDocument();
+		});
+
+		it('should show active version indicator when there is an active version', () => {
+			workflowsStore.workflow.activeVersion = createMockActiveVersion('active-version-1');
+
+			const { getByTestId } = renderComponent();
+
+			expect(getByTestId('workflow-active-version-indicator')).toBeInTheDocument();
+		});
+	});
+
+	describe('Publish button behavior', () => {
+		it('should open publish modal when clicked and workflow is saved', async () => {
+			const openModalSpy = vi.spyOn(uiStore, 'openModalWithData');
+			uiStore.stateIsDirty = false;
+
+			const { getByTestId } = renderComponent();
+
+			await userEvent.click(getByTestId('workflow-open-publish-modal-button'));
+
+			expect(mockSaveCurrentWorkflow).not.toHaveBeenCalled();
+			expect(openModalSpy).toHaveBeenCalledWith({
+				name: WORKFLOW_PUBLISH_MODAL_KEY,
+				data: {},
+			});
+		});
+
+		it('should save workflow first when dirty then open publish modal', async () => {
+			const openModalSpy = vi.spyOn(uiStore, 'openModalWithData');
+			uiStore.stateIsDirty = true;
+
+			const { getByTestId } = renderComponent();
+
+			await userEvent.click(getByTestId('workflow-open-publish-modal-button'));
+
+			expect(mockSaveCurrentWorkflow).toHaveBeenCalledWith({}, true);
+			expect(openModalSpy).toHaveBeenCalledWith({
+				name: WORKFLOW_PUBLISH_MODAL_KEY,
+				data: {},
+			});
+		});
+
+		it('should save workflow first when isNewWorkflow is true then open publish modal', async () => {
+			const openModalSpy = vi.spyOn(uiStore, 'openModalWithData');
+			uiStore.stateIsDirty = false;
+
+			const { getByTestId } = renderComponent({
+				props: {
+					...defaultWorkflowProps,
+					isNewWorkflow: true,
+				},
+			});
+
+			await userEvent.click(getByTestId('workflow-open-publish-modal-button'));
+
+			expect(mockSaveCurrentWorkflow).toHaveBeenCalledWith({}, true);
+			expect(openModalSpy).toHaveBeenCalledWith({
+				name: WORKFLOW_PUBLISH_MODAL_KEY,
+				data: {},
+			});
+		});
+
+		it('should not open publish modal if save fails', async () => {
+			const openModalSpy = vi.spyOn(uiStore, 'openModalWithData');
+			uiStore.stateIsDirty = true;
+			mockSaveCurrentWorkflow.mockResolvedValue(false);
+
+			const { getByTestId } = renderComponent();
+
+			await userEvent.click(getByTestId('workflow-open-publish-modal-button'));
+
+			expect(mockSaveCurrentWorkflow).toHaveBeenCalled();
+			expect(openModalSpy).not.toHaveBeenCalled();
+		});
+	});
+
+	describe('Publish indicator visibility', () => {
+		const triggerNode: INodeUi = {
+			id: 'trigger-1',
+			name: 'Webhook Trigger',
+			type: 'n8n-nodes-base.webhook',
+			typeVersion: 1,
+			position: [0, 0],
+			parameters: {},
+			disabled: false,
+		};
+
+		it('should not show publish indicator when there are no trigger nodes', () => {
+			workflowsStore.workflowTriggerNodes = [];
+			workflowsStore.workflow.versionId = 'version-1';
+			workflowsStore.workflow.activeVersion = createMockActiveVersion('version-2');
+			uiStore.stateIsDirty = true;
+
+			const { queryByTestId } = renderComponent();
+
+			expect(queryByTestId('workflow-publish-indicator')).not.toBeInTheDocument();
+		});
+
+		it('should not show publish indicator when trigger node is disabled', () => {
+			workflowsStore.workflowTriggerNodes = [{ ...triggerNode, disabled: true }];
+			workflowsStore.workflow.versionId = 'version-1';
+			workflowsStore.workflow.activeVersion = createMockActiveVersion('version-2');
+			uiStore.stateIsDirty = true;
+
+			const { queryByTestId } = renderComponent();
+
+			expect(queryByTestId('workflow-publish-indicator')).not.toBeInTheDocument();
+		});
+
+		it('should show publish indicator when there are unpublished changes (versionId mismatch)', () => {
+			workflowsStore.workflowTriggerNodes = [triggerNode];
+			workflowsStore.workflow.versionId = 'version-1';
+			workflowsStore.workflow.activeVersion = createMockActiveVersion('version-2');
+			uiStore.stateIsDirty = false;
+
+			const { getByTestId } = renderComponent();
+
+			expect(getByTestId('workflow-publish-indicator')).toBeInTheDocument();
+		});
+
+		it('should show publish indicator when state is dirty', () => {
+			workflowsStore.workflowTriggerNodes = [triggerNode];
+			workflowsStore.workflow.versionId = 'version-1';
+			workflowsStore.workflow.activeVersion = createMockActiveVersion('version-1');
+			uiStore.stateIsDirty = true;
+
+			const { getByTestId } = renderComponent();
+
+			expect(getByTestId('workflow-publish-indicator')).toBeInTheDocument();
+		});
+
+		it('should not show publish indicator when versions match and state is not dirty', () => {
+			workflowsStore.workflowTriggerNodes = [triggerNode];
+			workflowsStore.workflow.versionId = 'version-1';
+			workflowsStore.workflow.activeVersion = createMockActiveVersion('version-1');
+			uiStore.stateIsDirty = false;
+
+			const { queryByTestId } = renderComponent();
+
+			expect(queryByTestId('workflow-publish-indicator')).not.toBeInTheDocument();
+		});
+
+		it('should show publish indicator when workflow has never been published (no active version)', () => {
+			workflowsStore.workflowTriggerNodes = [triggerNode];
+			workflowsStore.workflow.versionId = 'version-1';
+			workflowsStore.workflow.activeVersion = null;
+			uiStore.stateIsDirty = false;
+
+			const { getByTestId } = renderComponent();
+
+			expect(getByTestId('workflow-publish-indicator')).toBeInTheDocument();
+		});
+	});
+
+	describe('Save button state', () => {
+		it('should show "Saved" label when workflow is saved', () => {
+			uiStore.stateIsDirty = false;
+
+			const { getByText } = renderComponent();
+
+			expect(getByText('Saved')).toBeInTheDocument();
+		});
+
+		it('should show save button when workflow has unsaved changes', () => {
+			uiStore.stateIsDirty = true;
+
+			const { queryByText, getByTestId } = renderComponent();
+
+			expect(queryByText('Saved')).not.toBeInTheDocument();
+			expect(getByTestId('workflow-save-button')).toBeInTheDocument();
+		});
+
+		it('should emit workflow:saved event when save button is clicked', async () => {
+			uiStore.stateIsDirty = true;
+
+			const { getByTestId, emitted } = renderComponent();
+
+			await userEvent.click(getByTestId('workflow-save-button'));
+
+			expect(emitted('workflow:saved')).toBeTruthy();
+		});
+
+		it('should contain disabled save button when update permission is missing', () => {
+			uiStore.stateIsDirty = true;
+
+			const { getByTestId } = renderComponent({
+				props: {
+					...defaultWorkflowProps,
+					workflowPermissions: { ...defaultWorkflowProps.workflowPermissions, update: false },
+				},
+			});
+
+			const saveButtonContainer = getByTestId('workflow-save-button');
+			const saveButton = within(saveButtonContainer).getByRole('button');
+			expect(saveButton).toBeDisabled();
+		});
+
+		it('should contain disabled save button when workflow is saving', () => {
+			uiStore.stateIsDirty = true;
+			uiStore.isActionActive.workflowSaving = true;
+
+			const { getByTestId } = renderComponent();
+
+			const saveButtonContainer = getByTestId('workflow-save-button');
+			const saveButton = within(saveButtonContainer).getByRole('button');
+			expect(saveButton).toBeDisabled();
+		});
+	});
+
+	describe('Read-only mode', () => {
+		it('should render save button when not read-only and has update permission', () => {
+			uiStore.stateIsDirty = true;
+			const { getByTestId } = renderComponent({
+				props: {
+					...defaultWorkflowProps,
+					readOnly: false,
+					workflowPermissions: { update: true },
+				},
+			});
+
+			const saveButtonContainer = getByTestId('workflow-save-button');
+			const saveButton = within(saveButtonContainer).getByRole('button');
+			expect(saveButtonContainer).toBeInTheDocument();
+			expect(saveButton).not.toBeDisabled();
+		});
+
+		it('should render disabled save button when read-only', () => {
+			uiStore.stateIsDirty = true;
+
+			const { getByTestId } = renderComponent({
+				props: {
+					...defaultWorkflowProps,
+					readOnly: true,
+				},
+			});
+
+			const saveButtonContainer = getByTestId('workflow-save-button');
+			const saveButton = within(saveButtonContainer).getByRole('button');
+			expect(saveButtonContainer).toBeInTheDocument();
+			expect(saveButton).toBeDisabled();
+		});
+
+		it('should render publish button when read-only', () => {
+			const { getByTestId } = renderComponent({
+				props: {
+					...defaultWorkflowProps,
+					readOnly: true,
+				},
+			});
+
+			const publishButton = getByTestId('workflow-open-publish-modal-button');
+			expect(publishButton).toBeInTheDocument();
+		});
+	});
+
+	describe('Archived workflow', () => {
+		it('should not render publish button when workflow is archived', () => {
+			const { queryByTestId } = renderComponent({
+				props: {
+					...defaultWorkflowProps,
+					isArchived: true,
+				},
+			});
+
+			expect(queryByTestId('workflow-open-publish-modal-button')).not.toBeInTheDocument();
+		});
+
+		it('should render disabled save button when workflow is archived', () => {
+			uiStore.stateIsDirty = true;
+
+			const { getByTestId } = renderComponent({
+				props: {
+					...defaultWorkflowProps,
+					isArchived: true,
+				},
+			});
+
+			const saveButtonContainer = getByTestId('workflow-save-button');
+			const saveButton = within(saveButtonContainer).getByRole('button');
+			expect(saveButtonContainer).toBeInTheDocument();
+			expect(saveButton).toBeDisabled();
+		});
+	});
+});
diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowHeaderDraftPublishActions.vue b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowHeaderDraftPublishActions.vue
new file mode 100644
index 00000000000..30c81620199
--- /dev/null
+++ b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowHeaderDraftPublishActions.vue
@@ -0,0 +1,186 @@
+<script lang="ts" setup>
+import ActionsDropdownMenu from '@/app/components/MainHeader/ActionsDropdownMenu.vue';
+import WorkflowHistoryButton from '@/features/workflows/workflowHistory/components/WorkflowHistoryButton.vue';
+import type { FolderShortInfo } from '@/features/core/folders/folders.types';
+import type { IWorkflowDb } from '@/Interface';
+import type { PermissionsRecord } from '@n8n/permissions';
+import { computed, useTemplateRef } from 'vue';
+import { WORKFLOW_PUBLISH_MODAL_KEY } from '@/app/constants';
+import { N8nButton, N8nIcon, N8nTooltip } from '@n8n/design-system';
+import { useI18n } from '@n8n/i18n';
+import { useUIStore } from '@/app/stores/ui.store';
+import { useWorkflowsStore } from '@/app/stores/workflows.store';
+import SaveButton from '@/app/components/SaveButton.vue';
+import TimeAgo from '@/app/components/TimeAgo.vue';
+import { getActivatableTriggerNodes } from '@/app/utils/nodeTypesUtils';
+import { useWorkflowSaving } from '@/app/composables/useWorkflowSaving';
+import { useRouter } from 'vue-router';
+
+const props = defineProps<{
+	readOnly?: boolean;
+	id: IWorkflowDb['id'];
+	tags: IWorkflowDb['tags'];
+	name: IWorkflowDb['name'];
+	meta: IWorkflowDb['meta'];
+	currentFolder?: FolderShortInfo;
+	isArchived: IWorkflowDb['isArchived'];
+	isNewWorkflow: boolean;
+	workflowPermissions: PermissionsRecord['workflow'];
+}>();
+
+defineEmits<{
+	'workflow:saved': [];
+}>();
+
+const actionsMenuRef = useTemplateRef<InstanceType<typeof ActionsDropdownMenu>>('actionsMenu');
+const locale = useI18n();
+const uiStore = useUIStore();
+const workflowsStore = useWorkflowsStore();
+const i18n = useI18n();
+const router = useRouter();
+const { saveCurrentWorkflow } = useWorkflowSaving({ router });
+
+const isWorkflowSaving = computed(() => {
+	return uiStore.isActionActive.workflowSaving;
+});
+
+const importFileRef = computed(() => actionsMenuRef.value?.importFileRef);
+
+const onPublishButtonClick = async () => {
+	// If there are unsaved changes, save the workflow first
+	if (uiStore.stateIsDirty || props.isNewWorkflow) {
+		const saved = await saveCurrentWorkflow({}, true);
+		if (!saved) {
+			// If save failed, don't open the modal
+			return;
+		}
+	}
+
+	uiStore.openModalWithData({
+		name: WORKFLOW_PUBLISH_MODAL_KEY,
+		data: {},
+	});
+};
+
+const foundTriggers = computed(() =>
+	getActivatableTriggerNodes(workflowsStore.workflowTriggerNodes),
+);
+
+const containsTrigger = computed((): boolean => {
+	return foundTriggers.value.length > 0;
+});
+
+const isWorkflowSaved = computed(() => {
+	return !uiStore.stateIsDirty && !props.isNewWorkflow;
+});
+
+const showPublishIndicator = computed(() => {
+	if (!containsTrigger.value) {
+		return false;
+	}
+
+	return (
+		(workflowsStore.workflow.versionId &&
+			workflowsStore.workflow.versionId !== workflowsStore.workflow.activeVersion?.versionId) ||
+		uiStore.stateIsDirty
+	);
+});
+
+const activeVersion = computed(() => workflowsStore.workflow.activeVersion);
+
+defineExpose({
+	importFileRef,
+});
+</script>
+
+<template>
+	<div :class="$style.container">
+		<div
+			v-if="activeVersion"
+			:class="$style.activeVersionIndicator"
+			data-test-id="workflow-active-version-indicator"
+		>
+			<N8nTooltip>
+				<template #content>
+					{{ activeVersion.name }}<br />{{ i18n.baseText('workflowHistory.item.active') }}
+					<TimeAgo :date="activeVersion.createdAt" />
+				</template>
+				<N8nIcon icon="circle-check" color="success" size="xlarge" :class="$style.icon" />
+			</N8nTooltip>
+		</div>
+		<div v-if="!isArchived && workflowPermissions.update" :class="$style.publishButtonWrapper">
+			<N8nButton
+				type="secondary"
+				data-test-id="workflow-open-publish-modal-button"
+				@click="onPublishButtonClick"
+			>
+				{{ locale.baseText('workflows.publish') }}
+			</N8nButton>
+			<span
+				v-if="showPublishIndicator"
+				:class="$style.publishButtonIndicator"
+				data-test-id="workflow-publish-indicator"
+			></span>
+		</div>
+		<SaveButton
+			type="primary"
+			:saved="isWorkflowSaved"
+			:disabled="
+				isWorkflowSaving ||
+				readOnly ||
+				isArchived ||
+				(!isNewWorkflow && !workflowPermissions.update)
+			"
+			:is-saving="isWorkflowSaving"
+			:with-shortcut="!readOnly && !isArchived && workflowPermissions.update"
+			:shortcut-tooltip="i18n.baseText('saveWorkflowButton.hint')"
+			data-test-id="workflow-save-button"
+			@click="$emit('workflow:saved')"
+		/>
+		<WorkflowHistoryButton :workflow-id="props.id" :is-new-workflow="isNewWorkflow" />
+		<ActionsDropdownMenu
+			:id="id"
+			ref="actionsMenu"
+			:workflow-permissions="workflowPermissions"
+			:is-new-workflow="isNewWorkflow"
+			:read-only="readOnly"
+			:is-archived="isArchived"
+			:name="name"
+			:tags="tags"
+			:current-folder="currentFolder"
+			:meta="meta"
+			@workflow:saved="$emit('workflow:saved')"
+		/>
+	</div>
+</template>
+
+<style lang="scss" module>
+.container {
+	display: contents;
+}
+
+.activeVersionIndicator {
+	display: inline-flex;
+	align-items: center;
+
+	.icon:focus {
+		outline: none;
+	}
+}
+
+.publishButtonWrapper {
+	position: relative;
+	display: inline-block;
+}
+
+.publishButtonIndicator {
+	position: absolute;
+	top: -2px;
+	right: -2px;
+	width: 7px;
+	height: 7px;
+	background-color: var(--color--primary);
+	border-radius: 50%;
+	box-shadow: 0 0 0 2px var(--color--background--light-3);
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowPublishModal.vue b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowPublishModal.vue
new file mode 100644
index 00000000000..0e9f9d8eca7
--- /dev/null
+++ b/packages/frontend/editor-ui/src/app/components/MainHeader/WorkflowPublishModal.vue
@@ -0,0 +1,289 @@
+<script setup lang="ts">
+import { computed, ref, h, onMounted, onBeforeUnmount, useTemplateRef } from 'vue';
+import type { VNode } from 'vue';
+import Modal from '@/app/components/Modal.vue';
+import {
+	WORKFLOW_PUBLISH_MODAL_KEY,
+	WORKFLOW_ACTIVATION_CONFLICTING_WEBHOOK_MODAL_KEY,
+} from '@/app/constants';
+import { telemetry } from '@/app/plugins/telemetry';
+import { useWorkflowsStore } from '@/app/stores/workflows.store';
+import { createEventBus } from '@n8n/utils/event-bus';
+import { useI18n } from '@n8n/i18n';
+import { N8nHeading, N8nCallout, N8nButton } from '@n8n/design-system';
+import WorkflowPublishForm from '@/app/components/WorkflowPublishForm.vue';
+import { getActivatableTriggerNodes } from '@/app/utils/nodeTypesUtils';
+import { useToast } from '@/app/composables/useToast';
+import { useWorkflowActivate } from '@/app/composables/useWorkflowActivate';
+import { useWorkflowHelpers } from '@/app/composables/useWorkflowHelpers';
+import { useCredentialsStore } from '@/features/credentials/credentials.store';
+import { useUIStore } from '@/app/stores/ui.store';
+import { OPEN_AI_API_CREDENTIAL_TYPE } from 'n8n-workflow';
+import type { INodeUi } from '@/Interface';
+import type { IUsedCredential } from '@/features/credentials/credentials.types';
+import WorkflowActivationErrorMessage from '@/app/components/WorkflowActivationErrorMessage.vue';
+import { generateVersionName } from '@/features/workflows/workflowHistory/utils';
+
+const modalBus = createEventBus();
+const i18n = useI18n();
+
+const workflowsStore = useWorkflowsStore();
+const credentialsStore = useCredentialsStore();
+const uiStore = useUIStore();
+const { showMessage } = useToast();
+const workflowActivate = useWorkflowActivate();
+const workflowHelpers = useWorkflowHelpers();
+
+const publishForm = useTemplateRef<InstanceType<typeof WorkflowPublishForm>>('publishForm');
+
+const description = ref('');
+const versionName = ref('');
+
+const foundTriggers = computed(() =>
+	getActivatableTriggerNodes(workflowsStore.workflowTriggerNodes),
+);
+
+const containsTrigger = computed((): boolean => {
+	return foundTriggers.value.length > 0;
+});
+
+const wfHasAnyChanges = computed(() => {
+	return workflowsStore.workflow.versionId !== workflowsStore.workflow.activeVersion?.versionId;
+});
+
+const hasNodeIssues = computed(() => workflowsStore.nodesIssuesExist);
+
+const inputsDisabled = computed(() => {
+	return !wfHasAnyChanges.value || !containsTrigger.value || hasNodeIssues.value;
+});
+
+const isPublishDisabled = computed(() => {
+	return inputsDisabled.value || versionName.value.trim().length === 0;
+});
+
+type WorkflowPublishCalloutId = 'noTrigger' | 'nodeIssues' | 'noChanges';
+
+const activeCalloutId = computed<WorkflowPublishCalloutId | null>(() => {
+	if (!containsTrigger.value) {
+		return 'noTrigger';
+	}
+
+	if (hasNodeIssues.value) {
+		return 'nodeIssues';
+	}
+
+	if (!wfHasAnyChanges.value) {
+		return 'noChanges';
+	}
+
+	return null;
+});
+
+function onModalOpened() {
+	publishForm.value?.focusInput();
+}
+
+onMounted(() => {
+	if (!versionName.value && !inputsDisabled.value) {
+		versionName.value = generateVersionName(workflowsStore.workflow.versionId);
+	}
+	modalBus.on('opened', onModalOpened);
+});
+
+onBeforeUnmount(() => {
+	modalBus.off('opened', onModalOpened);
+});
+
+function findManagedOpenAiCredentialId(
+	usedCredentials: Record<string, IUsedCredential>,
+): string | undefined {
+	return Object.keys(usedCredentials).find((credentialId) => {
+		const credential = credentialsStore.state.credentials[credentialId];
+		return credential.isManaged && credential.type === OPEN_AI_API_CREDENTIAL_TYPE;
+	});
+}
+
+function hasActiveNodeUsingCredential(nodes: INodeUi[], credentialId: string): boolean {
+	return nodes.some(
+		(node) =>
+			node?.credentials?.[OPEN_AI_API_CREDENTIAL_TYPE]?.id === credentialId && !node.disabled,
+	);
+}
+
+/**
+ * Determines if the warning for free AI credits should be shown in the workflow.
+ *
+ * This computed property evaluates whether to display a warning about free AI credits
+ * in the workflow. The warning is shown when both conditions are met:
+ * 1. The workflow uses managed OpenAI API credentials
+ * 2. Those credentials are associated with at least one enabled node
+ *
+ */
+const shouldShowFreeAiCreditsWarning = computed((): boolean => {
+	const usedCredentials = workflowsStore?.usedCredentials;
+	if (!usedCredentials) return false;
+
+	const managedOpenAiCredentialId = findManagedOpenAiCredentialId(usedCredentials);
+	if (!managedOpenAiCredentialId) return false;
+
+	return hasActiveNodeUsingCredential(workflowsStore.allNodes, managedOpenAiCredentialId);
+});
+
+async function displayActivationError() {
+	let errorMessage: string | VNode;
+	try {
+		const errorData = await workflowsStore.getActivationError(workflowsStore.workflow.id);
+
+		if (errorData === undefined) {
+			errorMessage = i18n.baseText(
+				'workflowActivator.showMessage.displayActivationError.message.errorDataUndefined',
+			);
+		} else {
+			errorMessage = h(WorkflowActivationErrorMessage, {
+				message: errorData,
+			});
+		}
+	} catch {
+		errorMessage = i18n.baseText(
+			'workflowActivator.showMessage.displayActivationError.message.catchBlock',
+		);
+	}
+
+	showMessage({
+		title: i18n.baseText('workflowActivator.showMessage.displayActivationError.title'),
+		message: errorMessage,
+		type: 'warning',
+		duration: 0,
+	});
+}
+
+async function handlePublish() {
+	if (isPublishDisabled.value) {
+		return;
+	}
+
+	// Check for conflicting webhooks before activating
+	const conflictData = await workflowHelpers.checkConflictingWebhooks(workflowsStore.workflow.id);
+
+	if (conflictData) {
+		const { trigger, conflict } = conflictData;
+		const conflictingWorkflow = await workflowsStore.fetchWorkflow(conflict.workflowId);
+
+		uiStore.openModalWithData({
+			name: WORKFLOW_ACTIVATION_CONFLICTING_WEBHOOK_MODAL_KEY,
+			data: {
+				triggerType: trigger.type,
+				workflowName: conflictingWorkflow.name,
+				...conflict,
+			},
+		});
+
+		return;
+	}
+
+	// Activate the workflow
+	const success = await workflowActivate.publishWorkflow(
+		workflowsStore.workflow.id,
+		workflowsStore.workflow.versionId,
+		{
+			name: versionName.value,
+			description: description.value,
+		},
+	);
+
+	if (success) {
+		// Show AI credits warning if applicable
+		if (shouldShowFreeAiCreditsWarning.value) {
+			showMessage({
+				title: i18n.baseText('freeAi.credits.showWarning.workflow.activation.title'),
+				message: i18n.baseText('freeAi.credits.showWarning.workflow.activation.description'),
+				type: 'warning',
+				duration: 0,
+			});
+		}
+
+		telemetry.track('User published version from canvas', {
+			workflow_id: workflowsStore.workflow.id,
+		});
+
+		// For now, just close the modal after successful activation
+		modalBus.emit('close');
+	} else {
+		// Display activation error if it fails
+		await displayActivationError();
+	}
+}
+</script>
+
+<template>
+	<Modal
+		max-width="500px"
+		max-height="85vh"
+		:name="WORKFLOW_PUBLISH_MODAL_KEY"
+		:center="true"
+		:show-close="true"
+		:event-bus="modalBus"
+	>
+		<template #header>
+			<N8nHeading size="xlarge">{{ i18n.baseText('workflows.publishModal.title') }}</N8nHeading>
+		</template>
+		<template #content>
+			<div :class="$style.content">
+				<N8nCallout v-if="activeCalloutId === 'noTrigger'" theme="danger" icon="status-error">
+					{{ i18n.baseText('workflows.publishModal.noTriggerMessage') }}
+				</N8nCallout>
+				<N8nCallout v-else-if="activeCalloutId === 'nodeIssues'" theme="danger" icon="status-error">
+					<strong>
+						{{
+							i18n.baseText('workflowActivator.showMessage.activeChangedNodesIssuesExistTrue.title')
+						}}
+					</strong>
+					<br />
+					{{
+						i18n.baseText('workflowActivator.showMessage.activeChangedNodesIssuesExistTrue.message')
+					}}
+				</N8nCallout>
+				<N8nCallout v-else-if="activeCalloutId === 'noChanges'" theme="warning">
+					{{ i18n.baseText('workflows.publishModal.noChanges') }}
+				</N8nCallout>
+				<WorkflowPublishForm
+					ref="publishForm"
+					v-model:version-name="versionName"
+					v-model:description="description"
+					:disabled="inputsDisabled"
+					version-name-test-id="workflow-publish-version-name-input"
+					description-test-id="workflow-publish-description-input"
+					@submit="handlePublish"
+				/>
+				<div :class="$style.actions">
+					<N8nButton
+						type="secondary"
+						:label="i18n.baseText('generic.cancel')"
+						data-test-id="workflow-publish-cancel-button"
+						@click="modalBus.emit('close')"
+					/>
+					<N8nButton
+						:disabled="isPublishDisabled"
+						:label="i18n.baseText('workflows.publish')"
+						data-test-id="workflow-publish-button"
+						@click="handlePublish"
+					/>
+				</div>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style lang="scss" module>
+.content {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing--lg);
+}
+
+.actions {
+	display: flex;
+	justify-content: flex-end;
+	gap: var(--spacing--xs);
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/app/components/MainHeader/utils.ts b/packages/frontend/editor-ui/src/app/components/MainHeader/utils.ts
new file mode 100644
index 00000000000..50fc937222c
--- /dev/null
+++ b/packages/frontend/editor-ui/src/app/components/MainHeader/utils.ts
@@ -0,0 +1,11 @@
+import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from '@/app/constants/workflows';
+export const getWorkflowId = (propId: string, routeName: string | string[]) => {
+	let id: string | undefined = undefined;
+	if (propId !== PLACEHOLDER_EMPTY_WORKFLOW_ID) {
+		id = propId;
+	} else if (routeName && routeName !== 'new') {
+		id = routeName as string;
+	}
+
+	return id;
+};
diff --git a/packages/frontend/editor-ui/src/app/components/Modals.vue b/packages/frontend/editor-ui/src/app/components/Modals.vue
index 37a5395a6a6..36b630c0b60 100644
--- a/packages/frontend/editor-ui/src/app/components/Modals.vue
+++ b/packages/frontend/editor-ui/src/app/components/Modals.vue
@@ -23,12 +23,15 @@ import {
 	WORKFLOW_DIFF_MODAL_KEY,
 	WORKFLOW_EXTRACTION_NAME_MODAL_KEY,
 	WORKFLOW_HISTORY_VERSION_RESTORE,
+	WORKFLOW_HISTORY_VERSION_UNPUBLISH,
 	WORKFLOW_SETTINGS_MODAL_KEY,
 	WORKFLOW_SHARE_MODAL_KEY,
 	EXPERIMENT_TEMPLATE_RECO_V2_KEY,
 	EXPERIMENT_TEMPLATE_RECO_V3_KEY,
 	EXPERIMENT_TEMPLATES_DATA_QUALITY_KEY,
 	CONFIRM_PASSWORD_MODAL_KEY,
+	WORKFLOW_PUBLISH_MODAL_KEY,
+	WORKFLOW_HISTORY_PUBLISH_MODAL_KEY,
 } from '@/app/constants';
 import {
 	ANNOTATION_TAGS_MANAGER_MODAL_KEY,
@@ -100,6 +103,7 @@ import WhatsNewModal from '@/app/components/WhatsNewModal.vue';
 import WorkflowActivationConflictingWebhookModal from '@/app/components/WorkflowActivationConflictingWebhookModal.vue';
 import WorkflowExtractionNameModal from '@/app/components/WorkflowExtractionNameModal.vue';
 import WorkflowHistoryVersionRestoreModal from '@/features/workflows/workflowHistory/components/WorkflowHistoryVersionRestoreModal.vue';
+import WorkflowHistoryVersionUnpublishModal from '@/features/workflows/workflowHistory/components/WorkflowHistoryVersionUnpublishModal.vue';
 import WorkflowSettings from '@/app/components/WorkflowSettings.vue';
 import WorkflowShareModal from '@/app/components/WorkflowShareModal.ee.vue';
 import WorkflowDiffModal from '@/features/workflows/workflowDiff/WorkflowDiffModal.vue';
@@ -110,6 +114,8 @@ import NodeRecommendationModalV2 from '@/experiments/templateRecoV2/components/N
 import NodeRecommendationModalV3 from '@/experiments/personalizedTemplatesV3/components/NodeRecommendationModal.vue';
 import NodeRecommendationModalTDQ from '@/experiments/templatesDataQuality/components/NodeRecommendationModal.vue';
 import VariableModal from '@/features/settings/environments.ee/components/VariableModal.vue';
+import WorkflowPublishModal from '@/app/components/MainHeader/WorkflowPublishModal.vue';
+import WorkflowHistoryPublishModal from '@/features/workflows/workflowHistory/components/WorkflowHistoryPublishModal.vue';
 </script>
 
 <template>
@@ -307,6 +313,16 @@ import VariableModal from '@/features/settings/environments.ee/components/Variab
 			</template>
 		</ModalRoot>
 
+		<ModalRoot :name="WORKFLOW_HISTORY_VERSION_UNPUBLISH">
+			<template #default="{ modalName, data }">
+				<WorkflowHistoryVersionUnpublishModal
+					data-test-id="workflow-history-version-unpublish-modal"
+					:modal-name="modalName"
+					:data="data"
+				/>
+			</template>
+		</ModalRoot>
+
 		<ModalRoot :name="SETUP_CREDENTIALS_MODAL_KEY">
 			<template #default="{ modalName, data }">
 				<SetupWorkflowCredentialsModal
@@ -403,6 +419,17 @@ import VariableModal from '@/features/settings/environments.ee/components/Variab
 			</template>
 		</ModalRoot>
 
+		<ModalRoot :name="WORKFLOW_PUBLISH_MODAL_KEY">
+			<template #default="{ modalName, data }">
+				<WorkflowPublishModal :modal-name="modalName" :data="data" />
+			</template>
+		</ModalRoot>
+
+		<ModalRoot :name="WORKFLOW_HISTORY_PUBLISH_MODAL_KEY">
+			<template #default="{ modalName, data }">
+				<WorkflowHistoryPublishModal :modal-name="modalName" :data="data" />
+			</template>
+		</ModalRoot>
 		<!-- Dynamic modals from modules -->
 		<DynamicModalLoader />
 	</div>
diff --git a/packages/frontend/editor-ui/src/app/components/WorkflowCard.test.ts b/packages/frontend/editor-ui/src/app/components/WorkflowCard.test.ts
index 7c4ae220c5e..88ad6842157 100644
--- a/packages/frontend/editor-ui/src/app/components/WorkflowCard.test.ts
+++ b/packages/frontend/editor-ui/src/app/components/WorkflowCard.test.ts
@@ -634,7 +634,6 @@ describe('WorkflowCard', () => {
 		const { queryByTestId } = renderComponent({ props: { data } });
 
 		expect(queryByTestId('workflow-card-archived')).not.toBeInTheDocument();
-		expect(queryByTestId('workflow-card-activator')).toBeInTheDocument();
 	});
 
 	it("should show 'Duplicate' action when user has read permission and can create workflows", async () => {
diff --git a/packages/frontend/editor-ui/src/app/components/WorkflowCard.vue b/packages/frontend/editor-ui/src/app/components/WorkflowCard.vue
index 177c440e34d..0ca0e023343 100644
--- a/packages/frontend/editor-ui/src/app/components/WorkflowCard.vue
+++ b/packages/frontend/editor-ui/src/app/components/WorkflowCard.vue
@@ -5,6 +5,7 @@ import {
 	MODAL_CONFIRM,
 	VIEWS,
 	WORKFLOW_SHARE_MODAL_KEY,
+	IS_DRAFT_PUBLISH_ENABLED,
 } from '@/app/constants';
 import { PROJECT_MOVE_RESOURCE_MODAL } from '@/features/collaboration/projects/projects.constants';
 import { useMessage } from '@/app/composables/useMessage';
@@ -108,7 +109,6 @@ const workflowsStore = useWorkflowsStore();
 const projectsStore = useProjectsStore();
 const foldersStore = useFoldersStore();
 const mcpStore = useMCPStore();
-
 const hiddenBreadcrumbsItemsAsync = ref<Promise<PathItem[]>>(new Promise(() => {}));
 const cachedHiddenBreadcrumbsItems = ref<PathItem[]>([]);
 
@@ -271,6 +271,12 @@ const isSomeoneElsesWorkflow = computed(
 		props.data.homeProject?.id !== projectsStore.personalProject?.id,
 );
 
+const isDraftPublishEnabled = IS_DRAFT_PUBLISH_ENABLED;
+
+const isWorkflowPublished = computed(() => {
+	return props.data.activeVersionId !== null;
+});
+
 async function onClick(event?: KeyboardEvent | PointerEvent) {
 	if (event?.ctrlKey || event?.metaKey) {
 		const route = router.resolve({
@@ -628,7 +634,7 @@ const tags = computed(
 					{{ locale.baseText('workflows.item.archived') }}
 				</N8nText>
 				<WorkflowActivator
-					v-else
+					v-else-if="!isDraftPublishEnabled"
 					class="mr-s"
 					:is-archived="data.isArchived"
 					:workflow-active="data.active"
@@ -637,6 +643,21 @@ const tags = computed(
 					data-test-id="workflow-card-activator"
 					@update:workflow-active="onWorkflowActiveToggle"
 				/>
+				<div
+					v-if="isDraftPublishEnabled && !data.isArchived"
+					:class="$style.publishIndicator"
+					data-test-id="workflow-card-publish-indicator"
+				>
+					<template v-if="isWorkflowPublished">
+						<N8nIcon icon="circle-check" size="xlarge" :class="$style.publishIndicatorColor" />
+						<N8nText size="small" bold :class="$style.publishIndicatorColor">
+							{{ locale.baseText('workflows.item.published') }}
+						</N8nText>
+					</template>
+					<N8nText v-else size="small" bold :class="$style.notPublishedIndicatorColor">
+						{{ locale.baseText('workflows.item.notPublished') }}
+					</N8nText>
+				</div>
 
 				<N8nActionToggle
 					:actions="actions"
@@ -733,6 +754,40 @@ const tags = computed(
 	}
 }
 
+.publishIndicator {
+	display: flex;
+	align-items: center;
+	gap: var(--spacing--4xs);
+}
+
+.publishIndicatorColor {
+	color: var(--color--mint-700);
+
+	:global(body[data-theme='dark']) & {
+		color: var(--color--mint-600);
+	}
+
+	@media (prefers-color-scheme: dark) {
+		:global(body:not([data-theme])) & {
+			color: var(--color--mint-600);
+		}
+	}
+}
+
+.notPublishedIndicatorColor {
+	color: var(--color--neutral-600);
+
+	:global(body[data-theme='dark']) & {
+		color: var(--color--neutral-400);
+	}
+
+	@media (prefers-color-scheme: dark) {
+		:global(body:not([data-theme])) & {
+			color: var(--color--neutral-400);
+		}
+	}
+}
+
 @include mixins.breakpoint('sm-and-down') {
 	.cardLink {
 		--card--padding: 0 var(--spacing--sm) var(--spacing--sm);
diff --git a/packages/frontend/editor-ui/src/app/components/WorkflowPublishForm.vue b/packages/frontend/editor-ui/src/app/components/WorkflowPublishForm.vue
new file mode 100644
index 00000000000..b3f6e852e6c
--- /dev/null
+++ b/packages/frontend/editor-ui/src/app/components/WorkflowPublishForm.vue
@@ -0,0 +1,81 @@
+<script setup lang="ts">
+import { N8nInput, N8nInputLabel } from '@n8n/design-system';
+import { useI18n } from '@n8n/i18n';
+import { useTemplateRef } from 'vue';
+
+defineProps<{
+	disabled?: boolean;
+	versionNameTestId?: string;
+	descriptionTestId?: string;
+}>();
+
+const versionName = defineModel<string>('versionName', { required: true });
+const description = defineModel<string>('description', { required: true });
+const nameInputRef = useTemplateRef<InstanceType<typeof N8nInput>>('nameInput');
+
+const i18n = useI18n();
+
+const emit = defineEmits<{
+	submit: [];
+}>();
+
+const focusInput = () => {
+	// highlight the value in the input
+	nameInputRef.value?.select();
+};
+
+const handleEnterKey = () => {
+	emit('submit');
+};
+
+defineExpose({
+	focusInput,
+});
+</script>
+
+<template>
+	<div :class="$style.formContainer">
+		<N8nInputLabel
+			input-name="workflow-version-name"
+			:label="i18n.baseText('workflows.publishModal.versionNameLabel')"
+			:required="true"
+			:class="$style.inputWrapper"
+		>
+			<N8nInput
+				id="workflow-version-name"
+				ref="nameInput"
+				v-model="versionName"
+				:disabled="disabled"
+				size="large"
+				:data-test-id="versionNameTestId"
+				@keydown.enter="handleEnterKey"
+			/>
+		</N8nInputLabel>
+		<N8nInputLabel
+			input-name="workflow-version-description"
+			:label="i18n.baseText('workflows.publishModal.descriptionPlaceholder')"
+		>
+			<N8nInput
+				id="workflow-version-description"
+				v-model="description"
+				type="textarea"
+				:rows="4"
+				:disabled="disabled"
+				size="large"
+				:data-test-id="descriptionTestId"
+			/>
+		</N8nInputLabel>
+	</div>
+</template>
+
+<style lang="scss" module>
+.formContainer {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing--lg);
+}
+
+.inputWrapper {
+	width: 100%;
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/app/composables/useWorkflowActivate.ts b/packages/frontend/editor-ui/src/app/composables/useWorkflowActivate.ts
index 0fd8bd6f32c..371bcac48c4 100644
--- a/packages/frontend/editor-ui/src/app/composables/useWorkflowActivate.ts
+++ b/packages/frontend/editor-ui/src/app/composables/useWorkflowActivate.ts
@@ -16,6 +16,8 @@ import { useI18n } from '@n8n/i18n';
 import { ref } from 'vue';
 import { useNpsSurveyStore } from '@/app/stores/npsSurvey.store';
 import { useWorkflowSaving } from './useWorkflowSaving';
+import * as workflowsApi from '@/app/api/workflows';
+import { useRootStore } from '@n8n/stores/useRootStore';
 
 export function useWorkflowActivate() {
 	const updatingWorkflowActivation = ref(false);
@@ -29,6 +31,7 @@ export function useWorkflowActivate() {
 	const toast = useToast();
 	const i18n = useI18n();
 	const npsSurveyStore = useNpsSurveyStore();
+	const rootStore = useRootStore();
 
 	//methods
 
@@ -90,10 +93,27 @@ export function useWorkflowActivate() {
 				return false; // Return false if there are node issues
 			}
 
-			await workflowHelpers.updateWorkflow(
-				{ workflowId: currWorkflowId, active: newActiveState },
-				!uiStore.stateIsDirty,
-			);
+			// Save workflow if there are unsaved changes
+			if (uiStore.stateIsDirty) {
+				await workflowHelpers.updateWorkflow({ workflowId: currWorkflowId }, false);
+			}
+
+			// Call activate or deactivate endpoint
+			let workflow;
+			if (newActiveState) {
+				workflow = await workflowsApi.activateWorkflow(rootStore.restApiContext, currWorkflowId, {
+					versionId: workflowsStore.workflow.versionId,
+				});
+			} else {
+				workflow = await workflowsApi.deactivateWorkflow(rootStore.restApiContext, currWorkflowId);
+			}
+
+			// Update local state
+			if (workflow.activeVersionId !== null) {
+				workflowsStore.setWorkflowActive(currWorkflowId);
+			} else {
+				workflowsStore.setWorkflowInactive(currWorkflowId);
+			}
 		} catch (error) {
 			const newStateName = newActiveState ? 'activated' : 'deactivated';
 			toast.showError(
@@ -132,9 +152,105 @@ export function useWorkflowActivate() {
 		return await updateWorkflowActivation(workflowId, true, telemetrySource);
 	};
 
+	const publishWorkflow = async (
+		workflowId: string,
+		versionId: string,
+		options?: { name?: string; description?: string },
+	) => {
+		updatingWorkflowActivation.value = true;
+		const workflow = workflowsStore.getWorkflowById(workflowId);
+		const hadPublishedVersion = !!workflow.activeVersion;
+
+		if (!hadPublishedVersion) {
+			const telemetryPayload = {
+				workflow_id: workflowId,
+				is_active: true,
+				previous_status: false,
+				ndv_input: false,
+			};
+			void useExternalHooks().run('workflowActivate.updateWorkflowActivation', telemetryPayload);
+		}
+
+		try {
+			const updatedWorkflow = await workflowsStore.publishWorkflow(workflowId, {
+				versionId,
+				name: options?.name,
+				description: options?.description,
+			});
+
+			if (!updatedWorkflow.activeVersion) {
+				throw new Error('Failed to publish workflow');
+			}
+
+			workflowsStore.setWorkflowActive(workflowId, updatedWorkflow.activeVersion);
+
+			void useExternalHooks().run('workflow.activeChangeCurrent', {
+				workflowId,
+				versionId: updatedWorkflow.activeVersion.versionId,
+				active: true,
+			});
+
+			if (!hadPublishedVersion && useStorage(LOCAL_STORAGE_ACTIVATION_FLAG).value !== 'true') {
+				uiStore.openModal(WORKFLOW_ACTIVE_MODAL_KEY);
+			}
+			return true;
+		} catch (error) {
+			toast.showError(
+				error,
+				i18n.baseText('workflowActivator.showError.title', {
+					interpolate: { newStateName: 'published' },
+				}) + ':',
+			);
+			return false;
+		} finally {
+			updatingWorkflowActivation.value = false;
+		}
+	};
+
+	const unpublishWorkflowFromHistory = async (workflowId: string) => {
+		updatingWorkflowActivation.value = true;
+
+		const workflow = workflowsStore.getWorkflowById(workflowId);
+		const wasPublished = !!workflow.activeVersion;
+
+		const telemetryPayload = {
+			workflow_id: workflowId,
+			is_active: false,
+			previous_status: wasPublished,
+			ndv_input: false,
+		};
+
+		telemetry.track('User set workflow active status', telemetryPayload);
+		void useExternalHooks().run('workflowActivate.updateWorkflowActivation', telemetryPayload);
+
+		try {
+			await workflowsStore.deactivateWorkflow(workflowId);
+
+			void useExternalHooks().run('workflow.activeChangeCurrent', {
+				workflowId,
+				active: false,
+				versionId: null,
+			});
+
+			return true;
+		} catch (error) {
+			toast.showError(
+				error,
+				i18n.baseText('workflowActivator.showError.title', {
+					interpolate: { newStateName: 'deactivated' },
+				}) + ':',
+			);
+			return false;
+		} finally {
+			updatingWorkflowActivation.value = false;
+		}
+	};
+
 	return {
 		activateCurrentWorkflow,
 		updateWorkflowActivation,
 		updatingWorkflowActivation,
+		publishWorkflow,
+		unpublishWorkflowFromHistory,
 	};
 }
diff --git a/packages/frontend/editor-ui/src/app/composables/useWorkflowHelpers.ts b/packages/frontend/editor-ui/src/app/composables/useWorkflowHelpers.ts
index db845cbe98b..52a49d43ca9 100644
--- a/packages/frontend/editor-ui/src/app/composables/useWorkflowHelpers.ts
+++ b/packages/frontend/editor-ui/src/app/composables/useWorkflowHelpers.ts
@@ -954,6 +954,10 @@ export function useWorkflowHelpers() {
 		workflowsStore.setWorkflowMetadata(workflowData.meta);
 		workflowsStore.setWorkflowScopes(workflowData.scopes);
 
+		if (workflowData.activeVersion) {
+			workflowsStore.setWorkflowActiveVersion(workflowData.activeVersion);
+		}
+
 		if (workflowData.usedCredentials) {
 			workflowsStore.setUsedCredentials(workflowData.usedCredentials);
 		}
diff --git a/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.test.ts b/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.test.ts
index 498c7a682cc..7abf0ecd9dc 100644
--- a/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.test.ts
+++ b/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.test.ts
@@ -371,7 +371,7 @@ describe('useWorkflowSaving', () => {
 			);
 		});
 
-		it('should include active=false in the request if the workflow has no activatable trigger node', async () => {
+		it('should not include active=false in the request if the workflow has no activatable trigger node', async () => {
 			const workflow = createTestWorkflow({
 				id: 'w1',
 				nodes: [createTestNode({ type: CHAT_TRIGGER_NODE_TYPE, disabled: true })],
@@ -387,10 +387,9 @@ describe('useWorkflowSaving', () => {
 			await saveCurrentWorkflow({ id: 'w1' });
 			expect(workflowsStore.updateWorkflow).toHaveBeenCalledWith(
 				'w1',
-				expect.objectContaining({ id: 'w1', active: false }),
+				expect.objectContaining({ id: 'w1' }),
 				false,
 			);
-			expect(workflowsStore.setWorkflowInactive).toHaveBeenCalled();
 		});
 	});
 });
diff --git a/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts b/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts
index 34a4bf732d7..0fe169ff1e0 100644
--- a/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts
+++ b/packages/frontend/editor-ui/src/app/composables/useWorkflowSaving.ts
@@ -10,6 +10,7 @@ import {
 	NON_ACTIVATABLE_TRIGGER_NODE_TYPES,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	VIEWS,
+	IS_DRAFT_PUBLISH_ENABLED,
 } from '@/app/constants';
 import { useWorkflowHelpers } from '@/app/composables/useWorkflowHelpers';
 import { useWorkflowsStore } from '@/app/stores/workflows.store';
@@ -46,7 +47,6 @@ export function useWorkflowSaving({
 	const telemetry = useTelemetry();
 	const nodeHelpers = useNodeHelpers();
 	const templatesStore = useTemplatesStore();
-
 	const { getWorkflowDataToSave, checkConflictingWebhooks, getWorkflowProjectRole } =
 		useWorkflowHelpers();
 
@@ -140,6 +140,10 @@ export function useWorkflowSaving({
 		workflowId: string,
 		request: WorkflowDataUpdate,
 	): Promise<Partial<NotificationOptions> | undefined> {
+		if (IS_DRAFT_PUBLISH_ENABLED) {
+			return undefined;
+		}
+
 		const missingActivatableTriggerNode =
 			request.nodes !== undefined && !request.nodes.some(isNodeActivatable);
 
diff --git a/packages/frontend/editor-ui/src/app/constants/actions.ts b/packages/frontend/editor-ui/src/app/constants/actions.ts
index 54992a5bbc7..91721e8679b 100644
--- a/packages/frontend/editor-ui/src/app/constants/actions.ts
+++ b/packages/frontend/editor-ui/src/app/constants/actions.ts
@@ -10,4 +10,6 @@ export const enum WORKFLOW_MENU_ACTIONS {
 	UNARCHIVE = 'unarchive',
 	RENAME = 'rename',
 	CHANGE_OWNER = 'change-owner',
+	UNPUBLISH = 'unpublish',
+	SHARE = 'share',
 }
diff --git a/packages/frontend/editor-ui/src/app/constants/modals.ts b/packages/frontend/editor-ui/src/app/constants/modals.ts
index 2949e5c3c9e..0eb85d35be9 100644
--- a/packages/frontend/editor-ui/src/app/constants/modals.ts
+++ b/packages/frontend/editor-ui/src/app/constants/modals.ts
@@ -20,6 +20,7 @@ export const LOG_STREAM_MODAL_KEY = 'settingsLogStream';
 export const MFA_SETUP_MODAL_KEY = 'mfaSetup';
 export const PROMPT_MFA_CODE_MODAL_KEY = 'promptMfaCode';
 export const WORKFLOW_HISTORY_VERSION_RESTORE = 'workflowHistoryVersionRestore';
+export const WORKFLOW_HISTORY_VERSION_UNPUBLISH = 'workflowHistoryVersionUnpublish';
 export const SETUP_CREDENTIALS_MODAL_KEY = 'setupCredentials';
 export const NEW_ASSISTANT_SESSION_MODAL = 'newAssistantSession';
 export const EXTERNAL_SECRETS_PROVIDER_MODAL_KEY = 'externalSecretsProvider';
@@ -34,3 +35,5 @@ export const CHAT_HUB_SIDE_MENU_DRAWER_MODAL_KEY = 'chatHubSideMenuDrawer';
 export const EXPERIMENT_TEMPLATE_RECO_V2_KEY = 'templateRecoV2';
 export const EXPERIMENT_TEMPLATE_RECO_V3_KEY = 'templateRecoV3';
 export const EXPERIMENT_TEMPLATES_DATA_QUALITY_KEY = 'templatesDataQuality';
+export const WORKFLOW_PUBLISH_MODAL_KEY = 'workflowPublish';
+export const WORKFLOW_HISTORY_PUBLISH_MODAL_KEY = 'workflowHistoryPublish';
diff --git a/packages/frontend/editor-ui/src/app/constants/workflows.ts b/packages/frontend/editor-ui/src/app/constants/workflows.ts
index bcf66c13b31..d1de12db36c 100644
--- a/packages/frontend/editor-ui/src/app/constants/workflows.ts
+++ b/packages/frontend/editor-ui/src/app/constants/workflows.ts
@@ -7,3 +7,8 @@ export const MAX_WORKFLOW_NAME_LENGTH = 128;
 export const DUPLICATE_POSTFFIX = ' copy';
 export const NODE_OUTPUT_DEFAULT_KEY = '_NODE_OUTPUT_DEFAULT_KEY_';
 export const DEFAULT_WORKFLOW_PAGE_SIZE = 50;
+export const WORKFLOWS_DRAFT_PUBLISH_ENABLED_FLAG = 'WORKFLOWS_DRAFT_PUBLISH_ENABLED';
+
+// TODO: We need to do a proper cleanup of the old functionality (non-draft-publish mode)
+// and then drop this constant
+export const IS_DRAFT_PUBLISH_ENABLED = true;
diff --git a/packages/frontend/editor-ui/src/app/stores/ui.store.ts b/packages/frontend/editor-ui/src/app/stores/ui.store.ts
index fad8cfdf65e..b4f4f6491c7 100644
--- a/packages/frontend/editor-ui/src/app/stores/ui.store.ts
+++ b/packages/frontend/editor-ui/src/app/stores/ui.store.ts
@@ -30,7 +30,10 @@ import {
 	EXPERIMENT_TEMPLATE_RECO_V2_KEY,
 	CONFIRM_PASSWORD_MODAL_KEY,
 	EXPERIMENT_TEMPLATE_RECO_V3_KEY,
+	WORKFLOW_PUBLISH_MODAL_KEY,
 	EXPERIMENT_TEMPLATES_DATA_QUALITY_KEY,
+	WORKFLOW_HISTORY_PUBLISH_MODAL_KEY,
+	WORKFLOW_HISTORY_VERSION_UNPUBLISH,
 } from '@/app/constants';
 import {
 	ANNOTATION_TAGS_MANAGER_MODAL_KEY,
@@ -148,6 +151,9 @@ export const useUIStore = defineStore(STORES.UI, () => {
 				WORKFLOW_DIFF_MODAL_KEY,
 				EXPERIMENT_TEMPLATE_RECO_V3_KEY,
 				VARIABLE_MODAL_KEY,
+				WORKFLOW_PUBLISH_MODAL_KEY,
+				WORKFLOW_HISTORY_PUBLISH_MODAL_KEY,
+				WORKFLOW_HISTORY_VERSION_UNPUBLISH,
 			].map((modalKey) => [modalKey, { open: false }]),
 		),
 		[DELETE_USER_MODAL_KEY]: {
diff --git a/packages/frontend/editor-ui/src/app/stores/workflows.store.ts b/packages/frontend/editor-ui/src/app/stores/workflows.store.ts
index 72675add143..7f0635bb3df 100644
--- a/packages/frontend/editor-ui/src/app/stores/workflows.store.ts
+++ b/packages/frontend/editor-ui/src/app/stores/workflows.store.ts
@@ -68,7 +68,7 @@ import * as workflowsApi from '@/app/api/workflows';
 import { useUIStore } from '@/app/stores/ui.store';
 import { dataPinningEventBus } from '@/app/event-bus';
 import { isJsonKeyObject, stringSizeInBytes, isPresent } from '@/app/utils/typesUtils';
-import { makeRestApiRequest, ResponseError } from '@n8n/rest-api-client';
+import { makeRestApiRequest, ResponseError, type WorkflowHistory } from '@n8n/rest-api-client';
 import {
 	unflattenExecutionData,
 	findTriggerNodeToAutoSelect,
@@ -737,6 +737,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		workflow.value.versionId = versionId;
 	}
 
+	function setWorkflowActiveVersion(version: WorkflowHistory) {
+		workflow.value.activeVersion = deepCopy(version);
+	}
+
 	// replace invalid credentials in workflow
 	function replaceInvalidWorkflowCredentials(data: {
 		credentials: INodeCredentialsDetails;
@@ -874,7 +878,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		};
 	}
 
-	function setWorkflowActive(targetWorkflowId: string) {
+	function setWorkflowActive(targetWorkflowId: string, activeVersion?: WorkflowHistory) {
 		const index = activeWorkflows.value.indexOf(targetWorkflowId);
 		if (index === -1) {
 			activeWorkflows.value.push(targetWorkflowId);
@@ -882,12 +886,14 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		const targetWorkflow = workflowsById.value[targetWorkflowId];
 		if (targetWorkflow) {
 			targetWorkflow.active = true;
-			targetWorkflow.activeVersionId = targetWorkflow.versionId;
+			targetWorkflow.activeVersionId = activeVersion?.versionId ?? targetWorkflow.versionId;
+			targetWorkflow.activeVersion = activeVersion;
 		}
 		if (targetWorkflowId === workflow.value.id) {
 			uiStore.stateIsDirty = false;
 			workflow.value.active = true;
-			workflow.value.activeVersionId = workflow.value.versionId;
+			workflow.value.activeVersionId = activeVersion?.versionId ?? workflow.value.versionId;
+			workflow.value.activeVersion = activeVersion;
 		}
 	}
 
@@ -900,9 +906,12 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		if (targetWorkflow) {
 			targetWorkflow.active = false;
 			targetWorkflow.activeVersionId = null;
+			targetWorkflow.activeVersion = null;
 		}
 		if (targetWorkflowId === workflow.value.id) {
 			workflow.value.active = false;
+			workflow.value.activeVersionId = null;
+			workflow.value.activeVersion = null;
 		}
 	}
 
@@ -1603,6 +1612,32 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		return updatedWorkflow;
 	}
 
+	async function publishWorkflow(
+		id: string,
+		data: { versionId: string; name?: string; description?: string },
+	): Promise<IWorkflowDb> {
+		const updatedWorkflow = await makeRestApiRequest<IWorkflowDb>(
+			rootStore.restApiContext,
+			'POST',
+			`/workflows/${id}/activate`,
+			data as unknown as IDataObject,
+		);
+
+		return updatedWorkflow;
+	}
+
+	async function deactivateWorkflow(id: string): Promise<IWorkflowDb> {
+		const updatedWorkflow = await makeRestApiRequest<IWorkflowDb>(
+			rootStore.restApiContext,
+			'POST',
+			`/workflows/${id}/deactivate`,
+		);
+
+		setWorkflowInactive(id);
+
+		return updatedWorkflow;
+	}
+
 	// Update a single workflow setting key while preserving existing settings
 	async function updateWorkflowSetting<K extends keyof IWorkflowSettings>(
 		id: string,
@@ -1950,6 +1985,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		addNodeExecutionStartedData,
 		setUsedCredentials,
 		setWorkflowVersionId,
+		setWorkflowActiveVersion,
 		replaceInvalidWorkflowCredentials,
 		assignCredentialToMatchingNodes,
 		setWorkflows,
@@ -1989,6 +2025,8 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => {
 		getExecution,
 		createNewWorkflow,
 		updateWorkflow,
+		publishWorkflow,
+		deactivateWorkflow,
 		updateWorkflowSetting,
 		saveWorkflowDescription,
 		runWorkflow,
diff --git a/packages/frontend/editor-ui/src/app/types/externalHooks.ts b/packages/frontend/editor-ui/src/app/types/externalHooks.ts
index 379ed3f5abc..6d11eb3a31d 100644
--- a/packages/frontend/editor-ui/src/app/types/externalHooks.ts
+++ b/packages/frontend/editor-ui/src/app/types/externalHooks.ts
@@ -219,7 +219,9 @@ export interface ExternalHooks {
 	};
 	workflow: {
 		activeChange: Array<ExternalHooksMethod<{ active: boolean; workflowId: string }>>;
-		activeChangeCurrent: Array<ExternalHooksMethod<{ workflowId: string; active: boolean }>>;
+		activeChangeCurrent: Array<
+			ExternalHooksMethod<{ workflowId: string; versionId: string | null; active: boolean }>
+		>;
 		afterUpdate: Array<ExternalHooksMethod<{ workflowData: IWorkflowDb }>>;
 		open: Array<ExternalHooksMethod<{ workflowId: string; workflowName: string }>>;
 	};
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/__tests__/utils.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/__tests__/utils.ts
index 19b273c2fe9..b671388c171 100644
--- a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/__tests__/utils.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/__tests__/utils.ts
@@ -8,6 +8,9 @@ export const workflowHistoryDataFactory: () => WorkflowHistory = () => ({
 	authors: Array.from({ length: faker.number.int({ min: 2, max: 5 }) }, faker.person.fullName).join(
 		', ',
 	),
+	workflowPublishHistory: [],
+	name: faker.lorem.word(),
+	description: faker.lorem.sentence(),
 });
 
 export const workflowVersionDataFactory: () => WorkflowVersion = () => ({
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.test.ts
index afe9d9812fb..5d180b58bae 100644
--- a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.test.ts
@@ -73,7 +73,17 @@ describe('WorkflowHistoryContent', () => {
 
 		await userEvent.click(getByTestId(`action-${action}`));
 		expect(emitted().action).toEqual([
-			[{ action, id: workflowVersion.versionId, data: { formattedCreatedAt: expect.any(String) } }],
+			[
+				{
+					action,
+					id: workflowVersion.versionId,
+					data: {
+						formattedCreatedAt: expect.any(String),
+						versionName: workflowVersion.name,
+						description: workflowVersion.description,
+					},
+				},
+			],
 		]);
 	});
 
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.vue
index 778a4e3a4ff..5876a8d1502 100644
--- a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryContent.vue
@@ -1,37 +1,34 @@
 <script setup lang="ts">
-import { computed } from 'vue';
+import { computed, ref, watch } from 'vue';
 import type { IWorkflowDb, UserAction } from '@/Interface';
-import type {
-	WorkflowVersion,
-	WorkflowHistoryActionTypes,
-	WorkflowVersionId,
-} from '@n8n/rest-api-client/api/workflowHistory';
+import type { WorkflowVersion } from '@n8n/rest-api-client/api/workflowHistory';
 import WorkflowPreview from '@/app/components/WorkflowPreview.vue';
 import WorkflowHistoryListItem from './WorkflowHistoryListItem.vue';
 import { useI18n } from '@n8n/i18n';
 import type { IUser } from 'n8n-workflow';
 
-import { N8nButton, N8nIcon } from '@n8n/design-system';
+import { N8nButton, N8nIcon, N8nLink, N8nText, N8nTooltip } from '@n8n/design-system';
+import { IS_DRAFT_PUBLISH_ENABLED } from '@/app/constants';
+import { formatTimestamp } from '@/features/workflows/workflowHistory/utils';
+import type { WorkflowHistoryAction } from '@/features/workflows/workflowHistory/types';
+
 const i18n = useI18n();
 
 const props = defineProps<{
 	workflow: IWorkflowDb | null;
 	workflowVersion: WorkflowVersion | null;
 	actions: Array<UserAction<IUser>>;
+	isVersionActive?: boolean;
 	isListLoading?: boolean;
 	isFirstItemShown?: boolean;
 }>();
 
 const emit = defineEmits<{
-	action: [
-		value: {
-			action: WorkflowHistoryActionTypes[number];
-			id: WorkflowVersionId;
-			data: { formattedCreatedAt: string };
-		},
-	];
+	action: [value: WorkflowHistoryAction];
 }>();
 
+const isDraftPublishEnabled = IS_DRAFT_PUBLISH_ENABLED;
+
 const workflowVersionPreview = computed<IWorkflowDb | undefined>(() => {
 	if (!props.workflowVersion || !props.workflow) {
 		return;
@@ -44,23 +41,66 @@ const workflowVersionPreview = computed<IWorkflowDb | undefined>(() => {
 	};
 });
 
-const actions = computed(() =>
-	props.isFirstItemShown
-		? props.actions.filter((action) => action.value !== 'restore')
-		: props.actions,
-);
+const formattedCreatedAt = computed<string>(() => {
+	if (!props.workflowVersion) {
+		return '';
+	}
+	const { date, time } = formatTimestamp(props.workflowVersion.createdAt);
+	return i18n.baseText('workflowHistory.item.createdAt', { interpolate: { date, time } });
+});
 
-const onAction = ({
-	action,
-	id,
-	data,
-}: {
-	action: WorkflowHistoryActionTypes[number];
-	id: WorkflowVersionId;
-	data: { formattedCreatedAt: string };
-}) => {
+const versionNameDisplay = computed(() => {
+	return props.workflowVersion?.name ?? formattedCreatedAt.value;
+});
+
+const MAX_DESCRIPTION_LENGTH = 200;
+const isDescriptionExpanded = ref(false);
+
+const description = computed(() => props.workflowVersion?.description ?? '');
+const isDescriptionLong = computed(() => description.value.length > MAX_DESCRIPTION_LENGTH);
+const displayDescription = computed(() => {
+	if (!isDescriptionLong.value || isDescriptionExpanded.value) {
+		return description.value;
+	}
+	return description.value.substring(0, MAX_DESCRIPTION_LENGTH) + '... ';
+});
+
+const toggleDescription = () => {
+	isDescriptionExpanded.value = !isDescriptionExpanded.value;
+};
+
+const actions = computed(() => {
+	let filteredActions = props.actions;
+
+	if (props.isFirstItemShown) {
+		filteredActions = filteredActions.filter((action) => action.value !== 'restore');
+	}
+
+	if (isDraftPublishEnabled) {
+		if (props.isVersionActive) {
+			filteredActions = filteredActions.filter((action) => action.value !== 'publish');
+		} else {
+			filteredActions = filteredActions.filter((action) => action.value !== 'unpublish');
+		}
+	} else {
+		filteredActions = filteredActions.filter(
+			(action) => action.value !== 'publish' && action.value !== 'unpublish',
+		);
+	}
+
+	return filteredActions;
+});
+
+const onAction = ({ action, id, data }: WorkflowHistoryAction) => {
 	emit('action', { action, id, data });
 };
+
+watch(
+	() => props.workflowVersion,
+	() => {
+		isDescriptionExpanded.value = false;
+	},
+);
 </script>
 
 <template>
@@ -77,12 +117,29 @@ const onAction = ({
 				:class="$style.card"
 				:index="-1"
 				:item="props.workflowVersion"
-				:is-active="false"
+				:is-selected="false"
 				:actions="actions"
 				@action="onAction"
 			>
 				<template #default="{ formattedCreatedAt }">
-					<section :class="$style.text">
+					<div v-if="isDraftPublishEnabled" :class="$style.descriptionBox">
+						<N8nTooltip :content="versionNameDisplay" v-if="versionNameDisplay">
+							<N8nText :class="$style.mainLine" bold color="text-dark">{{
+								versionNameDisplay
+							}}</N8nText>
+						</N8nTooltip>
+						<N8nText v-if="description" size="small" color="text-base">
+							{{ displayDescription }}
+							<N8nLink v-if="isDescriptionLong" size="small" @click="toggleDescription">
+								{{
+									isDescriptionExpanded
+										? i18n.baseText('generic.showLess')
+										: i18n.baseText('generic.showMore')
+								}}
+							</N8nLink>
+						</N8nText>
+					</div>
+					<section v-else :class="$style.textOld">
 						<p>
 							<span :class="$style.label">
 								{{ i18n.baseText('workflowHistory.content.title') }}:
@@ -135,12 +192,33 @@ const onAction = ({
 	width: 100%;
 }
 
+$descriptionBoxMaxWidth: 330px;
+$descriptionBoxMinWidth: 228px;
+
 .card {
-	padding: var(--spacing--sm) var(--spacing--lg) 0 var(--spacing--xl);
+	padding: var(--spacing--sm) var(--spacing--lg) 0;
 	border: 0;
 	align-items: start;
 
-	.text {
+	.descriptionBox {
+		display: flex;
+		flex-direction: column;
+		min-width: $descriptionBoxMinWidth;
+		max-width: $descriptionBoxMaxWidth;
+		gap: var(--spacing--3xs);
+		margin-top: var(--spacing--3xs);
+		padding: var(--spacing--xs);
+		border: var(--border-width) var(--border-style) var(--color--foreground);
+		border-radius: var(--radius);
+		background-color: var(--color--background--light-3);
+
+		.mainLine {
+			@include mixins.utils-ellipsis;
+			cursor: default;
+		}
+	}
+
+	.textOld {
 		display: flex;
 		flex-direction: column;
 		flex: 1 1 auto;
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryList.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryList.test.ts
index e7b72626005..8ae6a20b5ca 100644
--- a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryList.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryList.test.ts
@@ -46,7 +46,7 @@ describe('WorkflowHistoryList', () => {
 			props: {
 				items: [],
 				actions,
-				activeItem: null,
+				selectedItem: null,
 				requestNumberOfItems: 20,
 				lastReceivedItemsLength: 0,
 				evaluatedPruneDays: -1,
@@ -63,7 +63,7 @@ describe('WorkflowHistoryList', () => {
 			props: {
 				items: [],
 				actions,
-				activeItem: null,
+				selectedItem: null,
 				requestNumberOfItems: 20,
 				lastReceivedItemsLength: 0,
 				evaluatedPruneDays: -1,
@@ -84,7 +84,7 @@ describe('WorkflowHistoryList', () => {
 			props: {
 				items,
 				actions,
-				activeItem: null,
+				selectedItem: null,
 				requestNumberOfItems: 20,
 				lastReceivedItemsLength: 20,
 				evaluatedPruneDays: -1,
@@ -95,7 +95,7 @@ describe('WorkflowHistoryList', () => {
 
 		const listItems = getAllByTestId('workflow-history-list-item');
 		const listItem = listItems[items.length - 1];
-		await userEvent.click(within(listItem).getByText(/ID: /));
+		await userEvent.click(within(listItem).getByText(/Saved: /));
 		expect(emitted().preview).toEqual([
 			[
 				{
@@ -108,7 +108,7 @@ describe('WorkflowHistoryList', () => {
 		expect(listItems).toHaveLength(numberOfItems);
 	});
 
-	it('should scroll to active item', async () => {
+	it('should scroll to selected item', async () => {
 		const items = Array.from({ length: 30 }, workflowHistoryDataFactory);
 
 		const { getByTestId } = renderComponent({
@@ -116,7 +116,7 @@ describe('WorkflowHistoryList', () => {
 			props: {
 				items,
 				actions,
-				activeItem: items[0],
+				selectedItem: items[0],
 				requestNumberOfItems: 20,
 				lastReceivedItemsLength: 20,
 				evaluatedPruneDays: -1,
@@ -134,7 +134,7 @@ describe('WorkflowHistoryList', () => {
 			props: {
 				items,
 				actions,
-				activeItem: null,
+				selectedItem: null,
 				requestNumberOfItems: 20,
 				lastReceivedItemsLength: 20,
 				evaluatedPruneDays: -1,
@@ -153,7 +153,11 @@ describe('WorkflowHistoryList', () => {
 				{
 					action,
 					id: items[index].versionId,
-					data: { formattedCreatedAt: expect.any(String) },
+					data: {
+						formattedCreatedAt: expect.any(String),
+						versionName: items[index].name,
+						description: items[index].description,
+					},
 				},
 			],
 		]);
@@ -167,7 +171,7 @@ describe('WorkflowHistoryList', () => {
 			props: {
 				items,
 				actions,
-				activeItem: items[0],
+				selectedItem: items[0],
 				requestNumberOfItems: 20,
 				lastReceivedItemsLength: 20,
 				evaluatedPruneDays: 1,
@@ -186,7 +190,7 @@ describe('WorkflowHistoryList', () => {
 			props: {
 				items,
 				actions,
-				activeItem: items[0],
+				selectedItem: items[0],
 				requestNumberOfItems: 20,
 				lastReceivedItemsLength: 20,
 				evaluatedPruneDays: 1,
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryList.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryList.vue
index 0d8094df19b..696f1b9aa91 100644
--- a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryList.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryList.vue
@@ -5,41 +5,36 @@ import { useI18n } from '@n8n/i18n';
 import type {
 	WorkflowHistory,
 	WorkflowVersionId,
-	WorkflowHistoryActionTypes,
 	WorkflowHistoryRequestParams,
 } from '@n8n/rest-api-client/api/workflowHistory';
 import WorkflowHistoryListItem from './WorkflowHistoryListItem.vue';
 import type { IUser } from 'n8n-workflow';
 import { I18nT } from 'vue-i18n';
 import { useIntersectionObserver } from '@/app/composables/useIntersectionObserver';
-
 import { N8nLoading } from '@n8n/design-system';
+import { IS_DRAFT_PUBLISH_ENABLED } from '@/app/constants';
+import type { WorkflowHistoryAction } from '@/features/workflows/workflowHistory/types';
+
 const props = defineProps<{
 	items: WorkflowHistory[];
-	activeItem: WorkflowHistory | null;
+	selectedItem?: WorkflowHistory | null;
 	actions: Array<UserAction<IUser>>;
 	requestNumberOfItems: number;
 	lastReceivedItemsLength: number;
 	evaluatedPruneDays: number;
 	shouldUpgrade?: boolean;
 	isListLoading?: boolean;
+	activeVersionId?: string;
 }>();
 
 const emit = defineEmits<{
-	action: [
-		value: {
-			action: WorkflowHistoryActionTypes[number];
-			id: WorkflowVersionId;
-			data: { formattedCreatedAt: string };
-		},
-	];
+	action: [value: WorkflowHistoryAction];
 	preview: [value: { event: MouseEvent; id: WorkflowVersionId }];
 	loadMore: [value: WorkflowHistoryRequestParams];
 	upgrade: [];
 }>();
 
 const i18n = useI18n();
-
 const listElement = ref<Element | null>(null);
 const shouldAutoScroll = ref(true);
 
@@ -50,18 +45,29 @@ const { observe: observeForLoadMore } = useIntersectionObserver({
 		emit('loadMore', { take: props.requestNumberOfItems, skip: props.items.length }),
 });
 
-const getActions = (index: number) =>
-	index === 0 ? props.actions.filter((action) => action.value !== 'restore') : props.actions;
+const getActions = (item: WorkflowHistory, index: number) => {
+	let filteredActions = props.actions;
 
-const onAction = ({
-	action,
-	id,
-	data,
-}: {
-	action: WorkflowHistoryActionTypes[number];
-	id: WorkflowVersionId;
-	data: { formattedCreatedAt: string };
-}) => {
+	if (index === 0) {
+		filteredActions = filteredActions.filter((action) => action.value !== 'restore');
+	}
+
+	if (IS_DRAFT_PUBLISH_ENABLED) {
+		if (item.versionId === props.activeVersionId) {
+			filteredActions = filteredActions.filter((action) => action.value !== 'publish');
+		} else {
+			filteredActions = filteredActions.filter((action) => action.value !== 'unpublish');
+		}
+	} else {
+		filteredActions = filteredActions.filter(
+			(action) => action.value !== 'publish' && action.value !== 'unpublish',
+		);
+	}
+
+	return filteredActions;
+};
+
+const onAction = ({ action, id, data }: WorkflowHistoryAction) => {
 	shouldAutoScroll.value = false;
 	emit('action', { action, id, data });
 };
@@ -74,13 +80,13 @@ const onPreview = ({ event, id }: { event: MouseEvent; id: WorkflowVersionId })
 const onItemMounted = ({
 	index,
 	offsetTop,
-	isActive,
+	isSelected,
 }: {
 	index: number;
 	offsetTop: number;
-	isActive: boolean;
+	isSelected: boolean;
 }) => {
-	if (isActive && shouldAutoScroll.value) {
+	if (isSelected && shouldAutoScroll.value) {
 		shouldAutoScroll.value = false;
 		listElement.value?.scrollTo({ top: offsetTop, behavior: 'smooth' });
 	}
@@ -101,8 +107,9 @@ const onItemMounted = ({
 			:key="item.versionId"
 			:index="index"
 			:item="item"
-			:is-active="item.versionId === props.activeItem?.versionId"
-			:actions="getActions(index)"
+			:is-selected="item.versionId === props.selectedItem?.versionId"
+			:is-version-active="item.versionId === props.activeVersionId"
+			:actions="getActions(item, index)"
 			@action="onAction"
 			@preview="onPreview"
 			@mounted="onItemMounted"
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryListItem.test.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryListItem.test.ts
index eb09aa7d380..43eca61a0be 100644
--- a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryListItem.test.ts
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryListItem.test.ts
@@ -24,31 +24,6 @@ describe('WorkflowHistoryListItem', () => {
 		setActivePinia(pinia);
 	});
 
-	it('should render item with badge', async () => {
-		const item = workflowHistoryDataFactory();
-		item.authors = 'John Doe';
-		const { getByText, container, queryByRole, emitted } = renderComponent({
-			pinia,
-			props: {
-				item,
-				index: 0,
-				actions,
-				isActive: false,
-			},
-		});
-
-		await userEvent.hover(container.querySelector('.el-tooltip__trigger')!);
-		expect(queryByRole('tooltip')).not.toBeInTheDocument();
-
-		await userEvent.click(container.querySelector('p')!);
-		expect(emitted().preview).toEqual([
-			[expect.objectContaining({ id: item.versionId, event: expect.any(MouseEvent) })],
-		]);
-
-		expect(emitted().mounted).toEqual([[{ index: 0, isActive: false, offsetTop: 0 }]]);
-		expect(getByText(/Latest saved/)).toBeInTheDocument();
-	});
-
 	test.each(actionTypes)('should emit %s event', async (action) => {
 		const item = workflowHistoryDataFactory();
 		const authors = item.authors.split(', ');
@@ -58,7 +33,7 @@ describe('WorkflowHistoryListItem', () => {
 				item,
 				index: 2,
 				actions,
-				isActive: true,
+				isSelected: true,
 			},
 		});
 
@@ -72,10 +47,20 @@ describe('WorkflowHistoryListItem', () => {
 
 		await userEvent.click(getByTestId(`action-${action}`));
 		expect(emitted().action).toEqual([
-			[{ action, id: item.versionId, data: { formattedCreatedAt: expect.any(String) } }],
+			[
+				{
+					action,
+					id: item.versionId,
+					data: {
+						formattedCreatedAt: expect.any(String),
+						versionName: item.name,
+						description: item.description,
+					},
+				},
+			],
 		]);
 
 		expect(queryByText(/Latest saved/)).not.toBeInTheDocument();
-		expect(emitted().mounted).toEqual([[{ index: 2, isActive: true, offsetTop: 0 }]]);
+		expect(emitted().mounted).toEqual([[{ index: 2, isSelected: true, offsetTop: 0 }]]);
 	});
 });
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryListItem.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryListItem.vue
index b8d62f1dd90..99c51b5a2d5 100644
--- a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryListItem.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryListItem.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { computed, ref, onMounted } from 'vue';
-import dateformat from 'dateformat';
 import type { UserAction } from '@n8n/design-system';
 import type {
 	WorkflowHistory,
@@ -10,39 +9,46 @@ import type {
 import { useI18n } from '@n8n/i18n';
 import type { IUser } from 'n8n-workflow';
 
-import { N8nActionToggle, N8nBadge, N8nTooltip } from '@n8n/design-system';
-const props = defineProps<{
-	item: WorkflowHistory;
-	index: number;
-	actions: Array<UserAction<IUser>>;
-	isActive: boolean;
-}>();
+import { N8nActionToggle, N8nTooltip, N8nBadge } from '@n8n/design-system';
+import {
+	getLastPublishedByUser,
+	formatTimestamp,
+} from '@/features/workflows/workflowHistory/utils';
+import { IS_DRAFT_PUBLISH_ENABLED } from '@/app/constants';
+import { useUsersStore } from '@/features/settings/users/users.store';
+import type { WorkflowHistoryAction } from '@/features/workflows/workflowHistory/types';
+
+const props = withDefaults(
+	defineProps<{
+		item: WorkflowHistory;
+		index: number;
+		actions: Array<UserAction<IUser>>;
+		isSelected?: boolean;
+		isVersionActive?: boolean;
+	}>(),
+	{
+		isSelected: false,
+		isVersionActive: false,
+	},
+);
 const emit = defineEmits<{
-	action: [
-		value: {
-			action: WorkflowHistoryActionTypes[number];
-			id: WorkflowVersionId;
-			data: { formattedCreatedAt: string };
-		},
-	];
+	action: [value: WorkflowHistoryAction];
 	preview: [value: { event: MouseEvent; id: WorkflowVersionId }];
-	mounted: [value: { index: number; offsetTop: number; isActive: boolean }];
+	mounted: [value: { index: number; offsetTop: number; isSelected: boolean }];
 }>();
 
 const i18n = useI18n();
+const usersStore = useUsersStore();
 
 const actionsVisible = ref(false);
 const itemElement = ref<HTMLElement | null>(null);
 const authorElement = ref<HTMLElement | null>(null);
 const isAuthorElementTruncated = ref(false);
 
-const formattedCreatedAt = computed<string>(() => {
-	const currentYear = new Date().getFullYear().toString();
-	const [date, time] = dateformat(
-		props.item.createdAt,
-		`${props.item.createdAt.startsWith(currentYear) ? '' : 'yyyy '}mmm d"#"HH:MM:ss`,
-	).split('#');
+const isDraftPublishEnabled = IS_DRAFT_PUBLISH_ENABLED;
 
+const formattedCreatedAt = computed<string>(() => {
+	const { date, time } = formatTimestamp(props.item.createdAt);
 	return i18n.baseText('workflowHistory.item.createdAt', { interpolate: { date, time } });
 });
 
@@ -60,6 +66,39 @@ const authors = computed<{ size: number; label: string }>(() => {
 	};
 });
 
+const versionName = computed(() => {
+	return props.item.name;
+});
+
+const lastPublishInfo = computed(() => {
+	if (!props.isVersionActive) {
+		return null;
+	}
+
+	const lastPublishedByUser = getLastPublishedByUser(props.item.workflowPublishHistory);
+	if (!lastPublishedByUser) {
+		return null;
+	}
+	return lastPublishedByUser;
+});
+
+const publishedAt = computed(() => {
+	if (!lastPublishInfo.value) {
+		return null;
+	}
+	const { date, time } = formatTimestamp(lastPublishInfo.value.createdAt);
+	return i18n.baseText('workflowHistory.item.createdAt', { interpolate: { date, time } });
+});
+
+const publishedByUserName = computed(() => {
+	const userId = lastPublishInfo.value?.userId;
+	if (!userId) {
+		return null;
+	}
+	const user = usersStore.usersById[userId];
+	return user?.fullName ?? user?.email ?? null;
+});
+
 const idLabel = computed<string>(() =>
 	i18n.baseText('workflowHistory.item.id', { interpolate: { id: props.item.versionId } }),
 );
@@ -69,7 +108,11 @@ const onAction = (value: string) => {
 	emit('action', {
 		action,
 		id: props.item.versionId,
-		data: { formattedCreatedAt: formattedCreatedAt.value },
+		data: {
+			formattedCreatedAt: formattedCreatedAt.value,
+			versionName: versionName.value,
+			description: props.item.description,
+		},
 	});
 };
 
@@ -85,7 +128,7 @@ onMounted(() => {
 	emit('mounted', {
 		index: props.index,
 		offsetTop: itemElement.value?.offsetTop ?? 0,
-		isActive: props.isActive,
+		isSelected: props.isSelected,
 	});
 	isAuthorElementTruncated.value =
 		(authorElement.value?.scrollWidth ?? 0) > (authorElement.value?.clientWidth ?? 0);
@@ -97,12 +140,28 @@ onMounted(() => {
 		data-test-id="workflow-history-list-item"
 		:class="{
 			[$style.item]: true,
-			[$style.active]: props.isActive,
+			[$style.selected]: props.isSelected,
 			[$style.actionsVisible]: actionsVisible,
 		}"
 	>
 		<slot :formatted-created-at="formattedCreatedAt">
-			<p @click="onItemClick">
+			<p v-if="isDraftPublishEnabled" @click="onItemClick">
+				<span v-if="versionName" :class="$style.mainLine">{{ versionName }}</span>
+				<time :datetime="item.createdAt" :class="$style.metaItem">
+					{{ i18n.baseText('workflowHistory.item.savedAtLabel') }} {{ formattedCreatedAt }}
+				</time>
+				<N8nTooltip placement="right-end" :disabled="authors.size < 2 && !isAuthorElementTruncated">
+					<template #content>{{ props.item.authors }}</template>
+					<span ref="authorElement" :class="$style.metaItem">{{ authors.label }}</span>
+				</N8nTooltip>
+				<time v-if="publishedAt" :datetime="item.updatedAt" :class="$style.metaItem">
+					{{ i18n.baseText('workflowHistory.item.publishedAtLabel') }} {{ publishedAt }}
+				</time>
+				<span v-if="publishedByUserName" :class="$style.metaItem">
+					{{ publishedByUserName }}
+				</span>
+			</p>
+			<p v-else @click="onItemClick">
 				<time :datetime="item.createdAt">{{ formattedCreatedAt }}</time>
 				<N8nTooltip placement="right-end" :disabled="authors.size < 2 && !isAuthorElementTruncated">
 					<template #content>{{ props.item.authors }}</template>
@@ -112,7 +171,15 @@ onMounted(() => {
 			</p>
 		</slot>
 		<div :class="$style.tail">
-			<N8nBadge v-if="props.index === 0">
+			<N8nBadge
+				v-if="isDraftPublishEnabled && props.isVersionActive"
+				size="medium"
+				:class="$style.publishedBadge"
+				:show-border="false"
+			>
+				{{ i18n.baseText('workflowHistory.item.active') }}
+			</N8nBadge>
+			<N8nBadge v-if="!isDraftPublishEnabled && props.index === 0">
 				{{ i18n.baseText('workflowHistory.item.latest') }}
 			</N8nBadge>
 			<N8nActionToggle
@@ -163,6 +230,27 @@ onMounted(() => {
 			margin-top: calc(var(--spacing--4xs) * -1);
 			font-size: var(--font-size--2xs);
 		}
+
+		.mainLine {
+			padding: 0 0 var(--spacing--5xs);
+			color: var(--color--text--shade-1);
+			font-size: var(--font-size--sm);
+			font-weight: var(--font-weight--bold);
+		}
+
+		.metaItem {
+			justify-self: start;
+			max-width: 180px;
+			white-space: nowrap;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			margin-top: calc(var(--spacing--4xs) * -1);
+			font-size: var(--font-size--2xs);
+			// Reset styles that might be inherited from time selector
+			padding: 0;
+			color: var(--color--text);
+			font-weight: var(--font-weight--regular);
+		}
 	}
 
 	.tail {
@@ -171,7 +259,7 @@ onMounted(() => {
 		justify-content: space-between;
 	}
 
-	&.active {
+	&.selected {
 		background-color: var(--color--background);
 		border-left-color: var(--color--primary);
 
@@ -190,4 +278,14 @@ onMounted(() => {
 	display: block;
 	padding: var(--spacing--3xs);
 }
+
+.publishedBadge {
+	background-color: var(--color--success);
+	color: var(--color--foreground--tint-2);
+
+	:global(.n8n-text) {
+		font-size: var(--font-size--2xs);
+		line-height: var(--line-height--sm);
+	}
+}
 </style>
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryPublishModal.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryPublishModal.vue
new file mode 100644
index 00000000000..bc13d771abe
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryPublishModal.vue
@@ -0,0 +1,155 @@
+<script setup lang="ts">
+import Modal from '@/app/components/Modal.vue';
+import { N8nHeading, N8nButton } from '@n8n/design-system';
+import WorkflowPublishForm from '@/app/components/WorkflowPublishForm.vue';
+import { WORKFLOW_HISTORY_PUBLISH_MODAL_KEY } from '@/app/constants';
+import { useI18n } from '@n8n/i18n';
+import { createEventBus } from '@n8n/utils/event-bus';
+import { useWorkflowActivate } from '@/app/composables/useWorkflowActivate';
+import { useUIStore } from '@/app/stores/ui.store';
+import { ref, onMounted, onBeforeUnmount, useTemplateRef } from 'vue';
+import { generateVersionName } from '@/features/workflows/workflowHistory/utils';
+import type { EventBus } from '@n8n/utils/event-bus';
+
+export type WorkflowHistoryPublishModalEventBusEvents = {
+	publish: { versionId: string; name: string; description: string };
+	cancel: undefined;
+};
+
+const props = defineProps<{
+	modalName: string;
+	data: {
+		versionId: string;
+		workflowId: string;
+		formattedCreatedAt: string;
+		versionName?: string;
+		description?: string;
+		eventBus: EventBus<WorkflowHistoryPublishModalEventBusEvents>;
+	};
+}>();
+
+const i18n = useI18n();
+const modalEventBus = createEventBus();
+const workflowActivate = useWorkflowActivate();
+const uiStore = useUIStore();
+
+const publishForm = useTemplateRef<InstanceType<typeof WorkflowPublishForm>>('publishForm');
+
+const versionName = ref('');
+const description = ref('');
+
+function onModalOpened() {
+	publishForm.value?.focusInput();
+}
+
+onMounted(() => {
+	// Populate version name from existing data or generate from version ID
+	if (props.data.versionName) {
+		versionName.value = props.data.versionName;
+	} else if (props.data.versionId) {
+		versionName.value = generateVersionName(props.data.versionId);
+	}
+
+	// Populate description if available
+	if (props.data.description) {
+		description.value = props.data.description;
+	}
+
+	modalEventBus.on('opened', onModalOpened);
+});
+
+onBeforeUnmount(() => {
+	modalEventBus.off('opened', onModalOpened);
+});
+
+const closeModal = () => {
+	uiStore.closeModal(props.modalName);
+};
+
+const onCancel = () => {
+	props.data.eventBus.emit('cancel');
+	closeModal();
+};
+
+const isPublishDisabled = ref(false);
+
+const handlePublish = async () => {
+	if (versionName.value.trim().length === 0) {
+		return;
+	}
+
+	isPublishDisabled.value = true;
+	const success = await workflowActivate.publishWorkflow(
+		props.data.workflowId,
+		props.data.versionId,
+		{
+			name: versionName.value,
+			description: description.value,
+		},
+	);
+
+	isPublishDisabled.value = false;
+
+	if (success) {
+		props.data.eventBus.emit('publish', {
+			versionId: props.data.versionId,
+			name: versionName.value,
+			description: description.value,
+		});
+		closeModal();
+	}
+};
+</script>
+
+<template>
+	<Modal
+		width="500px"
+		max-height="85vh"
+		:name="WORKFLOW_HISTORY_PUBLISH_MODAL_KEY"
+		:event-bus="modalEventBus"
+		:center="true"
+		:before-close="onCancel"
+	>
+		<template #header>
+			<N8nHeading size="xlarge">{{ i18n.baseText('workflows.publishModal.title') }}</N8nHeading>
+		</template>
+		<template #content>
+			<div :class="$style.content">
+				<WorkflowPublishForm
+					ref="publishForm"
+					v-model:version-name="versionName"
+					v-model:description="description"
+					version-name-test-id="workflow-history-publish-version-name-input"
+					description-test-id="workflow-history-publish-description-input"
+				/>
+				<div :class="$style.actions">
+					<N8nButton
+						type="secondary"
+						:label="i18n.baseText('generic.cancel')"
+						data-test-id="workflow-history-publish-cancel-button"
+						@click="onCancel"
+					/>
+					<N8nButton
+						:disabled="isPublishDisabled || versionName.trim().length === 0"
+						:label="i18n.baseText('workflows.publish')"
+						data-test-id="workflow-history-publish-button"
+						@click="handlePublish"
+					/>
+				</div>
+			</div>
+		</template>
+	</Modal>
+</template>
+<style lang="scss" module>
+.content {
+	display: flex;
+	flex-direction: column;
+	gap: var(--spacing--lg);
+}
+
+.actions {
+	display: flex;
+	justify-content: flex-end;
+	gap: var(--spacing--xs);
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryVersionRestoreModal.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryVersionRestoreModal.vue
index e588d5345c5..705155aab6f 100644
--- a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryVersionRestoreModal.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryVersionRestoreModal.vue
@@ -47,15 +47,10 @@ const closeModal = () => {
 					<br />
 					<I18nT
 						v-if="props.data.isWorkflowActivated"
-						keypath="workflowHistory.action.restore.modal.text"
+						keypath="workflowHistory.action.restore.modal.publishedNote"
 						tag="span"
 						scope="global"
 					>
-						<template #buttonText>
-							&ldquo;{{
-								i18n.baseText('workflowHistory.action.restore.modal.button.deactivateAndRestore')
-							}}&rdquo;
-						</template>
 					</I18nT>
 				</N8nText>
 			</div>
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryVersionUnpublishModal.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryVersionUnpublishModal.vue
new file mode 100644
index 00000000000..e4e55b9ad7b
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/components/WorkflowHistoryVersionUnpublishModal.vue
@@ -0,0 +1,79 @@
+<script lang="ts" setup>
+import { useI18n } from '@n8n/i18n';
+import Modal from '@/app/components/Modal.vue';
+import { useUIStore } from '@/app/stores/ui.store';
+import type { EventBus } from '@n8n/utils/event-bus';
+
+import { N8nButton, N8nCallout, N8nHeading } from '@n8n/design-system';
+
+export type WorkflowHistoryVersionUnpublishModalEventBusEvents = {
+	unpublish: undefined;
+	cancel: undefined;
+};
+
+const props = defineProps<{
+	modalName: string;
+	data: {
+		versionName?: string;
+		eventBus: EventBus<WorkflowHistoryVersionUnpublishModalEventBusEvents>;
+	};
+}>();
+
+const i18n = useI18n();
+const uiStore = useUIStore();
+
+const closeModal = () => {
+	uiStore.closeModal(props.modalName);
+};
+
+const onCancel = () => {
+	props.data.eventBus.emit('cancel');
+	closeModal();
+};
+
+const onUnpublish = () => {
+	props.data.eventBus.emit('unpublish');
+	// Modal will be closed by parent after API call completes
+};
+</script>
+
+<template>
+	<Modal width="500px" :name="props.modalName" :before-close="onCancel">
+		<template #header>
+			<N8nHeading tag="h2" size="xlarge">
+				{{
+					i18n.baseText('workflowHistory.action.unpublish.modal.title', {
+						interpolate: { versionName: props.data.versionName || '' },
+					})
+				}}
+			</N8nHeading>
+		</template>
+		<template #content>
+			<N8nCallout theme="warning" icon="triangle-alert">
+				{{ i18n.baseText('workflowHistory.action.unpublish.modal.description') }}
+			</N8nCallout>
+		</template>
+		<template #footer>
+			<div :class="$style.footer">
+				<N8nButton size="medium" type="tertiary" @click="onCancel">
+					{{ i18n.baseText('generic.cancel') }}
+				</N8nButton>
+				<N8nButton size="medium" type="primary" @click="onUnpublish">
+					{{ i18n.baseText('workflowHistory.action.unpublish.modal.button.unpublish') }}
+				</N8nButton>
+			</div>
+		</template>
+	</Modal>
+</template>
+
+<style module lang="scss">
+.footer {
+	display: flex;
+	flex-direction: row;
+	justify-content: flex-end;
+
+	button {
+		margin-left: var(--spacing--2xs);
+	}
+}
+</style>
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/types.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/types.ts
new file mode 100644
index 00000000000..ffc7130d2ab
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/types.ts
@@ -0,0 +1,11 @@
+import type { WorkflowHistoryActionTypes, WorkflowVersionId } from '@n8n/rest-api-client';
+
+export type WorkflowHistoryAction = {
+	action: WorkflowHistoryActionTypes[number];
+	id: WorkflowVersionId;
+	data: {
+		formattedCreatedAt: string;
+		versionName?: string | null;
+		description?: string | null;
+	};
+};
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/utils.ts b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/utils.ts
new file mode 100644
index 00000000000..c807631efe7
--- /dev/null
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/utils.ts
@@ -0,0 +1,22 @@
+import type { WorkflowPublishHistory } from '@n8n/rest-api-client/api/workflowHistory';
+import dateformat from 'dateformat';
+
+export const getLastPublishedByUser = (workflowPublishHistory: WorkflowPublishHistory[]) => {
+	return workflowPublishHistory.findLast(
+		(history) => history.event === 'activated' && history.userId !== null,
+	);
+};
+
+export const generateVersionName = (versionId: string) => {
+	return `Version ${versionId.substring(0, 8)}`;
+};
+
+export const formatTimestamp = (value: string) => {
+	const currentYear = new Date().getFullYear().toString();
+	const [date, time] = dateformat(
+		value,
+		`${value.startsWith(currentYear) ? '' : 'yyyy '}mmm d"#"HH:MM:ss`,
+	).split('#');
+
+	return { date, time };
+};
diff --git a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/views/WorkflowHistory.vue b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/views/WorkflowHistory.vue
index c9aeae81085..b1f88d775fc 100644
--- a/packages/frontend/editor-ui/src/features/workflows/workflowHistory/views/WorkflowHistory.vue
+++ b/packages/frontend/editor-ui/src/features/workflows/workflowHistory/views/WorkflowHistory.vue
@@ -2,7 +2,12 @@
 import { onBeforeMount, ref, watchEffect, computed, h } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import type { IWorkflowDb, UserAction } from '@/Interface';
-import { VIEWS, WORKFLOW_HISTORY_VERSION_RESTORE } from '@/app/constants';
+import {
+	VIEWS,
+	WORKFLOW_HISTORY_VERSION_RESTORE,
+	WORKFLOW_HISTORY_VERSION_UNPUBLISH,
+	WORKFLOW_HISTORY_PUBLISH_MODAL_KEY,
+} from '@/app/constants';
 import { useI18n } from '@n8n/i18n';
 import { useToast } from '@/app/composables/useToast';
 import type {
@@ -19,11 +24,18 @@ import { useUIStore } from '@/app/stores/ui.store';
 import { useWorkflowsStore } from '@/app/stores/workflows.store';
 import { telemetry } from '@/app/plugins/telemetry';
 import { useRootStore } from '@n8n/stores/useRootStore';
+import { useWorkflowActivate } from '@/app/composables/useWorkflowActivate';
 import { getResourcePermissions } from '@n8n/permissions';
 import { usePageRedirectionHelper } from '@/app/composables/usePageRedirectionHelper';
 import type { IUser } from 'n8n-workflow';
 
 import { N8nBadge, N8nButton, N8nHeading } from '@n8n/design-system';
+import { createEventBus } from '@n8n/utils/event-bus';
+import type { WorkflowHistoryVersionUnpublishModalEventBusEvents } from '../components/WorkflowHistoryVersionUnpublishModal.vue';
+import type { WorkflowHistoryPublishModalEventBusEvents } from '../components/WorkflowHistoryPublishModal.vue';
+import { IS_DRAFT_PUBLISH_ENABLED } from '@/app/constants';
+import type { WorkflowHistoryAction } from '@/features/workflows/workflowHistory/types';
+
 type WorkflowHistoryActionRecord = {
 	[K in Uppercase<WorkflowHistoryActionTypes[number]>]: Lowercase<K>;
 };
@@ -36,6 +48,8 @@ const enum WorkflowHistoryVersionRestoreModalActions {
 
 const workflowHistoryActionTypes: WorkflowHistoryActionTypes = [
 	'restore',
+	'publish',
+	'unpublish',
 	'clone',
 	'open',
 	'download',
@@ -50,18 +64,17 @@ const router = useRouter();
 const i18n = useI18n();
 const toast = useToast();
 const pageRedirectionHelper = usePageRedirectionHelper();
-
 const workflowHistoryStore = useWorkflowHistoryStore();
 const uiStore = useUIStore();
 const workflowsStore = useWorkflowsStore();
-
+const workflowActivate = useWorkflowActivate();
 const canRender = ref(true);
 const isListLoading = ref(true);
 const requestNumberOfItems = ref(20);
 const lastReceivedItemsLength = ref(0);
 const activeWorkflow = ref<IWorkflowDb | null>(null);
 const workflowHistory = ref<WorkflowHistory[]>([]);
-const activeWorkflowVersion = ref<WorkflowVersion | null>(null);
+const selectedWorkflowVersion = ref<WorkflowVersion | null>(null);
 
 const workflowId = computed(() => normalizeSingleRouteParam('workflowId'));
 const versionId = computed(() => normalizeSingleRouteParam('versionId'));
@@ -74,14 +87,24 @@ const editorRoute = computed(() => ({
 const workflowPermissions = computed(
 	() => getResourcePermissions(workflowsStore.getWorkflowById(workflowId.value)?.scopes).workflow,
 );
+
+const workflowActiveVersionId = computed(() => {
+	return workflowsStore.getWorkflowById(workflowId.value)?.activeVersion?.versionId;
+});
+
+const isDraftPublishEnabled = IS_DRAFT_PUBLISH_ENABLED;
+
 const actions = computed<Array<UserAction<IUser>>>(() =>
-	workflowHistoryActionTypes.map((value) => ({
-		label: i18n.baseText(`workflowHistory.item.actions.${value}`),
-		disabled:
-			(value === 'clone' && !workflowPermissions.value.create) ||
-			(value === 'restore' && !workflowPermissions.value.update),
-		value,
-	})),
+	workflowHistoryActionTypes
+		.filter((value) => !(value === 'publish' && activeWorkflow.value?.isArchived))
+		.map((value) => ({
+			label: i18n.baseText(`workflowHistory.item.actions.${value}`),
+			disabled:
+				(value === 'clone' && !workflowPermissions.value.create) ||
+				(value === 'restore' && !workflowPermissions.value.update) ||
+				((value === 'publish' || value === 'unpublish') && !workflowPermissions.value.update),
+			value,
+		})),
 );
 
 const isFirstItemShown = computed(() => workflowHistory.value[0]?.versionId === versionId.value);
@@ -157,7 +180,7 @@ const openRestorationModal = async (
 			},
 		];
 
-		if (isWorkflowActivated) {
+		if (isWorkflowActivated && !isDraftPublishEnabled) {
 			buttons.push({
 				text: i18n.baseText('workflowHistory.action.restore.modal.button.deactivateAndRestore'),
 				type: 'tertiary',
@@ -226,14 +249,21 @@ const restoreWorkflowVersion = async (
 	data: { formattedCreatedAt: string },
 ) => {
 	const workflow = await workflowsStore.fetchWorkflow(workflowId.value);
-	const modalAction = await openRestorationModal(workflow.active, data.formattedCreatedAt);
-	if (modalAction === WorkflowHistoryVersionRestoreModalActions.cancel) {
-		return;
+	let deactivateAndRestore = false;
+
+	if (!isDraftPublishEnabled) {
+		const modalAction = await openRestorationModal(workflow.active, data.formattedCreatedAt);
+		if (modalAction === WorkflowHistoryVersionRestoreModalActions.cancel) {
+			return;
+		}
+		deactivateAndRestore =
+			modalAction === WorkflowHistoryVersionRestoreModalActions.deactivateAndRestore;
 	}
+
 	activeWorkflow.value = await workflowHistoryStore.restoreWorkflow(
 		workflowId.value,
 		id,
-		modalAction === WorkflowHistoryVersionRestoreModalActions.deactivateAndRestore,
+		deactivateAndRestore,
 	);
 	const history = await workflowHistoryStore.getWorkflowHistory(workflowId.value, {
 		take: 1,
@@ -245,15 +275,82 @@ const restoreWorkflowVersion = async (
 	});
 };
 
-const onAction = async ({
-	action,
-	id,
-	data,
-}: {
-	action: WorkflowHistoryActionTypes[number];
-	id: WorkflowVersionId;
-	data: { formattedCreatedAt: string };
-}) => {
+const publishWorkflowVersion = (id: WorkflowVersionId, data: WorkflowHistoryAction['data']) => {
+	const publishEventBus = createEventBus<WorkflowHistoryPublishModalEventBusEvents>();
+
+	publishEventBus.once('publish', (publishData) => {
+		// Update the history list with the new name and description
+		const historyItem = workflowHistory.value.find(
+			(item) => item.versionId === publishData.versionId,
+		);
+		if (historyItem) {
+			historyItem.name = publishData.name;
+			historyItem.description = publishData.description;
+		}
+
+		// Refresh the selected workflow version if it's the one that was published
+		if (selectedWorkflowVersion.value?.versionId === publishData.versionId) {
+			selectedWorkflowVersion.value = {
+				...selectedWorkflowVersion.value,
+				name: publishData.name,
+				description: publishData.description,
+			};
+		}
+
+		// Refresh the active workflow to get the updated activeVersion
+		activeWorkflow.value = workflowsStore.getWorkflowById(workflowId.value);
+
+		sendTelemetry('User published version from history');
+	});
+
+	uiStore.openModalWithData({
+		name: WORKFLOW_HISTORY_PUBLISH_MODAL_KEY,
+		data: {
+			versionId: id,
+			workflowId: workflowId.value,
+			formattedCreatedAt: data.formattedCreatedAt,
+			versionName: data.versionName,
+			description: data.description,
+			eventBus: publishEventBus,
+		},
+	});
+};
+
+const unpublishWorkflowVersion = (id: WorkflowVersionId, data: WorkflowHistoryAction['data']) => {
+	if (workflowActiveVersionId.value !== id) {
+		return;
+	}
+
+	const unpublishEventBus = createEventBus<WorkflowHistoryVersionUnpublishModalEventBusEvents>();
+
+	unpublishEventBus.once('unpublish', async () => {
+		const success = await workflowActivate.unpublishWorkflowFromHistory(workflowId.value);
+		uiStore.closeModal(WORKFLOW_HISTORY_VERSION_UNPUBLISH);
+
+		if (!success) {
+			return;
+		}
+
+		activeWorkflow.value = workflowsStore.getWorkflowById(workflowId.value);
+
+		toast.showMessage({
+			title: i18n.baseText('workflowHistory.action.unpublish.success.title'),
+			type: 'success',
+		});
+
+		sendTelemetry('User unpublished workflow from history');
+	});
+
+	uiStore.openModalWithData({
+		name: WORKFLOW_HISTORY_VERSION_UNPUBLISH,
+		data: {
+			versionName: data.versionName,
+			eventBus: unpublishEventBus,
+		},
+	});
+};
+
+const onAction = async ({ action, id, data }: WorkflowHistoryAction) => {
 	try {
 		switch (action) {
 			case WORKFLOW_HISTORY_ACTIONS.OPEN:
@@ -272,6 +369,12 @@ const onAction = async ({
 				await restoreWorkflowVersion(id, data);
 				sendTelemetry('User restored version');
 				break;
+			case WORKFLOW_HISTORY_ACTIONS.PUBLISH:
+				publishWorkflowVersion(id, data);
+				break;
+			case WORKFLOW_HISTORY_ACTIONS.UNPUBLISH:
+				unpublishWorkflowVersion(id, data);
+				break;
 		}
 	} catch (error) {
 		toast.showError(
@@ -317,7 +420,7 @@ watchEffect(async () => {
 		]);
 
 		// Single atomic update - prevents double render of workflow preview
-		activeWorkflowVersion.value = workflowVersion;
+		selectedWorkflowVersion.value = workflowVersion;
 		activeWorkflow.value = workflow;
 
 		sendTelemetry('User selected version');
@@ -361,12 +464,13 @@ watchEffect(async () => {
 				v-if="canRender"
 				:items="workflowHistory"
 				:last-received-items-length="lastReceivedItemsLength"
-				:active-item="activeWorkflowVersion"
+				:selected-item="selectedWorkflowVersion"
 				:actions="actions"
 				:request-number-of-items="requestNumberOfItems"
 				:should-upgrade="workflowHistoryStore.shouldUpgrade"
 				:evaluated-prune-days="evaluatedPruneDays"
 				:is-list-loading="isListLoading"
+				:active-version-id="workflowActiveVersionId"
 				@action="onAction"
 				@preview="onPreview"
 				@load-more="loadMore"
@@ -377,7 +481,8 @@ watchEffect(async () => {
 			<WorkflowHistoryContent
 				v-if="canRender"
 				:workflow="activeWorkflow"
-				:workflow-version="activeWorkflowVersion"
+				:workflow-version="selectedWorkflowVersion"
+				:is-version-active="selectedWorkflowVersion?.versionId === workflowActiveVersionId"
 				:actions="actions"
 				:is-list-loading="isListLoading"
 				:is-first-item-shown="isFirstItemShown"
diff --git a/packages/nodes-base/credentials/AutomizyApi.credentials.ts b/packages/nodes-base/credentials/AutomizyApi.credentials.ts
deleted file mode 100644
index 3e186c9632e..00000000000
--- a/packages/nodes-base/credentials/AutomizyApi.credentials.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import type { ICredentialType, INodeProperties } from 'n8n-workflow';
-
-export class AutomizyApi implements ICredentialType {
-	name = 'automizyApi';
-
-	displayName = 'Automizy API';
-
-	documentationUrl = 'automizy';
-
-	properties: INodeProperties[] = [
-		{
-			displayName:
-				'This service may no longer exist and will be removed from n8n in a future release.',
-			name: 'deprecated',
-			type: 'notice',
-			default: '',
-		},
-		{
-			displayName: 'API Token',
-			name: 'apiToken',
-			type: 'string',
-			typeOptions: { password: true },
-			default: '',
-		},
-	];
-}
diff --git a/packages/nodes-base/credentials/CrowdDevApi.credentials.ts b/packages/nodes-base/credentials/CrowdDevApi.credentials.ts
deleted file mode 100644
index cfb98983438..00000000000
--- a/packages/nodes-base/credentials/CrowdDevApi.credentials.ts
+++ /dev/null
@@ -1,72 +0,0 @@
-import type {
-	IAuthenticateGeneric,
-	ICredentialTestRequest,
-	ICredentialType,
-	INodeProperties,
-} from 'n8n-workflow';
-
-export class CrowdDevApi implements ICredentialType {
-	name = 'crowdDevApi';
-
-	displayName = 'crowd.dev API';
-
-	documentationUrl = 'crowddev';
-
-	properties: INodeProperties[] = [
-		{
-			displayName: 'URL',
-			name: 'url',
-			type: 'string',
-			default: 'https://app.crowd.dev',
-		},
-		{
-			displayName: 'Tenant ID',
-			name: 'tenantId',
-			type: 'string',
-			default: '',
-		},
-		{
-			displayName: 'Token',
-			name: 'token',
-			type: 'string',
-			typeOptions: {
-				password: true,
-			},
-			default: '',
-		},
-		{
-			displayName: 'Ignore SSL Issues (Insecure)',
-			name: 'allowUnauthorizedCerts',
-			type: 'boolean',
-			description: 'Whether to connect even if SSL certificate validation is not possible',
-			default: false,
-		},
-	];
-
-	// This allows the credential to be used by other parts of n8n
-	// stating how this credential is injected as part of the request
-	// An example is the Http Request node that can make generic calls
-	// reusing this credential
-	authenticate: IAuthenticateGeneric = {
-		type: 'generic',
-		properties: {
-			headers: {
-				Authorization: '={{"Bearer " + $credentials.token}}',
-			},
-		},
-	};
-
-	// The block below tells how this credential can be tested
-	test: ICredentialTestRequest = {
-		request: {
-			method: 'POST',
-			baseURL: '={{$credentials.url.replace(/\\/$/, "") + "/api/tenant/" + $credentials.tenantId}}',
-			url: '/member/query',
-			skipSslCertificateValidation: '={{ $credentials.allowUnauthorizedCerts }}',
-			body: {
-				limit: 1,
-				offset: 0,
-			},
-		},
-	};
-}
diff --git a/packages/nodes-base/credentials/KitemakerApi.credentials.ts b/packages/nodes-base/credentials/KitemakerApi.credentials.ts
deleted file mode 100644
index 5ce01650fb0..00000000000
--- a/packages/nodes-base/credentials/KitemakerApi.credentials.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-import type { ICredentialType, INodeProperties } from 'n8n-workflow';
-
-export class KitemakerApi implements ICredentialType {
-	name = 'kitemakerApi';
-
-	displayName = 'Kitemaker API';
-
-	documentationUrl = 'kitemaker';
-
-	properties: INodeProperties[] = [
-		{
-			displayName: 'Personal Access Token',
-			name: 'personalAccessToken',
-			type: 'string',
-			typeOptions: { password: true },
-			default: '',
-		},
-	];
-}
diff --git a/packages/nodes-base/credentials/SpontitApi.credentials.ts b/packages/nodes-base/credentials/SpontitApi.credentials.ts
deleted file mode 100644
index e59663129ab..00000000000
--- a/packages/nodes-base/credentials/SpontitApi.credentials.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { ICredentialType, INodeProperties } from 'n8n-workflow';
-
-export class SpontitApi implements ICredentialType {
-	name = 'spontitApi';
-
-	displayName = 'Spontit API';
-
-	documentationUrl = 'spontit';
-
-	properties: INodeProperties[] = [
-		{
-			displayName: 'API Key',
-			name: 'apiKey',
-			type: 'string',
-			typeOptions: { password: true },
-			default: '',
-		},
-		{
-			displayName: 'Username',
-			name: 'username',
-			type: 'string',
-			default: '',
-		},
-	];
-}
diff --git a/packages/nodes-base/nodes/Automizy/Automizy.node.json b/packages/nodes-base/nodes/Automizy/Automizy.node.json
deleted file mode 100644
index 3de7a86f236..00000000000
--- a/packages/nodes-base/nodes/Automizy/Automizy.node.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"node": "n8n-nodes-base.automizy",
-	"nodeVersion": "1.0",
-	"codexVersion": "1.0",
-	"categories": ["Communication", "Marketing"],
-	"resources": {
-		"credentialDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/credentials/automizy/"
-			}
-		],
-		"primaryDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.automizy/"
-			}
-		]
-	}
-}
diff --git a/packages/nodes-base/nodes/Automizy/Automizy.node.ts b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
deleted file mode 100644
index b4b268c50ac..00000000000
--- a/packages/nodes-base/nodes/Automizy/Automizy.node.ts
+++ /dev/null
@@ -1,374 +0,0 @@
-import {
-	type IExecuteFunctions,
-	type IDataObject,
-	type ILoadOptionsFunctions,
-	type INodeExecutionData,
-	type INodePropertyOptions,
-	type INodeType,
-	type INodeTypeDescription,
-	type NodeExecutionWithMetadata,
-	NodeConnectionTypes,
-} from 'n8n-workflow';
-
-import { contactFields, contactOperations } from './ContactDescription';
-import { automizyApiRequest, automizyApiRequestAllItems } from './GenericFunctions';
-import { listFields, listOperations } from './ListDescription';
-
-export class Automizy implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Automizy',
-		name: 'automizy',
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
-		icon: 'file:automizy.png',
-		group: ['input'],
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Automizy API',
-		defaults: {
-			name: 'Automizy',
-		},
-		inputs: [NodeConnectionTypes.Main],
-		outputs: [NodeConnectionTypes.Main],
-		hidden: true,
-		credentials: [
-			{
-				name: 'automizyApi',
-				required: true,
-			},
-		],
-		properties: [
-			{
-				displayName:
-					'This service may no longer exist and will be removed from n8n in a future release.',
-				name: 'deprecated',
-				type: 'notice',
-				default: '',
-			},
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Contact',
-						value: 'contact',
-					},
-					{
-						name: 'List',
-						value: 'list',
-					},
-				],
-				default: 'contact',
-			},
-
-			...contactOperations,
-			...contactFields,
-
-			...listOperations,
-			...listFields,
-		],
-	};
-
-	methods = {
-		loadOptions: {
-			// Get all the tags to display them to user so that they can
-			// select them easily
-			async getLists(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const lists = await automizyApiRequestAllItems.call(
-					this,
-					'smartLists',
-					'GET',
-					'/smart-lists',
-				);
-				for (const list of lists) {
-					returnData.push({
-						name: list.name,
-						value: list.id,
-					});
-				}
-				return returnData;
-			},
-			async getTags(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const tags = await automizyApiRequestAllItems.call(
-					this,
-					'contactTags',
-					'GET',
-					'/contacts/tag-manager',
-				);
-				for (const tag of tags) {
-					returnData.push({
-						name: tag.name,
-						value: tag.name,
-					});
-				}
-				return returnData;
-			},
-			async getCustomFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const customFields = await automizyApiRequestAllItems.call(
-					this,
-					'customFields',
-					'GET',
-					'/custom-fields',
-				);
-				for (const customField of customFields) {
-					returnData.push({
-						name: customField.name,
-						value: customField.id,
-					});
-				}
-				return returnData;
-			},
-		},
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: INodeExecutionData[] = [];
-		const length = items.length;
-		const qs: IDataObject = {};
-		let responseData;
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-		for (let i = 0; i < length; i++) {
-			if (resource === 'contact') {
-				if (operation === 'create') {
-					const listId = this.getNodeParameter('listId', i) as string;
-
-					const email = this.getNodeParameter('email', i) as string;
-
-					const additionalFields = this.getNodeParameter('additionalFields', i);
-
-					const body: IDataObject = {
-						email,
-					};
-
-					Object.assign(body, additionalFields);
-
-					if (body.customFieldsUi) {
-						const customFieldsValues = (body.customFieldsUi as IDataObject)
-							.customFieldsValues as IDataObject[];
-
-						body.customFields = {};
-
-						for (const customField of customFieldsValues) {
-							//@ts-ignore
-							body.customFields[customField.key] = customField.value;
-						}
-
-						delete body.customFieldsUi;
-					}
-
-					responseData = await automizyApiRequest.call(
-						this,
-						'POST',
-						`/smart-lists/${listId}/contacts`,
-						body,
-					);
-					responseData = responseData.contacts;
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: i } },
-					);
-				}
-
-				if (operation === 'delete') {
-					const contactId = this.getNodeParameter('contactId', i) as string;
-
-					responseData = await automizyApiRequest.call(this, 'DELETE', `/contacts/${contactId}`);
-
-					responseData = { success: true };
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
-						{ itemData: { item: i } },
-					);
-				}
-
-				if (operation === 'get') {
-					const contactId = this.getNodeParameter('contactId', i) as string;
-
-					responseData = await automizyApiRequest.call(this, 'GET', `/contacts/${contactId}`);
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: i } },
-					);
-				}
-
-				if (operation === 'getAll') {
-					const returnAll = this.getNodeParameter('returnAll', i);
-
-					const listId = this.getNodeParameter('listId', i) as string;
-
-					const additionalFields = this.getNodeParameter('additionalFields', i);
-
-					if (additionalFields.direction && additionalFields.sortBy) {
-						qs.order = `${additionalFields.sortBy}:${additionalFields.direction}`;
-					}
-
-					if (additionalFields.fields) {
-						qs.fields = additionalFields.fields;
-					}
-
-					if (returnAll) {
-						responseData = await automizyApiRequestAllItems.call(
-							this,
-							'contacts',
-							'GET',
-							`/smart-lists/${listId}/contacts`,
-							{},
-							qs,
-						);
-					} else {
-						qs.limit = this.getNodeParameter('limit', i);
-
-						responseData = await automizyApiRequest.call(
-							this,
-							'GET',
-							`/smart-lists/${listId}/contacts`,
-							{},
-							qs,
-						);
-					}
-
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: i } },
-					);
-				}
-
-				if (operation === 'update') {
-					const email = this.getNodeParameter('email', i) as string;
-
-					const updateFields = this.getNodeParameter('updateFields', i);
-
-					const body: IDataObject = {};
-
-					Object.assign(body, updateFields);
-
-					if (body.customFieldsUi) {
-						const customFieldsValues = (body.customFieldsUi as IDataObject)
-							.customFieldsValues as IDataObject[];
-
-						body.customFields = {};
-
-						for (const customField of customFieldsValues) {
-							//@ts-ignore
-							body.customFields[customField.key] = customField.value;
-						}
-
-						delete body.customFieldsUi;
-					}
-
-					responseData = await automizyApiRequest.call(this, 'PATCH', `/contacts/${email}`, body);
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: i } },
-					);
-				}
-			}
-
-			if (resource === 'list') {
-				if (operation === 'create') {
-					const name = this.getNodeParameter('name', i) as string;
-
-					const body: IDataObject = {
-						name,
-					};
-
-					responseData = await automizyApiRequest.call(this, 'POST', '/smart-lists', body);
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: i } },
-					);
-				}
-
-				if (operation === 'delete') {
-					const listId = this.getNodeParameter('listId', i) as string;
-
-					responseData = await automizyApiRequest.call(this, 'DELETE', `/smart-lists/${listId}`);
-
-					responseData = { success: true };
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
-						{ itemData: { item: i } },
-					);
-				}
-
-				if (operation === 'get') {
-					const listId = this.getNodeParameter('listId', i) as string;
-
-					responseData = await automizyApiRequest.call(this, 'GET', `/smart-lists/${listId}`);
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: i } },
-					);
-				}
-
-				if (operation === 'getAll') {
-					const returnAll = this.getNodeParameter('returnAll', i);
-
-					const additionalFields = this.getNodeParameter('additionalFields', i);
-
-					if (additionalFields.direction && additionalFields.sortBy) {
-						qs.order = `${additionalFields.sortBy}:${additionalFields.direction}`;
-					}
-
-					if (additionalFields.fields) {
-						qs.fields = additionalFields.fields;
-					}
-
-					if (returnAll) {
-						responseData = await automizyApiRequestAllItems.call(
-							this,
-							'smartLists',
-							'GET',
-							'/smart-lists',
-							{},
-							qs,
-						);
-					} else {
-						qs.limit = this.getNodeParameter('limit', i);
-
-						responseData = await automizyApiRequest.call(this, 'GET', '/smart-lists', {}, qs);
-
-						responseData = responseData.smartLists;
-					}
-
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: i } },
-					);
-				}
-
-				if (operation === 'update') {
-					const listId = this.getNodeParameter('listId', i) as string;
-
-					const name = this.getNodeParameter('name', i) as string;
-
-					const body: IDataObject = {
-						name,
-					};
-
-					responseData = await automizyApiRequest.call(
-						this,
-						'PATCH',
-						`/smart-lists/${listId}`,
-						body,
-					);
-
-					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData as IDataObject[]),
-						{ itemData: { item: i } },
-					);
-				}
-			}
-		}
-
-		returnData.push(...(responseData as NodeExecutionWithMetadata[]));
-
-		return [returnData];
-	}
-}
diff --git a/packages/nodes-base/nodes/Automizy/ContactDescription.ts b/packages/nodes-base/nodes/Automizy/ContactDescription.ts
deleted file mode 100644
index 4d00755a143..00000000000
--- a/packages/nodes-base/nodes/Automizy/ContactDescription.ts
+++ /dev/null
@@ -1,451 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const contactOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		displayOptions: {
-			show: {
-				resource: ['contact'],
-			},
-		},
-		options: [
-			{
-				name: 'Create',
-				value: 'create',
-				description: 'Create a contact',
-				action: 'Create a contact',
-			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a contact',
-				action: 'Delete a contact',
-			},
-			{
-				name: 'Get',
-				value: 'get',
-				description: 'Get a contact',
-				action: 'Get a contact',
-			},
-			{
-				name: 'Get Many',
-				value: 'getAll',
-				description: 'Get many contacts',
-				action: 'Get many contacts',
-			},
-			{
-				name: 'Update',
-				value: 'update',
-				description: 'Update a contact',
-				action: 'Update a contact',
-			},
-		],
-		default: 'create',
-	},
-];
-
-export const contactFields: INodeProperties[] = [
-	/* -------------------------------------------------------------------------- */
-	/*                                 contact:create                             */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Email',
-		name: 'email',
-		required: true,
-		type: 'string',
-		placeholder: 'name@email.com',
-		displayOptions: {
-			show: {
-				operation: ['create'],
-				resource: ['contact'],
-			},
-		},
-		default: '',
-		description: 'The email address of the contact',
-	},
-	{
-		displayName: 'List Name or ID',
-		name: 'listId',
-		required: true,
-		type: 'options',
-		description:
-			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>',
-		typeOptions: {
-			loadOptionsMethod: 'getLists',
-		},
-		displayOptions: {
-			show: {
-				operation: ['create'],
-				resource: ['contact'],
-			},
-		},
-		default: '',
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		displayOptions: {
-			show: {
-				operation: ['create'],
-				resource: ['contact'],
-			},
-		},
-		default: {},
-		placeholder: 'Add Field',
-		options: [
-			{
-				displayName: 'Custom Fields',
-				name: 'customFieldsUi',
-				type: 'fixedCollection',
-				default: {},
-				placeholder: 'Add Custom Field',
-				typeOptions: {
-					multipleValues: true,
-					loadOptionsMethod: 'getCustomFields',
-				},
-				options: [
-					{
-						name: 'customFieldsValues',
-						displayName: 'Custom Field',
-						values: [
-							{
-								displayName: 'Key Name or ID',
-								name: 'key',
-								type: 'options',
-								typeOptions: {
-									loadOptionsMethod: 'getCustomFields',
-								},
-								description:
-									'The end user specified key of the user defined data. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-								default: '',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'string',
-								description: 'The end user specified value of the user defined data',
-								default: '',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'Status',
-				name: 'status',
-				type: 'options',
-				options: [
-					{
-						name: 'Active',
-						value: 'ACTIVE',
-					},
-					{
-						name: 'Banned',
-						value: 'BANNED',
-					},
-					{
-						name: 'Bounced',
-						value: 'BOUNCED',
-					},
-					{
-						name: 'Inactive',
-						value: 'INACTIVE',
-					},
-
-					{
-						name: 'Unsubscribed',
-						value: 'UNSUBSCRIBED',
-					},
-				],
-				default: '',
-				description:
-					'The status of the contact. You can only send email to contacts with ACTIVE status.',
-			},
-			{
-				displayName: 'Tag Names or IDs',
-				name: 'tags',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getTags',
-				},
-				default: [],
-				description:
-					'The tags you want to set to the contact. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-			},
-		],
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                                 contact:delete                             */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Contact ID',
-		name: 'contactId',
-		required: true,
-		type: 'string',
-		displayOptions: {
-			show: {
-				operation: ['delete'],
-				resource: ['contact'],
-			},
-		},
-		default: '',
-		description: 'Can be ID or email',
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                                 contact:get                                */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Contact ID',
-		name: 'contactId',
-		required: true,
-		type: 'string',
-		displayOptions: {
-			show: {
-				operation: ['get'],
-				resource: ['contact'],
-			},
-		},
-		default: '',
-		description: 'Can be ID or email',
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                                 contact:getAll                         */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'List Name or ID',
-		name: 'listId',
-		required: true,
-		type: 'options',
-		description:
-			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>',
-		typeOptions: {
-			loadOptionsMethod: 'getLists',
-		},
-		displayOptions: {
-			show: {
-				operation: ['getAll'],
-				resource: ['contact'],
-			},
-		},
-		default: '',
-	},
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				operation: ['getAll'],
-				resource: ['contact'],
-			},
-		},
-		default: false,
-		description: 'Whether to return all results or only up to a given limit',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				operation: ['getAll'],
-				resource: ['contact'],
-				returnAll: [false],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 500,
-		},
-		default: 100,
-		description: 'Max number of results to return',
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		displayOptions: {
-			show: {
-				operation: ['getAll'],
-				resource: ['contact'],
-			},
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'Direction',
-				name: 'direction',
-				type: 'options',
-				options: [
-					{
-						name: 'ASC',
-						value: 'asc',
-					},
-					{
-						name: 'DESC',
-						value: 'desc',
-					},
-				],
-				default: 'desc',
-				description:
-					'Defines the direction in which search results are ordered. Default value is DESC. Note: It has to be using with the Sort By parameter',
-			},
-			{
-				displayName: 'Fields',
-				name: 'fields',
-				type: 'string',
-				default: '',
-				description: 'A comma-separated list of attributes to include in the response',
-			},
-			{
-				displayName: 'Sort By',
-				name: 'sortBy',
-				type: 'string',
-				default:
-					'Defines the field in which search results are sort by. Note: It has to be using with the Direcction parameter',
-			},
-		],
-	},
-
-	/* -------------------------------------------------------------------------- */
-	/*                                 contact:update                             */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Email',
-		name: 'email',
-		required: true,
-		type: 'string',
-		placeholder: 'name@email.com',
-		displayOptions: {
-			show: {
-				operation: ['update'],
-				resource: ['contact'],
-			},
-		},
-		default: '',
-	},
-	{
-		displayName: 'Update Fields',
-		name: 'updateFields',
-		type: 'collection',
-		displayOptions: {
-			show: {
-				operation: ['update'],
-				resource: ['contact'],
-			},
-		},
-		default: {},
-		placeholder: 'Add Field',
-		options: [
-			{
-				displayName: 'Add Tag Names or IDs',
-				name: 'addTags',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getTags',
-				},
-				default: [],
-				description:
-					'The tags you want to add to the contact. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Custom Fields',
-				name: 'customFieldsUi',
-				type: 'fixedCollection',
-				default: {},
-				placeholder: 'Add Custom Field',
-				typeOptions: {
-					multipleValues: true,
-					loadOptionsMethod: 'getCustomFields',
-				},
-				options: [
-					{
-						name: 'customFieldsValues',
-						displayName: 'Custom Field',
-						values: [
-							{
-								displayName: 'Key Name or ID',
-								name: 'key',
-								type: 'options',
-								typeOptions: {
-									loadOptionsMethod: 'getCustomFields',
-								},
-								description:
-									'The end user specified key of the user defined data. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-								default: '',
-							},
-							{
-								displayName: 'Value',
-								name: 'value',
-								type: 'string',
-								description: 'The end user specified value of the user defined data',
-								default: '',
-							},
-						],
-					},
-				],
-			},
-			{
-				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-wrong-for-dynamic-multi-options
-				displayName: 'Remove Tags',
-				name: 'removeTags',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getTags',
-				},
-				default: [],
-				description:
-					'The tags you want to add to the contact. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Status',
-				name: 'status',
-				type: 'options',
-				options: [
-					{
-						name: 'Active',
-						value: 'ACTIVE',
-					},
-					{
-						name: 'Banned',
-						value: 'BANNED',
-					},
-					{
-						name: 'Bounced',
-						value: 'BOUNCED',
-					},
-					{
-						name: 'Inactive',
-						value: 'INACTIVE',
-					},
-					{
-						name: 'Unsubscribed',
-						value: 'UNSUBSCRIBED',
-					},
-				],
-				default: '',
-				description:
-					'The status of the contact. You can only send email to contacts with ACTIVE status.',
-			},
-			{
-				displayName: 'Tag Names or IDs',
-				name: 'tags',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getTags',
-				},
-				default: [],
-				description:
-					'The tags you want to set to the contact. Will replace all existing ones. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-			},
-		],
-	},
-];
diff --git a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
deleted file mode 100644
index fca83ab1ca5..00000000000
--- a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-import type {
-	IExecuteFunctions,
-	ILoadOptionsFunctions,
-	IDataObject,
-	JsonObject,
-	IRequestOptions,
-	IHttpRequestMethods,
-} from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-export async function automizyApiRequest(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
-	method: IHttpRequestMethods,
-	path: string,
-
-	body: any = {},
-	qs: IDataObject = {},
-	option = {},
-): Promise<any> {
-	const credentials = await this.getCredentials<{ apiToken: string }>('automizyApi');
-
-	const options: IRequestOptions = {
-		headers: {
-			Authorization: `Bearer ${credentials.apiToken}`,
-		},
-		method,
-		body,
-		qs,
-		uri: `https://gateway.automizy.com/v2${path}`,
-		json: true,
-	};
-
-	try {
-		if (Object.keys(body as IDataObject).length === 0) {
-			delete options.body;
-		}
-		if (Object.keys(qs).length === 0) {
-			delete options.qs;
-		}
-		if (Object.keys(option).length !== 0) {
-			Object.assign(options, option);
-		}
-		return await this.helpers.request.call(this, options);
-	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
-	}
-}
-
-export async function automizyApiRequestAllItems(
-	this: IExecuteFunctions | ILoadOptionsFunctions,
-	propertyName: string,
-	method: IHttpRequestMethods,
-	endpoint: string,
-
-	body: any = {},
-	query: IDataObject = {},
-): Promise<any> {
-	const returnData: IDataObject[] = [];
-
-	let responseData;
-	query.limit = 100;
-	query.page = 1;
-	do {
-		responseData = await automizyApiRequest.call(this, method, endpoint, body, query);
-		query.page++;
-		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
-	} while (responseData.pageCount !== responseData.page);
-
-	return returnData;
-}
diff --git a/packages/nodes-base/nodes/Automizy/ListDescription.ts b/packages/nodes-base/nodes/Automizy/ListDescription.ts
deleted file mode 100644
index 45afbcb915b..00000000000
--- a/packages/nodes-base/nodes/Automizy/ListDescription.ts
+++ /dev/null
@@ -1,209 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const listOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		displayOptions: {
-			show: {
-				resource: ['list'],
-			},
-		},
-		options: [
-			{
-				name: 'Create',
-				value: 'create',
-				description: 'Create a list',
-				action: 'Create a list',
-			},
-			{
-				name: 'Delete',
-				value: 'delete',
-				description: 'Delete a list',
-				action: 'Delete a list',
-			},
-			{
-				name: 'Get',
-				value: 'get',
-				description: 'Get a list',
-				action: 'Get a list',
-			},
-			{
-				name: 'Get Many',
-				value: 'getAll',
-				description: 'Get many lists',
-				action: 'Get many lists',
-			},
-			{
-				name: 'Update',
-				value: 'update',
-				description: 'Update a list',
-				action: 'Update a list',
-			},
-		],
-		default: 'create',
-	},
-];
-
-export const listFields: INodeProperties[] = [
-	/* -------------------------------------------------------------------------- */
-	/*                                 list:create                                */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Name',
-		name: 'name',
-		required: true,
-		type: 'string',
-		displayOptions: {
-			show: {
-				operation: ['create'],
-				resource: ['list'],
-			},
-		},
-		default: '',
-	},
-	/* -------------------------------------------------------------------------- */
-	/*                                 list:delete                                */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'List ID',
-		name: 'listId',
-		required: true,
-		type: 'string',
-		displayOptions: {
-			show: {
-				operation: ['delete'],
-				resource: ['list'],
-			},
-		},
-		default: '',
-	},
-	/* -------------------------------------------------------------------------- */
-	/*                                 list:get                                   */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'List ID',
-		name: 'listId',
-		required: true,
-		type: 'string',
-		displayOptions: {
-			show: {
-				operation: ['get'],
-				resource: ['list'],
-			},
-		},
-		default: '',
-	},
-	/* -------------------------------------------------------------------------- */
-	/*                                 contact:getAll                             */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		displayOptions: {
-			show: {
-				operation: ['getAll'],
-				resource: ['list'],
-			},
-		},
-		default: false,
-		description: 'Whether to return all results or only up to a given limit',
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		displayOptions: {
-			show: {
-				operation: ['getAll'],
-				resource: ['list'],
-				returnAll: [false],
-			},
-		},
-		typeOptions: {
-			minValue: 1,
-			maxValue: 500,
-		},
-		default: 100,
-		description: 'Max number of results to return',
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		displayOptions: {
-			show: {
-				operation: ['getAll'],
-				resource: ['list'],
-			},
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'Direction',
-				name: 'direction',
-				type: 'options',
-				options: [
-					{
-						name: 'ASC',
-						value: 'asc',
-					},
-					{
-						name: 'DESC',
-						value: 'desc',
-					},
-				],
-				default: 'desc',
-				description:
-					'Defines the direction in which search results are ordered. Default value is DESC. Note: It has to be using with the Sort By parameter',
-			},
-			{
-				displayName: 'Fields',
-				name: 'fields',
-				type: 'string',
-				default: '',
-				description: 'A comma-separated list of attributes to include in the response',
-			},
-			{
-				displayName: 'Sort By',
-				name: 'sortBy',
-				type: 'string',
-				default:
-					'Defines the field in which search results are sort by. Note: It has to be using with the Direcction parameter',
-			},
-		],
-	},
-	/* -------------------------------------------------------------------------- */
-	/*                                 list:update                                */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'List ID',
-		name: 'listId',
-		required: true,
-		type: 'string',
-		displayOptions: {
-			show: {
-				operation: ['update'],
-				resource: ['list'],
-			},
-		},
-		default: '',
-	},
-	{
-		displayName: 'Name',
-		name: 'name',
-		required: true,
-		type: 'string',
-		displayOptions: {
-			show: {
-				operation: ['update'],
-				resource: ['list'],
-			},
-		},
-		default: '',
-	},
-];
diff --git a/packages/nodes-base/nodes/Automizy/automizy.png b/packages/nodes-base/nodes/Automizy/automizy.png
deleted file mode 100644
index d8e3a5396a797d422e17b8053134ce61dedc5117..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1790
zcmV<a1_AkrP)<h;3K|Lk000e1NJLTq002Ay002A)0{{R34I(K(0007ZP)t-s0002^
zf+F{VA@_qK{Oif}gCp~;bNAu9{N}**iZAn;Oa17=_vXm{?alRo9`%DG^@Jt#hbr}v
zJN1-7^_fZard;-)QTNK5`OlsD)T;U6y8GX@{pG^=)~ob^AohkR_J=C;iZAqvFZGNz
z^Nl$4oK5tbO7@>o^qo-kqE_^&Wb(6i^sQ_8v~l;idHBDA_Qj0%ux|CfgZajg`NfL+
z)usE=qxr>-``oem>BskiBJ_$e@`o()iZS$qB=e3q^o=$1kv;Q`H1(1`^`B4mno0Db
zR`HZU^_@@nhbHr!OZ1*l^`~F*sAToAYWA&V^qWrju4wbNc=xh!_PBZQt#tLWa`(1*
z_q~7miY)Y~UiP(j_M=tzzk>L^fcUp}^1O)l%$WMai}tyC^UIs{!;ka4g!s^)^v9a{
zxqJH7qxZ*@`PQcR$dUWlt^3ZL`PZoX-mm<^iu>TS{Mxkq=fU>AiTlQj^@Abvh%fbt
zE%k#Y^n@Y#f+6&eG4_)^@SR8UjyUs>Kl7JG^prvKk~#W{EBcHt@SsuomOS;QT=|<s
z_M=$xom2ItUGS({_Nrp>scHDIZStjL@T6e$sAcu3X7;dU_`ikptZw(PZuYim`;9gH
zi!k=goA|<t`o@j+uygslbnUBl_`81S!JhWCZv54a_JSezf*|&O8uon}_Jbq%f*<yQ
zANPPA_k9-je;oIH82ExA_kkbvfFJgM9`t`5_I()ke;W9H8ufV-_Iw!id=~V9Blvw9
z_Inoif+P2S8Tfn_^MD}sfF1dO9Ql42`GFtzfFJXI9rS%0_<R`jd>8k568L)+@`WY&
zeH#iufKvbf0H}0QPE!Ew?d=Qxi3kJgyb}fj{QLRy+|kRfu0t*$9U2b}`}g(k<>KAV
z!@#+yo0O1&e0FkgVqsW4DkT;K`|<1P=;!9+*w)6y#KgY6wyme7ot&JNjf;qehJk*5
zcz1SgX=Y_zU0qdEPfkuuNk~ILK07usEGi`-783pN@a^sG;@#8J(9h1!#>2w9wzjXR
zp_`YMl#q~&gnW8-baHZXaB65{UszE@B_HS5oTdN(1CL2WK~zY`?UiMB6fqQrTiB&+
zp>EJpDpV;@DwN{x?(XjH?(XgmnT+ksj;(KZ>jwNIwoL{*nNmK&>HF!uNuDI<<|Ya0
zP>23C4KAKN@#OJinYpu95B@tc>|J7-s?t2mR@15wombMm{p{vA+QD-6DrmP0l@6Yz
z>(6g$Cz_I2?_fnf>&Ei+ACfjKotmjQDCoJ>t3B+VtfpGQleaNdZ#YyuN#>})q@I6f
zw-5INcg~<+8{dz$GXAXne`5Dp9Fj6O?DyvK1e&TjliW7jE!N9=){%M&T$Gp{)+Rj5
z4U`gc*GwO19MBfKvyyf9GwADj*~<0aZOjgtPy^#ldX!u=ZOWAVH>uy_Odf_C!$~So
zw(1it8!kXI@WQdH_3o#zHgb?5+&4gvkHDFmO7noB8q`W(!(7~L8ds$y7*=#2PJE4h
zf{(H>oSax%n(uMyd0JuRVvI^<hg^Lm1=&{`05%Xgu*I*B)bmsxBe@C<;36pI;th_0
z3;=eVo~zEuc*J!L#&;#dx9LWFP8<Bebt?i3QM5&nlaSk}vhpr6d_{3AN3K6jQJ{i;
zfO8S+oTIxctuGnA2&fmx-4g)-jBv_?=W>q17jl5Bc327#zQj?_k?Yq2+kmneg*`m(
zwb(^b;#wknO>rzm?s4#-f;gRkD>L4ihsT8by_1RXJg+zlxm_Hn2*Q%(5Q<mPL(7mW
z(Li(=30`IQ<AaFE78wwfs~Fc?hO-d6(L8)eg7-%8(fjcAimYpa)d_mxHpk)fz3bvf
zr;;w+S)T5X{o;nYmW}uBfx>O7unoDbm6DJ|T6(ct?$ZnVXXXHF1Mc}K>K@xX2fH}C
zH=hKTMYGz#@0C6+T?Y0s_^1~-^=XSBmrlGLH?4BUfgeB4+a*iZ;lE;kn)@YkpN8@9
z5eYtEacDW@uO+uR9J|D?LR<uC$ciS$dWQ(Fgi$zoYZPfH@j;20?gXysCPL50C~+Bb
zDe0VRCUF5%j*p_p?;#YyVf#3=*`8@EZ!viG!+n$%v#|X4_W4#;E^T#%kYSk+vQlT%
zS4)9W_qQDU`B7dIBiZ;7+k<vf24_PsIX5FTimUNhF3ecarBw?GPOEihhN=ECu^_uj
zp=`p@5JM%;8%Yahj&H27B7OEsW&q3#2R}oKsgRm*DUo&X$+^y*LPJAOgtn?PQYWmD
gi$Xfoq5oaq07D*92(>XPxc~qF07*qoM6N<$f|g&;fdBvi

diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.json b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.json
deleted file mode 100644
index 355a528a4c1..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"node": "n8n-nodes-base.crowdDev",
-	"nodeVersion": "1.0",
-	"codexVersion": "1.0",
-	"categories": ["Productivity"],
-	"resources": {
-		"credentialDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/credentials/crowddev/"
-			}
-		],
-		"primaryDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.crowddev/"
-			}
-		]
-	}
-}
diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts b/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
deleted file mode 100644
index 0a043feaab6..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/CrowdDev.node.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
-import { NodeConnectionTypes } from 'n8n-workflow';
-
-import { allProperties } from './descriptions';
-
-export class CrowdDev implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'crowd.dev',
-		name: 'crowdDev',
-		icon: { light: 'file:crowdDev.svg', dark: 'file:crowdDev.dark.svg' },
-		group: ['transform'],
-		version: 1,
-		subtitle: '={{ $parameter["operation"] + ": " + $parameter["resource"] }}',
-		description:
-			'crowd.dev is an open-source suite of community and data tools built to unlock community-led growth for your organization.',
-		defaults: {
-			name: 'crowd.dev',
-		},
-		usableAsTool: true,
-		inputs: [NodeConnectionTypes.Main],
-		outputs: [NodeConnectionTypes.Main],
-		credentials: [
-			{
-				name: 'crowdDevApi',
-				required: true,
-			},
-		],
-		requestDefaults: {
-			baseURL: '={{$credentials.url}}/api/tenant/{{$credentials.tenantId}}',
-			json: true,
-			skipSslCertificateValidation: '={{ $credentials.allowUnauthorizedCerts }}',
-		},
-		properties: allProperties,
-	};
-}
diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.json b/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.json
deleted file mode 100644
index 7de680900e7..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"node": "n8n-nodes-base.crowdDevTrigger",
-	"nodeVersion": "1.0",
-	"codexVersion": "1.0",
-	"categories": ["Productivity"],
-	"resources": {
-		"credentialDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/credentials/crowddev/"
-			}
-		],
-		"primaryDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/trigger-nodes/n8n-nodes-base.crowddevtrigger/"
-			}
-		]
-	}
-}
diff --git a/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.ts b/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.ts
deleted file mode 100644
index 1930fe7e367..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/CrowdDevTrigger.node.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-import {
-	type IHookFunctions,
-	type IWebhookFunctions,
-	type INodeType,
-	type INodeTypeDescription,
-	type IWebhookResponseData,
-	type IHttpRequestOptions,
-	NodeConnectionTypes,
-} from 'n8n-workflow';
-
-interface ICrowdDevCreds {
-	url: string;
-	tenantId: string;
-	token: string;
-	allowUnauthorizedCerts: boolean;
-}
-
-const credsName = 'crowdDevApi';
-
-const getCreds = async (hookFns: IHookFunctions) =>
-	hookFns.getCredentials(credsName) as unknown as ICrowdDevCreds;
-
-const createRequest = (
-	creds: ICrowdDevCreds,
-	opts: Partial<IHttpRequestOptions>,
-): IHttpRequestOptions => {
-	const defaults: IHttpRequestOptions = {
-		baseURL: `${creds.url}/api/tenant/${creds.tenantId}`,
-		url: '',
-		json: true,
-		skipSslCertificateValidation: creds.allowUnauthorizedCerts,
-	};
-	return Object.assign(defaults, opts);
-};
-
-export class CrowdDevTrigger implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'crowd.dev Trigger',
-		name: 'crowdDevTrigger',
-		icon: { light: 'file:crowdDev.svg', dark: 'file:crowdDev.dark.svg' },
-		group: ['trigger'],
-		version: 1,
-		description: 'Starts the workflow when crowd.dev events occur.',
-		defaults: {
-			name: 'crowd.dev Trigger',
-		},
-		inputs: [],
-		outputs: [NodeConnectionTypes.Main],
-		credentials: [
-			{
-				name: 'crowdDevApi',
-				required: true,
-			},
-		],
-		webhooks: [
-			{
-				name: 'default',
-				httpMethod: 'POST',
-				responseMode: 'onReceived',
-				path: 'webhook',
-			},
-		],
-		properties: [
-			{
-				displayName: 'Trigger',
-				name: 'trigger',
-				description: 'What will trigger an automation',
-				type: 'options',
-				required: true,
-				default: 'new_activity',
-				options: [
-					{
-						name: 'New Activity',
-						value: 'new_activity',
-					},
-					{
-						name: 'New Member',
-						value: 'new_member',
-					},
-				],
-			},
-		],
-	};
-
-	webhookMethods = {
-		default: {
-			async checkExists(this: IHookFunctions): Promise<boolean> {
-				const creds = await getCreds(this);
-				const webhookData = this.getWorkflowStaticData('node');
-				const webhookUrl = this.getNodeWebhookUrl('default') as string;
-
-				if (webhookData.webhookId !== undefined) {
-					try {
-						const options = createRequest(creds, {
-							url: `/automation/${webhookData.webhookId}`,
-							method: 'GET',
-						});
-						const data = await this.helpers.httpRequestWithAuthentication.call(
-							this,
-							credsName,
-							options,
-						);
-						if (data.settings.url === webhookUrl) {
-							return true;
-						}
-					} catch (error) {
-						return false;
-					}
-				}
-
-				// If it did not error then the webhook exists
-				return false;
-			},
-
-			async create(this: IHookFunctions): Promise<boolean> {
-				const creds = await getCreds(this);
-				const webhookData = this.getWorkflowStaticData('node');
-				const webhookUrl = this.getNodeWebhookUrl('default') as string;
-				const params = {
-					trigger: this.getNodeParameter('trigger') as string,
-				};
-
-				const options = createRequest(creds, {
-					url: '/automation',
-					method: 'POST',
-					body: {
-						data: {
-							settings: {
-								url: webhookUrl,
-							},
-							type: 'webhook',
-							trigger: params.trigger,
-						},
-					},
-				});
-
-				const responseData = await this.helpers.httpRequestWithAuthentication.call(
-					this,
-					'crowdDevApi',
-					options,
-				);
-				if (responseData === undefined || responseData.id === undefined) {
-					// Required data is missing so was not successful
-					return false;
-				}
-
-				webhookData.webhookId = responseData.id as string;
-
-				return true;
-			},
-
-			async delete(this: IHookFunctions): Promise<boolean> {
-				const creds = await getCreds(this);
-				const webhookData = this.getWorkflowStaticData('node');
-
-				if (webhookData.webhookId !== undefined) {
-					try {
-						const options = createRequest(creds, {
-							url: `/automation/${webhookData.webhookId}`,
-							method: 'DELETE',
-						});
-						await this.helpers.httpRequestWithAuthentication.call(this, credsName, options);
-					} catch (error) {
-						return false;
-					}
-
-					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registered anymore
-					delete webhookData.webhookId;
-					delete webhookData.webhookEvents;
-					delete webhookData.hookSecret;
-				}
-
-				return true;
-			},
-		},
-	};
-
-	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
-		const bodyData = this.getBodyData();
-
-		return {
-			workflowData: [this.helpers.returnJsonArray(bodyData)],
-		};
-	}
-}
diff --git a/packages/nodes-base/nodes/CrowdDev/GenericFunctions.ts b/packages/nodes-base/nodes/CrowdDev/GenericFunctions.ts
deleted file mode 100644
index 946f4b68e0c..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/GenericFunctions.ts
+++ /dev/null
@@ -1,221 +0,0 @@
-import type { IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
-
-const addOptName = 'additionalOptions';
-
-const getAllParams = (execFns: IExecuteSingleFunctions): Record<string, unknown> => {
-	const params = execFns.getNode().parameters;
-	const keys = Object.keys(params);
-	const paramsWithValues = keys
-		.filter((i) => i !== addOptName)
-		.map((name) => [name, execFns.getNodeParameter(name)]);
-
-	const paramsWithValuesObj = Object.fromEntries(paramsWithValues);
-
-	if (keys.includes(addOptName)) {
-		const additionalOptions = execFns.getNodeParameter(addOptName);
-		return Object.assign(paramsWithValuesObj, additionalOptions);
-	}
-
-	return paramsWithValuesObj;
-};
-
-const formatParams = (
-	obj: Record<string, unknown>,
-	filters?: { [paramName: string]: (value: any) => boolean },
-	mappers?: { [paramName: string]: (value: any) => any },
-) => {
-	return Object.fromEntries(
-		Object.entries(obj)
-			.filter(([name, value]) => !filters || (name in filters ? filters[name](value) : false))
-			.map(([name, value]) =>
-				!mappers || !(name in mappers) ? [name, value] : [name, mappers[name](value)],
-			),
-	);
-};
-
-const objectFromProps = (src: any, props: string[]) => {
-	const result = props.filter((p) => src.hasOwnProperty(p)).map((p) => [p, src[p]]);
-	return Object.fromEntries(result);
-};
-
-const idFn = (i: any) => i;
-
-const keyValueToObj = (arr: any[]) => {
-	const obj: any = {};
-	arr.forEach((item) => {
-		obj[item.key] = item.value;
-	});
-	return obj;
-};
-
-const transformSingleProp = (prop: string) => (values: any) =>
-	(values.itemChoice || []).map((i: any) => i[prop]);
-
-export async function activityPresend(
-	this: IExecuteSingleFunctions,
-	opts: IHttpRequestOptions,
-): Promise<IHttpRequestOptions> {
-	const params = getAllParams(this);
-	const isCreateWithMember = params.operation === 'createWithMember';
-	const isCreateForMember = params.operation === 'createForMember';
-
-	if (isCreateWithMember) {
-		// Move following props into "member" subproperty
-		const memberProps = ['displayName', 'emails', 'joinedAt', 'username'];
-		params.member = objectFromProps(params, memberProps);
-		memberProps.forEach((p) => delete params[p]);
-	}
-	opts.body = formatParams(
-		params,
-		{
-			member: (v) => (isCreateWithMember || isCreateForMember) && v,
-			type: idFn,
-			timestamp: idFn,
-			platform: idFn,
-			title: idFn,
-			body: idFn,
-			channel: idFn,
-			sourceId: idFn,
-			sourceParentId: idFn,
-		},
-		{
-			member: (v) =>
-				typeof v === 'object'
-					? formatParams(
-							v as Record<string, unknown>,
-							{
-								username: (un) => un.itemChoice,
-								displayName: idFn,
-								emails: idFn,
-								joinedAt: idFn,
-							},
-							{
-								username: (un) => keyValueToObj(un.itemChoice as any[]),
-								emails: transformSingleProp('email'),
-							},
-						)
-					: v,
-		},
-	);
-	return opts;
-}
-
-export async function automationPresend(
-	this: IExecuteSingleFunctions,
-	opts: IHttpRequestOptions,
-): Promise<IHttpRequestOptions> {
-	const params = getAllParams(this);
-	opts.body = {
-		data: {
-			settings: {
-				url: params.url,
-			},
-			type: 'webhook',
-			trigger: params.trigger,
-		},
-	};
-	return opts;
-}
-
-export async function memberPresend(
-	this: IExecuteSingleFunctions,
-	opts: IHttpRequestOptions,
-): Promise<IHttpRequestOptions> {
-	const params = getAllParams(this);
-	opts.body = formatParams(
-		params,
-		{
-			platform: idFn,
-			username: idFn,
-			displayName: idFn,
-			emails: (i) => i.itemChoice,
-			joinedAt: idFn,
-			organizations: (i) => i.itemChoice,
-			tags: (i) => i.itemChoice,
-			tasks: (i) => i.itemChoice,
-			notes: (i) => i.itemChoice,
-			activities: (i) => i.itemChoice,
-		},
-		{
-			emails: transformSingleProp('email'),
-			organizations: (i) =>
-				i.itemChoice.map((org: any) =>
-					formatParams(
-						org as Record<string, unknown>,
-						{
-							name: idFn,
-							url: idFn,
-							description: idFn,
-							logo: idFn,
-							employees: idFn,
-							members: (j) => j.itemChoice,
-						},
-						{
-							members: transformSingleProp('member'),
-						},
-					),
-				),
-			tags: transformSingleProp('tag'),
-			tasks: transformSingleProp('task'),
-			notes: transformSingleProp('note'),
-			activities: transformSingleProp('activity'),
-		},
-	);
-	return opts;
-}
-
-export async function notePresend(
-	this: IExecuteSingleFunctions,
-	opts: IHttpRequestOptions,
-): Promise<IHttpRequestOptions> {
-	const params = getAllParams(this);
-	opts.body = {
-		body: params.body,
-	};
-	return opts;
-}
-
-export async function organizationPresend(
-	this: IExecuteSingleFunctions,
-	opts: IHttpRequestOptions,
-): Promise<IHttpRequestOptions> {
-	const params = getAllParams(this);
-	opts.body = formatParams(
-		params,
-		{
-			name: idFn,
-			url: idFn,
-			description: idFn,
-			logo: idFn,
-			employees: idFn,
-			members: (j) => j.itemChoice,
-		},
-		{
-			members: transformSingleProp('member'),
-		},
-	);
-	return opts;
-}
-
-export async function taskPresend(
-	this: IExecuteSingleFunctions,
-	opts: IHttpRequestOptions,
-): Promise<IHttpRequestOptions> {
-	const params = getAllParams(this);
-	opts.body = formatParams(
-		params,
-		{
-			name: idFn,
-			body: idFn,
-			status: idFn,
-			members: (i) => i.itemChoice,
-			activities: (i) => i.itemChoice,
-			assigneess: idFn,
-		},
-		{
-			members: transformSingleProp('member'),
-			activities: transformSingleProp('activity'),
-		},
-	);
-	return opts;
-}
diff --git a/packages/nodes-base/nodes/CrowdDev/crowdDev.dark.svg b/packages/nodes-base/nodes/CrowdDev/crowdDev.dark.svg
deleted file mode 100644
index d991be4a157..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/crowdDev.dark.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.98031 18.869L1.09895 19.6237C0.513106 19.7377 0.156828 20.3361 0.33589 20.9054L6.12131 39.3001C6.25233 39.7166 6.63853 40 7.07524 40H11.7928C12.2265 40 12.6108 39.7205 12.7443 39.3078L17.7861 23.7241C17.8458 23.5396 18.0175 23.4147 18.2114 23.4147C18.4052 23.4147 18.577 23.5396 18.6367 23.7241L23.6785 39.3079C23.812 39.7205 24.1963 40 24.6299 40H29.2063C29.6327 40 30.0121 39.7297 30.1514 39.3267L38.5658 14.9853C38.7903 14.3358 38.3079 13.6586 37.6207 13.6586H32.9392C32.4975 13.6586 32.1082 13.9482 31.9813 14.3712L27.4348 29.5263C27.3649 29.7592 27.1506 29.9187 26.9074 29.9187C26.6673 29.9187 26.4548 29.7631 26.3824 29.5342L21.6843 14.6822C21.5528 14.2664 21.167 13.9838 20.7309 13.9838H15.8474C15.4147 13.9838 15.0311 14.2621 14.8968 14.6734L9.99413 29.6877C9.94914 29.8255 9.82064 29.9187 9.67569 29.9187C9.52988 29.9187 9.40082 29.8244 9.35653 29.6855L6.12393 19.5469C5.96983 19.0636 5.47827 18.7722 4.98031 18.869Z" fill="white"/>
-<path d="M13.1484 7.93724L13.8618 1.16006C13.926 0.550249 14.5189 0.141305 15.1117 0.297905L21.9947 2.11606C22.3659 2.21411 22.6482 2.51598 22.7211 2.89288L23.3857 6.32679C23.4913 6.87232 23.1319 7.39931 22.5855 7.50019L14.3245 9.02531C13.6674 9.14662 13.0785 8.60175 13.1484 7.93724Z" fill="#E94F2E"/>
-</svg>
diff --git a/packages/nodes-base/nodes/CrowdDev/crowdDev.svg b/packages/nodes-base/nodes/CrowdDev/crowdDev.svg
deleted file mode 100644
index 80971d75732..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/crowdDev.svg
+++ /dev/null
@@ -1,4 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.98031 18.869L1.09895 19.6237C0.513106 19.7377 0.156828 20.3361 0.33589 20.9054L6.12131 39.3001C6.25233 39.7166 6.63853 40 7.07524 40H11.7928C12.2265 40 12.6108 39.7205 12.7443 39.3078L17.7861 23.7241C17.8458 23.5396 18.0175 23.4147 18.2114 23.4147C18.4052 23.4147 18.577 23.5396 18.6367 23.7241L23.6785 39.3079C23.812 39.7205 24.1963 40 24.6299 40H29.2063C29.6327 40 30.0121 39.7297 30.1514 39.3267L38.5658 14.9853C38.7903 14.3358 38.3079 13.6586 37.6207 13.6586H32.9392C32.4975 13.6586 32.1082 13.9482 31.9813 14.3712L27.4348 29.5263C27.3649 29.7592 27.1506 29.9187 26.9074 29.9187C26.6673 29.9187 26.4548 29.7631 26.3824 29.5342L21.6843 14.6822C21.5528 14.2664 21.167 13.9838 20.7309 13.9838H15.8474C15.4147 13.9838 15.0311 14.2621 14.8968 14.6734L9.99413 29.6877C9.94914 29.8255 9.82064 29.9187 9.67569 29.9187C9.52988 29.9187 9.40082 29.8244 9.35653 29.6855L6.12393 19.5469C5.96983 19.0636 5.47827 18.7722 4.98031 18.869Z" fill="#140505"/>
-<path d="M13.1484 7.93724L13.8618 1.16006C13.926 0.550249 14.5189 0.141305 15.1117 0.297905L21.9947 2.11606C22.3659 2.21411 22.6482 2.51598 22.7211 2.89288L23.3857 6.32679C23.4913 6.87232 23.1319 7.39931 22.5855 7.50019L14.3245 9.02531C13.6674 9.14662 13.0785 8.60175 13.1484 7.93724Z" fill="#E94F2E"/>
-</svg>
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts
deleted file mode 100644
index 9ca7575474c..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/activityFields.ts
+++ /dev/null
@@ -1,187 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-import { emailsField } from './shared';
-import { getAdditionalOptions, mapWith, showFor } from './utils';
-import { activityPresend } from '../GenericFunctions';
-
-const displayOpts = showFor(['activity']);
-
-const displayFor = {
-	resource: displayOpts(),
-	createWithMember: displayOpts(['createWithMember']),
-	createForMember: displayOpts(['createForMember']),
-};
-
-const activityOperations: INodeProperties = {
-	displayName: 'Operation',
-	name: 'operation',
-	type: 'options',
-	displayOptions: displayFor.resource.displayOptions,
-	noDataExpression: true,
-	default: 'createWithMember',
-	options: [
-		{
-			name: 'Create or Update with a Member',
-			value: 'createWithMember',
-			description: 'Create or update an activity with a member',
-			action: 'Create or update an activity with a member',
-			routing: {
-				send: { preSend: [activityPresend] },
-				request: {
-					method: 'POST',
-					url: '/activity/with-member',
-				},
-			},
-		},
-		{
-			name: 'Create',
-			value: 'createForMember',
-			description: 'Create an activity for a member',
-			action: 'Create an activity for a member',
-			routing: {
-				send: { preSend: [activityPresend] },
-				request: {
-					method: 'POST',
-					url: '/activity',
-				},
-			},
-		},
-	],
-};
-
-const createWithMemberFields: INodeProperties[] = [
-	{
-		displayName: 'Username',
-		name: 'username',
-		type: 'fixedCollection',
-		typeOptions: {
-			multipleValues: true,
-		},
-		required: true,
-		default: {},
-		options: [
-			{
-				displayName: 'Item Choice',
-				name: 'itemChoice',
-				values: [
-					{
-						displayName: 'Platform',
-						description: 'Platform name (e.g twitter, github, etc)',
-						name: 'key',
-						type: 'string',
-						required: true,
-						default: '',
-					},
-					{
-						displayName: 'Username',
-						description: 'Username at the specified Platform',
-						name: 'value',
-						type: 'string',
-						required: true,
-						default: '',
-					},
-				],
-			},
-		],
-	},
-	{
-		displayName: 'displayName',
-		name: 'displayName',
-		description: 'UI friendly name of the member',
-		type: 'string',
-		default: '',
-	},
-	emailsField,
-	{
-		displayName: 'Joined At',
-		name: 'joinedAt',
-		description: 'Date of joining the community',
-		type: 'dateTime',
-		default: '',
-	},
-];
-
-const memberIdField: INodeProperties = {
-	displayName: 'Member',
-	name: 'member',
-	description: 'The ID of the member that performed the activity',
-	type: 'string',
-	required: true,
-	default: '',
-};
-
-const createCommonFields: INodeProperties[] = [
-	{
-		displayName: 'Type',
-		name: 'type',
-		description: 'Type of activity',
-		type: 'string',
-		required: true,
-		default: '',
-	},
-	{
-		displayName: 'Timestamp',
-		name: 'timestamp',
-		description: 'Date and time when the activity took place',
-		type: 'dateTime',
-		required: true,
-		default: '',
-	},
-	{
-		displayName: 'Platform',
-		name: 'platform',
-		description: 'Platform on which the activity took place',
-		type: 'string',
-		required: true,
-		default: '',
-	},
-	{
-		displayName: 'Source ID',
-		name: 'sourceId',
-		description: 'The ID of the activity in the platform (e.g. the ID of the message in Discord)',
-		type: 'string',
-		required: true,
-		default: '',
-	},
-];
-
-const additionalOptions: INodeProperties[] = [
-	{
-		displayName: 'Title',
-		name: 'title',
-		description: 'Title of the activity',
-		type: 'string',
-		default: '',
-	},
-	{
-		displayName: 'Body',
-		name: 'body',
-		description: 'Body of the activity',
-		type: 'string',
-		default: '',
-	},
-	{
-		displayName: 'Channel',
-		name: 'channel',
-		description: 'Channel of the activity',
-		type: 'string',
-		default: '',
-	},
-	{
-		displayName: 'Source Parent ID',
-		name: 'sourceParentId',
-		description:
-			'The ID of the parent activity in the platform (e.g. the ID of the parent message in Discord)',
-		type: 'string',
-		default: '',
-	},
-];
-
-const activityFields: INodeProperties[] = [
-	...createWithMemberFields.map(mapWith(displayFor.createWithMember)),
-	Object.assign({}, memberIdField, displayFor.createForMember),
-	...createCommonFields.map(mapWith(displayFor.resource)),
-	Object.assign({}, getAdditionalOptions(additionalOptions), displayFor.resource),
-];
-
-export { activityOperations, activityFields };
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts
deleted file mode 100644
index 3b28bf1de22..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/automationFields.ts
+++ /dev/null
@@ -1,130 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-import { mapWith, showFor } from './utils';
-import { automationPresend } from '../GenericFunctions';
-
-const displayOpts = showFor(['automation']);
-
-const displayFor = {
-	resource: displayOpts(),
-	createOrUpdate: displayOpts(['create', 'update']),
-	id: displayOpts(['destroy', 'find', 'update']),
-};
-
-const automationOperations: INodeProperties = {
-	displayName: 'Operation',
-	name: 'operation',
-	type: 'options',
-	displayOptions: displayFor.resource.displayOptions,
-	noDataExpression: true,
-	default: 'list',
-	options: [
-		{
-			name: 'Create',
-			value: 'create',
-			description: 'Create a new automation for the tenant',
-			action: 'Create a new automation for the tenant',
-			routing: {
-				send: { preSend: [automationPresend] },
-				request: {
-					method: 'POST',
-					url: '/automation',
-				},
-			},
-		},
-		{
-			name: 'Destroy',
-			value: 'destroy',
-			description: 'Destroy an existing automation for the tenant',
-			action: 'Destroy an existing automation for the tenant',
-			routing: {
-				request: {
-					method: 'DELETE',
-					url: '=/automation/{{$parameter["id"]}}',
-				},
-			},
-		},
-		{
-			name: 'Find',
-			value: 'find',
-			description: 'Get an existing automation data for the tenant',
-			action: 'Get an existing automation data for the tenant',
-			routing: {
-				request: {
-					method: 'GET',
-					url: '=/automation/{{$parameter["id"]}}',
-				},
-			},
-		},
-		{
-			name: 'List',
-			value: 'list',
-			description: 'Get all existing automation data for tenant',
-			action: 'Get all existing automation data for tenant',
-			routing: {
-				request: {
-					method: 'GET',
-					url: '/automation',
-				},
-			},
-		},
-		{
-			name: 'Update',
-			value: 'update',
-			description: 'Updates an existing automation for the tenant',
-			action: 'Updates an existing automation for the tenant',
-			routing: {
-				send: { preSend: [automationPresend] },
-				request: {
-					method: 'PUT',
-					url: '=/automation/{{$parameter["id"]}}',
-				},
-			},
-		},
-	],
-};
-
-const idField: INodeProperties = {
-	displayName: 'ID',
-	name: 'id',
-	description: 'The ID of the automation',
-	type: 'string',
-	required: true,
-	default: '',
-};
-
-const commonFields: INodeProperties[] = [
-	{
-		displayName: 'Trigger',
-		name: 'trigger',
-		description: 'What will trigger an automation',
-		type: 'options',
-		required: true,
-		default: 'new_activity',
-		options: [
-			{
-				name: 'New Activity',
-				value: 'new_activity',
-			},
-			{
-				name: 'New Member',
-				value: 'new_member',
-			},
-		],
-	},
-	{
-		displayName: 'URL',
-		name: 'url',
-		description: 'URL to POST webhook data to',
-		type: 'string',
-		required: true,
-		default: '',
-	},
-];
-
-const automationFields: INodeProperties[] = [
-	Object.assign({}, idField, displayFor.id),
-	...commonFields.map(mapWith(displayFor.createOrUpdate)),
-];
-
-export { automationOperations, automationFields };
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
deleted file mode 100644
index 515f7f08552..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/index.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-import { activityOperations, activityFields } from './activityFields';
-import { automationFields, automationOperations } from './automationFields';
-import { memberFields, memberOperations } from './memberFields';
-import { noteFields, noteOperations } from './noteFields';
-import { organizationFields, organizationOperations } from './organizationFields';
-import { resources } from './resources';
-import { taskFields, taskOperations } from './taskFields';
-
-export const allProperties: INodeProperties[] = [
-	resources,
-	activityOperations,
-	memberOperations,
-	noteOperations,
-	organizationOperations,
-	taskOperations,
-	automationOperations,
-	...activityFields,
-	...memberFields,
-	...noteFields,
-	...organizationFields,
-	...taskFields,
-	...automationFields,
-];
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
deleted file mode 100644
index 67a96cff7f7..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/memberFields.ts
+++ /dev/null
@@ -1,276 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-import * as shared from './shared';
-import { getAdditionalOptions, getId, mapWith, showFor } from './utils';
-import { memberPresend } from '../GenericFunctions';
-
-const displayOpts = showFor(['member']);
-
-const displayFor = {
-	resource: displayOpts(),
-	createOrUpdate: displayOpts(['createOrUpdate', 'update']),
-	id: displayOpts(['delete', 'find', 'update']),
-};
-
-const memberOperations: INodeProperties = {
-	displayName: 'Operation',
-	name: 'operation',
-	type: 'options',
-	displayOptions: displayFor.resource.displayOptions,
-	noDataExpression: true,
-	default: 'find',
-	options: [
-		{
-			name: 'Create or Update',
-			value: 'createOrUpdate',
-			description: 'Create or update a member',
-			action: 'Create or update a member',
-			routing: {
-				send: { preSend: [memberPresend] },
-				request: {
-					method: 'POST',
-					url: '/member',
-				},
-			},
-		},
-		{
-			name: 'Delete',
-			value: 'delete',
-			description: 'Delete a member',
-			action: 'Delete a member',
-			routing: {
-				request: {
-					method: 'DELETE',
-					url: '=/member',
-				},
-			},
-		},
-		{
-			name: 'Find',
-			value: 'find',
-			description: 'Find a member',
-			action: 'Find a member',
-			routing: {
-				request: {
-					method: 'GET',
-					url: '=/member/{{$parameter["id"]}}',
-				},
-			},
-		},
-		{
-			name: 'Update',
-			value: 'update',
-			description: 'Update a member',
-			action: 'Update a member',
-			routing: {
-				send: { preSend: [memberPresend] },
-				request: {
-					method: 'PUT',
-					url: '=/member/{{$parameter["id"]}}',
-				},
-			},
-		},
-	],
-};
-
-const commonFields: INodeProperties[] = [
-	{
-		displayName: 'Platform',
-		name: 'platform',
-		description: 'Platform for which to check member existence',
-		type: 'string',
-		required: true,
-		default: '',
-	},
-	{
-		displayName: 'Username',
-		name: 'username',
-		description: 'Username of the member in platform',
-		type: 'string',
-		required: true,
-		default: '',
-	},
-];
-
-const additionalOptions: INodeProperties[] = [
-	{
-		displayName: 'Display Name',
-		name: 'displayName',
-		description: 'UI friendly name of the member',
-		type: 'string',
-		default: '',
-	},
-	shared.emailsField,
-	{
-		displayName: 'Joined At',
-		name: 'joinedAt',
-		description: 'Date of joining the community',
-		type: 'dateTime',
-		default: '',
-	},
-	{
-		displayName: 'Organizations',
-		name: 'organizations',
-		description:
-			'Organizations associated with the member. Each element in the array is the name of the organization, or an organization object. If the organization does not exist, it will be created.',
-		type: 'fixedCollection',
-		typeOptions: {
-			multipleValues: true,
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'Item Choice',
-				name: 'itemChoice',
-				values: [
-					{
-						displayName: 'Name',
-						name: 'name',
-						description: 'The name of the organization',
-						type: 'string',
-						required: true,
-						default: '',
-					},
-					{
-						displayName: 'Url',
-						name: 'url',
-						description: 'The URL of the organization',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'Description',
-						name: 'description',
-						description: 'A short description of the organization',
-						type: 'string',
-						typeOptions: {
-							rows: 3,
-						},
-						default: '',
-					},
-					{
-						displayName: 'Logo',
-						name: 'logo',
-						description: 'A URL for logo of the organization',
-						type: 'string',
-						default: '',
-					},
-					{
-						displayName: 'Employees',
-						name: 'employees',
-						description: 'The number of employees of the organization',
-						type: 'number',
-						default: '',
-					},
-				],
-			},
-		],
-	},
-	{
-		displayName: 'Tags',
-		name: 'tags',
-		description: 'Tags associated with the member. Each element in the array is the ID of the tag.',
-		type: 'fixedCollection',
-		typeOptions: {
-			multipleValues: true,
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'Item Choice',
-				name: 'itemChoice',
-				values: [
-					{
-						displayName: 'Tag',
-						name: 'tag',
-						type: 'string',
-						default: '',
-					},
-				],
-			},
-		],
-	},
-	{
-		displayName: 'Tasks',
-		name: 'tasks',
-		description:
-			'Tasks associated with the member. Each element in the array is the ID of the task.',
-		type: 'fixedCollection',
-		typeOptions: {
-			multipleValues: true,
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'Item Choice',
-				name: 'itemChoice',
-				values: [
-					{
-						displayName: 'Task',
-						name: 'task',
-						type: 'string',
-						default: '',
-					},
-				],
-			},
-		],
-	},
-	{
-		displayName: 'Notes',
-		name: 'notes',
-		description:
-			'Notes associated with the member. Each element in the array is the ID of the note.',
-		type: 'fixedCollection',
-		typeOptions: {
-			multipleValues: true,
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'Item Choice',
-				name: 'itemChoice',
-				values: [
-					{
-						displayName: 'Note',
-						name: 'note',
-						type: 'string',
-						default: '',
-					},
-				],
-			},
-		],
-	},
-	{
-		displayName: 'Activities',
-		name: 'activities',
-		description:
-			'Activities associated with the member. Each element in the array is the ID of the activity.',
-		type: 'fixedCollection',
-		typeOptions: {
-			multipleValues: true,
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'Item Choice',
-				name: 'itemChoice',
-				values: [
-					{
-						displayName: 'Activity',
-						name: 'activity',
-						type: 'string',
-						default: '',
-					},
-				],
-			},
-		],
-	},
-];
-
-const memberFields: INodeProperties[] = [
-	Object.assign(getId(), { description: 'The ID of the member' }, displayFor.id),
-	...commonFields.map(mapWith(displayFor.createOrUpdate)),
-	Object.assign({}, getAdditionalOptions(additionalOptions), displayFor.createOrUpdate),
-];
-
-export { memberOperations, memberFields };
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts
deleted file mode 100644
index 69c2d0da13e..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/noteFields.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-import { getId, mapWith, showFor } from './utils';
-import { notePresend } from '../GenericFunctions';
-
-const displayOpts = showFor(['note']);
-
-const displayFor = {
-	resource: displayOpts(),
-	createOrUpdate: displayOpts(['create', 'update']),
-	id: displayOpts(['delete', 'find', 'update']),
-};
-
-const noteOperations: INodeProperties = {
-	displayName: 'Operation',
-	name: 'operation',
-	type: 'options',
-	displayOptions: displayFor.resource.displayOptions,
-	noDataExpression: true,
-	default: 'find',
-	options: [
-		{
-			name: 'Create',
-			value: 'create',
-			description: 'Create a note',
-			action: 'Create a note',
-			routing: {
-				send: { preSend: [notePresend] },
-				request: {
-					method: 'POST',
-					url: '/note',
-				},
-			},
-		},
-		{
-			name: 'Delete',
-			value: 'delete',
-			description: 'Delete a note',
-			action: 'Delete a note',
-			routing: {
-				request: {
-					method: 'DELETE',
-					url: '=/note',
-				},
-			},
-		},
-		{
-			name: 'Find',
-			value: 'find',
-			description: 'Find a note',
-			action: 'Find a note',
-			routing: {
-				request: {
-					method: 'GET',
-					url: '=/note/{{$parameter["id"]}}',
-				},
-			},
-		},
-		{
-			name: 'Update',
-			value: 'update',
-			description: 'Update a note',
-			action: 'Update a note',
-			routing: {
-				send: { preSend: [notePresend] },
-				request: {
-					method: 'PUT',
-					url: '=/note/{{$parameter["id"]}}',
-				},
-			},
-		},
-	],
-};
-
-const commonFields: INodeProperties[] = [
-	{
-		displayName: 'Body',
-		name: 'body',
-		description: 'The body of the note',
-		type: 'string',
-		typeOptions: {
-			rows: 4,
-		},
-		default: '',
-	},
-];
-
-const noteFields: INodeProperties[] = [
-	Object.assign(getId(), { description: 'The ID of the note' }, displayFor.id),
-	...commonFields.map(mapWith(displayFor.createOrUpdate)),
-];
-
-export { noteOperations, noteFields };
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts
deleted file mode 100644
index 4ea7440272b..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/organizationFields.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-import { getAdditionalOptions, getId, mapWith, showFor } from './utils';
-import { organizationPresend } from '../GenericFunctions';
-
-const displayOpts = showFor(['organization']);
-
-const displayFor = {
-	resource: displayOpts(),
-	createOrUpdate: displayOpts(['create', 'update']),
-	id: displayOpts(['delete', 'find', 'update']),
-};
-
-const organizationOperations: INodeProperties = {
-	displayName: 'Operation',
-	name: 'operation',
-	type: 'options',
-	displayOptions: displayFor.resource.displayOptions,
-	noDataExpression: true,
-	default: 'find',
-	options: [
-		{
-			name: 'Create',
-			value: 'create',
-			description: 'Create an organization',
-			action: 'Create an organization',
-			routing: {
-				send: { preSend: [organizationPresend] },
-				request: {
-					method: 'POST',
-					url: '/organization',
-				},
-			},
-		},
-		{
-			name: 'Delete',
-			value: 'delete',
-			description: 'Delete an organization',
-			action: 'Delete an organization',
-			routing: {
-				request: {
-					method: 'DELETE',
-					url: '=/organization',
-				},
-			},
-		},
-		{
-			name: 'Find',
-			value: 'find',
-			description: 'Find an organization',
-			action: 'Find an organization',
-			routing: {
-				request: {
-					method: 'GET',
-					url: '=/organization/{{$parameter["id"]}}',
-				},
-			},
-		},
-		{
-			name: 'Update',
-			value: 'update',
-			description: 'Update an organization',
-			action: 'Update an organization',
-			routing: {
-				send: { preSend: [organizationPresend] },
-				request: {
-					method: 'PUT',
-					url: '=/organization/{{$parameter["id"]}}',
-				},
-			},
-		},
-	],
-};
-
-const commonFields: INodeProperties[] = [
-	{
-		displayName: 'Name',
-		name: 'name',
-		description: 'The name of the organization',
-		type: 'string',
-		required: true,
-		default: '',
-	},
-];
-
-const additionalOptions: INodeProperties[] = [
-	{
-		displayName: 'Url',
-		name: 'url',
-		description: 'The URL of the organization',
-		type: 'string',
-		default: '',
-	},
-	{
-		displayName: 'Description',
-		name: 'description',
-		description: 'A short description of the organization',
-		type: 'string',
-		typeOptions: {
-			rows: 3,
-		},
-		default: '',
-	},
-	{
-		displayName: 'Logo',
-		name: 'logo',
-		description: 'A URL for logo of the organization',
-		type: 'string',
-		default: '',
-	},
-	{
-		displayName: 'Employees',
-		name: 'employees',
-		description: 'The number of employees of the organization',
-		type: 'number',
-		default: '',
-	},
-	{
-		displayName: 'Members',
-		name: 'members',
-		description:
-			'Members associated with the organization. Each element in the array is the ID of the member.',
-		type: 'fixedCollection',
-		typeOptions: {
-			multipleValues: true,
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'Item Choice',
-				name: 'itemChoice',
-				values: [
-					{
-						displayName: 'Member',
-						name: 'member',
-						type: 'string',
-						default: '',
-					},
-				],
-			},
-		],
-	},
-];
-
-const organizationFields: INodeProperties[] = [
-	Object.assign(getId(), { description: 'The ID of the organization' }, displayFor.id),
-	...commonFields.map(mapWith(displayFor.createOrUpdate)),
-	Object.assign({}, getAdditionalOptions(additionalOptions), displayFor.createOrUpdate),
-];
-
-export { organizationOperations, organizationFields };
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/resources.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/resources.ts
deleted file mode 100644
index 430b13cb564..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/resources.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const resources: INodeProperties = {
-	displayName: 'Resource',
-	name: 'resource',
-	type: 'options',
-	noDataExpression: true,
-	default: 'activity',
-	placeholder: 'Resourcee',
-	options: [
-		{
-			name: 'Activity',
-			value: 'activity',
-		},
-		{
-			name: 'Automation',
-			value: 'automation',
-		},
-		{
-			name: 'Member',
-			value: 'member',
-		},
-		{
-			name: 'Note',
-			value: 'note',
-		},
-		{
-			name: 'Organization',
-			value: 'organization',
-		},
-		{
-			name: 'Task',
-			value: 'task',
-		},
-	],
-};
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/shared.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/shared.ts
deleted file mode 100644
index 3e0711000b1..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/shared.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const emailsField: INodeProperties = {
-	displayName: 'Emails',
-	name: 'emails',
-	description: 'Email addresses of the member',
-	type: 'fixedCollection',
-	typeOptions: {
-		multipleValues: true,
-	},
-	default: {},
-	options: [
-		{
-			displayName: 'Item Choice',
-			name: 'itemChoice',
-			values: [
-				{
-					displayName: 'Email',
-					name: 'email',
-					type: 'string',
-					placeholder: 'name@email.com',
-					default: '',
-				},
-			],
-		},
-	],
-};
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts
deleted file mode 100644
index 5de5573860d..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/taskFields.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-import { getAdditionalOptions, getId, showFor } from './utils';
-import { taskPresend } from '../GenericFunctions';
-
-const displayOpts = showFor(['task']);
-
-const displayFor = {
-	resource: displayOpts(),
-	createOrUpdate: displayOpts(['create', 'update']),
-	id: displayOpts(['delete', 'find', 'update']),
-};
-
-const taskOperations: INodeProperties = {
-	displayName: 'Operation',
-	name: 'operation',
-	type: 'options',
-	displayOptions: displayFor.resource.displayOptions,
-	noDataExpression: true,
-	default: 'find',
-	options: [
-		{
-			name: 'Create',
-			value: 'create',
-			description: 'Create a task',
-			action: 'Create a task',
-			routing: {
-				send: { preSend: [taskPresend] },
-				request: {
-					method: 'POST',
-					url: '/task',
-				},
-			},
-		},
-		{
-			name: 'Delete',
-			value: 'delete',
-			description: 'Delete a task',
-			action: 'Delete a task',
-			routing: {
-				request: {
-					method: 'DELETE',
-					url: '=/task',
-				},
-			},
-		},
-		{
-			name: 'Find',
-			value: 'find',
-			description: 'Find a task',
-			action: 'Find a task',
-			routing: {
-				request: {
-					method: 'GET',
-					url: '=/task/{{$parameter["id"]}}',
-				},
-			},
-		},
-		{
-			name: 'Update',
-			value: 'update',
-			description: 'Update a task',
-			action: 'Update a task',
-			routing: {
-				send: { preSend: [taskPresend] },
-				request: {
-					method: 'PUT',
-					url: '=/task/{{$parameter["id"]}}',
-				},
-			},
-		},
-	],
-};
-
-const additionalOptions: INodeProperties[] = [
-	{
-		displayName: 'Name',
-		name: 'name',
-		description: 'The name of the task',
-		type: 'string',
-		default: '',
-	},
-	{
-		displayName: 'Body',
-		name: 'body',
-		description: 'The body of the task',
-		type: 'string',
-		typeOptions: {
-			rows: 4,
-		},
-		default: '',
-	},
-	{
-		displayName: 'Status',
-		name: 'status',
-		description: 'The status of the task',
-		type: 'string',
-		default: '',
-	},
-	{
-		displayName: 'Members',
-		name: 'members',
-		description:
-			'Members associated with the task. Each element in the array is the ID of the member.',
-		type: 'fixedCollection',
-		typeOptions: {
-			multipleValues: true,
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'Item Choice',
-				name: 'itemChoice',
-				values: [
-					{
-						displayName: 'Member',
-						name: 'member',
-						type: 'string',
-						default: '',
-					},
-				],
-			},
-		],
-	},
-	{
-		displayName: 'Activities',
-		name: 'activities',
-		description:
-			'Activities associated with the task. Each element in the array is the ID of the activity.',
-		type: 'fixedCollection',
-		typeOptions: {
-			multipleValues: true,
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'Item Choice',
-				name: 'itemChoice',
-				values: [
-					{
-						displayName: 'Activity',
-						name: 'activity',
-						type: 'string',
-						default: '',
-					},
-				],
-			},
-		],
-	},
-	{
-		displayName: 'Assigneess',
-		name: 'assigneess',
-		description: 'Users assigned with the task. Each element in the array is the ID of the user.',
-		type: 'string',
-		default: '',
-	},
-];
-
-const taskFields: INodeProperties[] = [
-	Object.assign(getId(), { description: 'The ID of the task' }, displayFor.id),
-	Object.assign({}, getAdditionalOptions(additionalOptions), displayFor.createOrUpdate),
-];
-
-export { taskOperations, taskFields };
diff --git a/packages/nodes-base/nodes/CrowdDev/descriptions/utils.ts b/packages/nodes-base/nodes/CrowdDev/descriptions/utils.ts
deleted file mode 100644
index 10740fa023c..00000000000
--- a/packages/nodes-base/nodes/CrowdDev/descriptions/utils.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const showFor =
-	(resources: string[]) =>
-	(operations?: string[]): Partial<INodeProperties> => {
-		return operations !== undefined
-			? {
-					displayOptions: {
-						show: {
-							resource: resources,
-							operation: operations,
-						},
-					},
-				}
-			: {
-					displayOptions: {
-						show: {
-							resource: resources,
-						},
-					},
-				};
-	};
-
-export const mapWith =
-	<T>(...objects: Array<Partial<T>>) =>
-	(item: Partial<T>) =>
-		Object.assign({}, item, ...objects);
-
-export const getId = (): INodeProperties => ({
-	displayName: 'ID',
-	name: 'id',
-	type: 'string',
-	required: true,
-	default: '',
-	routing: {
-		send: {
-			type: 'query',
-			property: 'ids[]',
-		},
-	},
-});
-
-export const getAdditionalOptions = (fields: INodeProperties[]): INodeProperties => {
-	return {
-		displayName: 'Additional Options',
-		name: 'additionalOptions',
-		type: 'collection',
-		displayOptions: {
-			show: {
-				operation: ['getAll'],
-			},
-		},
-		default: {},
-		placeholder: 'Add option',
-		options: fields,
-	};
-};
diff --git a/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts b/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
deleted file mode 100644
index ebadcbaabad..00000000000
--- a/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import type {
-	IExecuteFunctions,
-	ILoadOptionsFunctions,
-	IDataObject,
-	IHookFunctions,
-	JsonObject,
-	IRequestOptions,
-} from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-export async function kitemakerRequest(
-	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions,
-	body: IDataObject = {},
-) {
-	const { personalAccessToken } = await this.getCredentials<{
-		personalAccessToken: string;
-	}>('kitemakerApi');
-
-	const options = {
-		headers: {
-			Authorization: `Bearer ${personalAccessToken}`,
-		},
-		method: 'POST',
-		body,
-		uri: 'https://toil.kitemaker.co/developers/graphql',
-		json: true,
-	} satisfies IRequestOptions;
-
-	const responseData = await this.helpers.request.call(this, options);
-
-	if (responseData.errors) {
-		throw new NodeApiError(this.getNode(), responseData as JsonObject);
-	}
-
-	return responseData;
-}
-
-function getGroupAndItems(resource: 'space' | 'user' | 'workItem') {
-	const map: { [key: string]: { [key: string]: string } } = {
-		space: { group: 'organization', items: 'spaces' },
-		user: { group: 'organization', items: 'users' },
-		workItem: { group: 'workItems', items: 'workItems' },
-	};
-
-	return [map[resource].group, map[resource].items];
-}
-
-export async function kitemakerRequestAllItems(
-	this: IExecuteFunctions,
-	body: { query: string; variables: { [key: string]: string } },
-) {
-	const resource = this.getNodeParameter('resource', 0) as 'space' | 'user' | 'workItem';
-	const [group, items] = getGroupAndItems(resource);
-
-	const returnAll = this.getNodeParameter('returnAll', 0, false);
-	const limit = this.getNodeParameter('limit', 0, 0);
-
-	const returnData: IDataObject[] = [];
-	let responseData;
-
-	do {
-		responseData = await kitemakerRequest.call(this, body);
-		body.variables.cursor = responseData.data[group].cursor;
-		returnData.push(...(responseData.data[group][items] as IDataObject[]));
-
-		if (!returnAll && returnData.length > limit) {
-			return returnData.slice(0, limit);
-		}
-	} while (responseData.data[group].hasMore);
-
-	return returnData;
-}
-
-export type LoadOptions = { name?: string; username?: string; title?: string; id: string };
-export function createLoadOptions(
-	resources: LoadOptions[],
-): Array<{ name: string; value: string }> {
-	return resources.map((option) => {
-		if (option.username) return { name: option.username, value: option.id };
-		if (option.title) return { name: option.title, value: option.id };
-		return { name: option.name ?? 'Unnamed', value: option.id };
-	});
-}
diff --git a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.json b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.json
deleted file mode 100644
index 16f16ffa8e5..00000000000
--- a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"node": "n8n-nodes-base.kitemaker",
-	"nodeVersion": "1.0",
-	"codexVersion": "1.0",
-	"categories": ["Productivity"],
-	"resources": {
-		"credentialDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/credentials/kitemaker/"
-			}
-		],
-		"primaryDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.kitemaker/"
-			}
-		]
-	}
-}
diff --git a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
deleted file mode 100644
index 68e5a0a4ccd..00000000000
--- a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
+++ /dev/null
@@ -1,331 +0,0 @@
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-import { NodeConnectionTypes, NodeOperationError } from 'n8n-workflow';
-
-import {
-	organizationOperations,
-	spaceFields,
-	spaceOperations,
-	userFields,
-	userOperations,
-	workItemFields,
-	workItemOperations,
-} from './descriptions';
-import type { LoadOptions } from './GenericFunctions';
-import { createLoadOptions, kitemakerRequest, kitemakerRequestAllItems } from './GenericFunctions';
-import { createWorkItem, editWorkItem } from './mutations';
-import {
-	getAllSpaces,
-	getAllUsers,
-	getAllWorkItems,
-	getLabels,
-	getOrganization,
-	getSpaces,
-	getStatuses,
-	getUsers,
-	getWorkItem,
-	getWorkItems,
-} from './queries';
-
-export class Kitemaker implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Kitemaker',
-		name: 'kitemaker',
-		icon: { light: 'file:kitemaker.svg', dark: 'file:kitemaker.dark.svg' },
-		group: ['input'],
-		version: 1,
-		subtitle: '={{$parameter["resource"] + ": " + $parameter["operation"]}}',
-		description: 'Consume the Kitemaker GraphQL API',
-		defaults: {
-			name: 'Kitemaker',
-		},
-		usableAsTool: true,
-		inputs: [NodeConnectionTypes.Main],
-		outputs: [NodeConnectionTypes.Main],
-		credentials: [
-			{
-				name: 'kitemakerApi',
-				required: true,
-			},
-		],
-		properties: [
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Organization',
-						value: 'organization',
-					},
-					{
-						name: 'Space',
-						value: 'space',
-					},
-					{
-						name: 'User',
-						value: 'user',
-					},
-					{
-						name: 'Work Item',
-						value: 'workItem',
-					},
-				],
-				default: 'workItem',
-				required: true,
-			},
-			...organizationOperations,
-			...spaceOperations,
-			...spaceFields,
-			...userOperations,
-			...userFields,
-			...workItemOperations,
-			...workItemFields,
-		],
-	};
-
-	methods = {
-		loadOptions: {
-			async getLabels(this: ILoadOptionsFunctions) {
-				const responseData = await kitemakerRequest.call(this, { query: getLabels });
-				const {
-					data: {
-						organization: { spaces },
-					},
-				} = responseData;
-
-				return createLoadOptions(spaces[0].labels as LoadOptions[]);
-			},
-
-			async getSpaces(this: ILoadOptionsFunctions) {
-				const responseData = await kitemakerRequest.call(this, { query: getSpaces });
-				const {
-					data: {
-						organization: { spaces },
-					},
-				} = responseData;
-
-				return createLoadOptions(spaces as LoadOptions[]);
-			},
-
-			async getStatuses(this: ILoadOptionsFunctions) {
-				const spaceId = this.getNodeParameter('spaceId', 0) as string;
-				if (!spaceId.length) {
-					throw new NodeOperationError(
-						this.getNode(),
-						'Please choose a space to set for the work item to create.',
-					);
-				}
-
-				const responseData = await kitemakerRequest.call(this, { query: getStatuses });
-				const {
-					data: {
-						organization: { spaces },
-					},
-				} = responseData;
-				const space = spaces.find((e: { [x: string]: string }) => e.id === spaceId);
-
-				return createLoadOptions(space.statuses as LoadOptions[]);
-			},
-
-			async getUsers(this: ILoadOptionsFunctions) {
-				const responseData = await kitemakerRequest.call(this, { query: getUsers });
-				const {
-					data: {
-						organization: { users },
-					},
-				} = responseData;
-
-				return createLoadOptions(users as LoadOptions[]);
-			},
-
-			async getWorkItems(this: ILoadOptionsFunctions) {
-				const spaceId = this.getNodeParameter('spaceId', 0) as string;
-
-				const responseData = await kitemakerRequest.call(this, {
-					query: getWorkItems,
-					variables: { spaceId },
-				});
-
-				const {
-					data: {
-						workItems: { workItems },
-					},
-				} = responseData;
-
-				return createLoadOptions(workItems as LoadOptions[]);
-			},
-		},
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-
-		let responseData;
-		const returnData: INodeExecutionData[] = [];
-
-		// https://github.com/kitemakerhq/docs/blob/main/kitemaker.graphql
-
-		for (let i = 0; i < items.length; i++) {
-			if (resource === 'organization') {
-				// *********************************************************************
-				//                           organization
-				// *********************************************************************
-
-				if (operation === 'get') {
-					// ----------------------------------
-					//         organization: get
-					// ----------------------------------
-
-					responseData = await kitemakerRequest.call(this, {
-						query: getOrganization,
-					});
-
-					responseData = responseData.data.organization;
-				}
-			} else if (resource === 'space') {
-				// *********************************************************************
-				//                             space
-				// *********************************************************************
-
-				if (operation === 'getAll') {
-					// ----------------------------------
-					//          space: getAll
-					// ----------------------------------
-
-					const allItems = await kitemakerRequestAllItems.call(this, {
-						query: getAllSpaces,
-						variables: {},
-					});
-
-					responseData = allItems;
-				}
-			} else if (resource === 'user') {
-				// *********************************************************************
-				//                             user
-				// *********************************************************************
-
-				if (operation === 'getAll') {
-					// ----------------------------------
-					//          user: getAll
-					// ----------------------------------
-
-					const allItems = await kitemakerRequestAllItems.call(this, {
-						query: getAllUsers,
-						variables: {},
-					});
-
-					responseData = allItems;
-				}
-			} else if (resource === 'workItem') {
-				// *********************************************************************
-				//                             workItem
-				// *********************************************************************
-
-				if (operation === 'create') {
-					// ----------------------------------
-					//         workItem: create
-					// ----------------------------------
-
-					const input = {
-						title: this.getNodeParameter('title', i) as string,
-						statusId: this.getNodeParameter('statusId', i) as string[],
-					};
-
-					if (!input.statusId.length) {
-						throw new NodeOperationError(
-							this.getNode(),
-							'Please enter a status to set for the work item to create.',
-							{ itemIndex: i },
-						);
-					}
-
-					const additionalFields = this.getNodeParameter('additionalFields', i);
-
-					if (Object.keys(additionalFields).length) {
-						Object.assign(input, additionalFields);
-					}
-
-					responseData = await kitemakerRequest.call(this, {
-						query: createWorkItem,
-						variables: { input },
-					});
-
-					responseData = responseData.data.createWorkItem.workItem;
-				} else if (operation === 'get') {
-					// ----------------------------------
-					//         workItem: get
-					// ----------------------------------
-
-					const workItemId = this.getNodeParameter('workItemId', i) as string;
-
-					responseData = await kitemakerRequest.call(this, {
-						query: getWorkItem,
-						variables: { workItemId },
-					});
-
-					responseData = responseData.data.workItem;
-				} else if (operation === 'getAll') {
-					// ----------------------------------
-					//         workItem: getAll
-					// ----------------------------------
-
-					const allItems = await kitemakerRequestAllItems.call(this, {
-						query: getAllWorkItems,
-						variables: {
-							spaceId: this.getNodeParameter('spaceId', i) as string,
-						},
-					});
-
-					responseData = allItems;
-				} else if (operation === 'update') {
-					// ----------------------------------
-					//         workItem: update
-					// ----------------------------------
-
-					const input = {
-						id: this.getNodeParameter('workItemId', i),
-					};
-
-					const updateFields = this.getNodeParameter('updateFields', i);
-
-					if (!Object.keys(updateFields).length) {
-						throw new NodeOperationError(
-							this.getNode(),
-							'Please enter at least one field to update for the work item.',
-							{ itemIndex: i },
-						);
-					}
-
-					Object.assign(input, updateFields);
-
-					responseData = await kitemakerRequest.call(this, {
-						query: editWorkItem,
-						variables: { input },
-					});
-
-					responseData = responseData.data.editWorkItem.workItem;
-				}
-			}
-
-			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData as IDataObject),
-				{ itemData: { item: i } },
-			);
-
-			returnData.push(...executionData);
-		}
-
-		return [returnData];
-	}
-}
diff --git a/packages/nodes-base/nodes/Kitemaker/descriptions/OrganizationDescription.ts b/packages/nodes-base/nodes/Kitemaker/descriptions/OrganizationDescription.ts
deleted file mode 100644
index c22c27f94c4..00000000000
--- a/packages/nodes-base/nodes/Kitemaker/descriptions/OrganizationDescription.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const organizationOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		default: 'get',
-		options: [
-			{
-				name: 'Get',
-				value: 'get',
-				description: "Retrieve data on the logged-in user's organization",
-				action: "Get the logged-in user's organization",
-			},
-		],
-		displayOptions: {
-			show: {
-				resource: ['organization'],
-			},
-		},
-	},
-];
diff --git a/packages/nodes-base/nodes/Kitemaker/descriptions/SpaceDescription.ts b/packages/nodes-base/nodes/Kitemaker/descriptions/SpaceDescription.ts
deleted file mode 100644
index d340283f42a..00000000000
--- a/packages/nodes-base/nodes/Kitemaker/descriptions/SpaceDescription.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const spaceOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		default: 'getAll',
-		options: [
-			{
-				name: 'Get Many',
-				value: 'getAll',
-				description: "Retrieve data on many spaces in the logged-in user's organization",
-				action: 'Get many spaces',
-			},
-		],
-		displayOptions: {
-			show: {
-				resource: ['space'],
-			},
-		},
-	},
-];
-
-export const spaceFields: INodeProperties[] = [
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		default: false,
-		description: 'Whether to return all results or only up to a given limit',
-		displayOptions: {
-			show: {
-				resource: ['space'],
-				operation: ['getAll'],
-			},
-		},
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		default: 5,
-		description: 'Max number of results to return',
-		typeOptions: {
-			minValue: 1,
-			maxValue: 1000,
-		},
-		displayOptions: {
-			show: {
-				resource: ['space'],
-				operation: ['getAll'],
-				returnAll: [false],
-			},
-		},
-	},
-];
diff --git a/packages/nodes-base/nodes/Kitemaker/descriptions/UserDescription.ts b/packages/nodes-base/nodes/Kitemaker/descriptions/UserDescription.ts
deleted file mode 100644
index d13bda8ea6b..00000000000
--- a/packages/nodes-base/nodes/Kitemaker/descriptions/UserDescription.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const userOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		default: 'getAll',
-		options: [
-			{
-				name: 'Get Many',
-				value: 'getAll',
-				description: "Retrieve data on many users in the logged-in user's organization",
-				action: 'Get many users',
-			},
-		],
-		displayOptions: {
-			show: {
-				resource: ['user'],
-			},
-		},
-	},
-];
-
-export const userFields: INodeProperties[] = [
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		default: false,
-		description: 'Whether to return all results or only up to a given limit',
-		displayOptions: {
-			show: {
-				resource: ['user'],
-				operation: ['getAll'],
-			},
-		},
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		default: 5,
-		description: 'Max number of results to return',
-		typeOptions: {
-			minValue: 1,
-			maxValue: 1000,
-		},
-		displayOptions: {
-			show: {
-				resource: ['user'],
-				operation: ['getAll'],
-				returnAll: [false],
-			},
-		},
-	},
-];
diff --git a/packages/nodes-base/nodes/Kitemaker/descriptions/WorkItemDescription.ts b/packages/nodes-base/nodes/Kitemaker/descriptions/WorkItemDescription.ts
deleted file mode 100644
index 7ad3559bd9d..00000000000
--- a/packages/nodes-base/nodes/Kitemaker/descriptions/WorkItemDescription.ts
+++ /dev/null
@@ -1,352 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const workItemOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		default: 'get',
-		options: [
-			{
-				name: 'Create',
-				value: 'create',
-				action: 'Create a work item',
-			},
-			{
-				name: 'Get',
-				value: 'get',
-				action: 'Get a work item',
-			},
-			{
-				name: 'Get Many',
-				value: 'getAll',
-				action: 'Get many work items',
-			},
-			{
-				name: 'Update',
-				value: 'update',
-				action: 'Update a work item',
-			},
-		],
-		displayOptions: {
-			show: {
-				resource: ['workItem'],
-			},
-		},
-	},
-];
-
-export const workItemFields: INodeProperties[] = [
-	// ----------------------------------
-	//         workItem: create
-	// ----------------------------------
-	{
-		displayName: 'Title',
-		name: 'title',
-		type: 'string',
-		default: '',
-		required: true,
-		description: 'Title of the work item to create',
-		displayOptions: {
-			show: {
-				resource: ['workItem'],
-				operation: ['create'],
-			},
-		},
-	},
-	{
-		displayName: 'Space Name or ID',
-		name: 'spaceId',
-		type: 'options',
-		typeOptions: {
-			loadOptionsMethod: 'getSpaces',
-		},
-		default: [],
-		required: true,
-		description:
-			'ID of the space to retrieve the work items from. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-		displayOptions: {
-			show: {
-				resource: ['workItem'],
-				operation: ['create'],
-			},
-		},
-	},
-	{
-		displayName: 'Status Name or ID',
-		name: 'statusId',
-		type: 'options',
-		typeOptions: {
-			loadOptionsDependsOn: ['spaceId'],
-			loadOptionsMethod: 'getStatuses',
-		},
-		default: [],
-		required: true,
-		description:
-			'ID of the status to set on the item to create. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-		displayOptions: {
-			show: {
-				resource: ['workItem'],
-				operation: ['create'],
-			},
-		},
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['workItem'],
-				operation: ['create'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-				description: 'Description of the item to create. Markdown supported.',
-			},
-			{
-				displayName: 'Effort',
-				name: 'effort',
-				type: 'options',
-				default: 'SMALL',
-				description: 'Effort to set for the item to create',
-				options: [
-					{
-						name: 'Small',
-						value: 'SMALL',
-					},
-					{
-						name: 'Medium',
-						value: 'MEDIUM',
-					},
-					{
-						name: 'Large',
-						value: 'LARGE',
-					},
-				],
-			},
-			{
-				displayName: 'Impact',
-				name: 'impact',
-				type: 'options',
-				default: 'SMALL',
-				description: 'Impact to set for the item to create',
-				options: [
-					{
-						name: 'Small',
-						value: 'SMALL',
-					},
-					{
-						name: 'Medium',
-						value: 'MEDIUM',
-					},
-					{
-						name: 'Large',
-						value: 'LARGE',
-					},
-				],
-			},
-			{
-				displayName: 'Label Names or IDs',
-				name: 'labelIds',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getLabels',
-				},
-				default: [],
-				description:
-					'ID of the label to set on the item to create. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Member Names or IDs',
-				name: 'memberIds',
-				type: 'multiOptions',
-				typeOptions: {
-					loadOptionsMethod: 'getUsers',
-				},
-				default: [],
-				description:
-					'ID of the user to assign to the item to create. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-			},
-		],
-	},
-
-	// ----------------------------------
-	//         workItem: get
-	// ----------------------------------
-	{
-		displayName: 'Work Item ID',
-		name: 'workItemId',
-		type: 'string',
-		default: '',
-		required: true,
-		description: 'ID of the work item to retrieve',
-		displayOptions: {
-			show: {
-				resource: ['workItem'],
-				operation: ['get'],
-			},
-		},
-	},
-
-	// ----------------------------------
-	//         workItem: getAll
-	// ----------------------------------
-	{
-		displayName: 'Space Name or ID',
-		name: 'spaceId',
-		type: 'options',
-		typeOptions: {
-			loadOptionsMethod: 'getSpaces',
-		},
-		default: [],
-		required: true,
-		description:
-			'ID of the space to retrieve the work items from. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-		displayOptions: {
-			show: {
-				resource: ['workItem'],
-				operation: ['getAll'],
-			},
-		},
-	},
-	{
-		displayName: 'Return All',
-		name: 'returnAll',
-		type: 'boolean',
-		default: false,
-		description: 'Whether to return all results or only up to a given limit',
-		displayOptions: {
-			show: {
-				resource: ['workItem'],
-				operation: ['getAll'],
-			},
-		},
-	},
-	{
-		displayName: 'Limit',
-		name: 'limit',
-		type: 'number',
-		default: 5,
-		description: 'Max number of results to return',
-		typeOptions: {
-			minValue: 1,
-			maxValue: 1000,
-		},
-		displayOptions: {
-			show: {
-				resource: ['workItem'],
-				operation: ['getAll'],
-				returnAll: [false],
-			},
-		},
-	},
-
-	// ----------------------------------
-	//         workItem: update
-	// ----------------------------------
-	{
-		displayName: 'Work Item ID',
-		name: 'workItemId',
-		type: 'string',
-		default: '',
-		required: true,
-		description: 'ID of the work item to update',
-		displayOptions: {
-			show: {
-				resource: ['workItem'],
-				operation: ['update'],
-			},
-		},
-	},
-	{
-		displayName: 'Update Fields',
-		name: 'updateFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		default: {},
-		displayOptions: {
-			show: {
-				resource: ['workItem'],
-				operation: ['update'],
-			},
-		},
-		options: [
-			{
-				displayName: 'Description',
-				name: 'description',
-				type: 'string',
-				default: '',
-				description: 'Description of the item to update. Markdown supported.',
-			},
-			{
-				displayName: 'Effort',
-				name: 'effort',
-				type: 'options',
-				default: 'SMALL',
-				description: 'Effort to set for the item to update',
-				options: [
-					{
-						name: 'Small',
-						value: 'SMALL',
-					},
-					{
-						name: 'Medium',
-						value: 'MEDIUM',
-					},
-					{
-						name: 'Large',
-						value: 'LARGE',
-					},
-				],
-			},
-			{
-				displayName: 'Impact',
-				name: 'impact',
-				type: 'options',
-				default: 'SMALL',
-				description: 'Impact to set for the item to update',
-				options: [
-					{
-						name: 'Small',
-						value: 'SMALL',
-					},
-					{
-						name: 'Medium',
-						value: 'MEDIUM',
-					},
-					{
-						name: 'Large',
-						value: 'LARGE',
-					},
-				],
-			},
-			{
-				displayName: 'Status Name or ID',
-				name: 'statusId',
-				type: 'options',
-				typeOptions: {
-					loadOptionsMethod: 'getStatuses',
-				},
-				default: [],
-				description:
-					'ID of the status to set on the item to update. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code/expressions/">expression</a>.',
-			},
-			{
-				displayName: 'Title',
-				name: 'title',
-				type: 'string',
-				default: '',
-				description: 'Title to set for the work item to update',
-			},
-		],
-	},
-];
diff --git a/packages/nodes-base/nodes/Kitemaker/descriptions/index.ts b/packages/nodes-base/nodes/Kitemaker/descriptions/index.ts
deleted file mode 100644
index 1e2d9a6b8e3..00000000000
--- a/packages/nodes-base/nodes/Kitemaker/descriptions/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-export * from './OrganizationDescription';
-export * from './SpaceDescription';
-export * from './UserDescription';
-export * from './WorkItemDescription';
diff --git a/packages/nodes-base/nodes/Kitemaker/kitemaker.dark.svg b/packages/nodes-base/nodes/Kitemaker/kitemaker.dark.svg
deleted file mode 100644
index d8f4392dcec..00000000000
--- a/packages/nodes-base/nodes/Kitemaker/kitemaker.dark.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.76563 3.2189C0 6.164 0 10.776 0 20C0 29.2241 0 33.8359 2.76563 36.781C2.91194 36.9369 3.0631 37.0882 3.2189 37.2343C6.164 40 10.776 40 20 40C29.2241 40 33.8359 40 36.781 37.2343C36.9369 37.0882 37.0882 36.9369 37.2343 36.781C40 33.8359 40 29.2241 40 20C40 10.776 40 6.164 37.2343 3.2189C37.0882 3.0631 36.9369 2.91194 36.781 2.76563C33.8359 0 29.2241 0 20 0C10.776 0 6.164 0 3.2189 2.76563C3.0631 2.91194 2.91194 3.0631 2.76563 3.2189Z" fill="white"/>
-<path d="M24.1904 21.2729C24.5424 20.9218 25.1055 20.899 25.4849 21.2202L30.0706 25.1031C31.9918 26.7298 30.632 29.8535 28.1282 29.5649L19.1089 28.5249C18.3148 28.4333 17.9776 27.468 18.5429 26.9043C18.7492 26.6986 19.0385 26.598 19.3285 26.6314L28.3478 27.6714C28.9737 27.7437 29.3137 26.9627 28.8333 26.5559L24.2478 22.6731C23.822 22.3127 23.7955 21.6665 24.1904 21.2729Z" fill="#171717"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.7959 27.0451V11.8735C9.7959 9.63868 12.4806 8.49197 14.103 10.0338L12.7842 11.4136C12.3786 11.0281 11.7074 11.3148 11.7074 11.8735V27.0451C11.7074 27.6137 12.3989 27.8959 12.7988 27.4908L28.9065 11.1679C29.4014 10.6663 28.833 9.85356 28.19 10.1433L17.8097 14.8197C17.2186 15.086 16.5245 14.9683 16.0549 14.522L12.7842 11.4136L14.103 10.0338L17.2183 12.9946L27.4028 8.40625C29.9751 7.24744 32.2488 10.4986 30.269 12.5047L14.1612 28.8276C12.5617 30.4486 9.7959 29.3192 9.7959 27.0451Z" fill="#171717"/>
-</svg>
diff --git a/packages/nodes-base/nodes/Kitemaker/kitemaker.svg b/packages/nodes-base/nodes/Kitemaker/kitemaker.svg
deleted file mode 100644
index 21479787596..00000000000
--- a/packages/nodes-base/nodes/Kitemaker/kitemaker.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="40" height="40" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M2.76563 3.2189C0 6.164 0 10.776 0 20C0 29.2241 0 33.8359 2.76563 36.781C2.91194 36.9369 3.0631 37.0882 3.2189 37.2343C6.164 40 10.776 40 20 40C29.2241 40 33.8359 40 36.781 37.2343C36.9369 37.0882 37.0882 36.9369 37.2343 36.781C40 33.8359 40 29.2241 40 20C40 10.776 40 6.164 37.2343 3.2189C37.0882 3.0631 36.9369 2.91194 36.781 2.76563C33.8359 0 29.2241 0 20 0C10.776 0 6.164 0 3.2189 2.76563C3.0631 2.91194 2.91194 3.0631 2.76563 3.2189Z" fill="#171717"/>
-<path d="M24.1904 21.2729C24.5424 20.9218 25.1055 20.899 25.4849 21.2202L30.0706 25.1031C31.9918 26.7298 30.632 29.8535 28.1282 29.5649L19.1089 28.5249C18.3148 28.4333 17.9776 27.468 18.5429 26.9043C18.7492 26.6986 19.0385 26.598 19.3285 26.6314L28.3478 27.6714C28.9737 27.7437 29.3137 26.9627 28.8333 26.5559L24.2478 22.6731C23.822 22.3127 23.7955 21.6665 24.1904 21.2729Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M9.7959 27.0451V11.8735C9.7959 9.63868 12.4806 8.49197 14.103 10.0338L12.7842 11.4136C12.3786 11.0281 11.7074 11.3148 11.7074 11.8735V27.0451C11.7074 27.6137 12.3989 27.8959 12.7988 27.4908L28.9065 11.1679C29.4014 10.6663 28.833 9.85356 28.19 10.1433L17.8097 14.8197C17.2186 15.086 16.5245 14.9683 16.0549 14.522L12.7842 11.4136L14.103 10.0338L17.2183 12.9946L27.4028 8.40625C29.9751 7.24744 32.2488 10.4986 30.269 12.5047L14.1612 28.8276C12.5617 30.4486 9.7959 29.3192 9.7959 27.0451Z" fill="white"/>
-</svg>
diff --git a/packages/nodes-base/nodes/Kitemaker/mutations.ts b/packages/nodes-base/nodes/Kitemaker/mutations.ts
deleted file mode 100644
index be23cb45abf..00000000000
--- a/packages/nodes-base/nodes/Kitemaker/mutations.ts
+++ /dev/null
@@ -1,69 +0,0 @@
-// ----------------------------------
-//           mutations
-// ----------------------------------
-
-export const createWorkItem = `
-	mutation($input: CreateWorkItemInput!) {
-		createWorkItem(input: $input) {
-			workItem {
-				id
-				number
-				title
-				description
-				status {
-					id
-					name
-				}
-				members {
-					id
-					username
-				}
-				watchers {
-					id
-					username
-				}
-				labels {
-					id
-					name
-				}
-				effort
-				impact
-				updatedAt
-				createdAt
-			}
-		}
-	}
-`;
-
-export const editWorkItem = `
-	mutation ($input: EditWorkItemInput!) {
-		editWorkItem(input: $input) {
-			workItem {
-				id
-				number
-				title
-				description
-				status {
-					id
-					name
-				}
-				members {
-					id
-					username
-				}
-				watchers {
-					id
-					username
-				}
-				labels {
-					id
-					name
-				}
-				effort
-				impact
-				updatedAt
-				createdAt
-			}
-		}
-	}
-`;
diff --git a/packages/nodes-base/nodes/Kitemaker/queries.ts b/packages/nodes-base/nodes/Kitemaker/queries.ts
deleted file mode 100644
index ea665d5f9af..00000000000
--- a/packages/nodes-base/nodes/Kitemaker/queries.ts
+++ /dev/null
@@ -1,200 +0,0 @@
-// ----------------------------------
-//             queries
-// ----------------------------------
-
-export const getAllSpaces = `
-	query {
-		organization {
-			spaces {
-				id
-				name
-				labels {
-					id
-					name
-					color
-				}
-				statuses {
-					id
-					name
-					type
-					default
-				}
-			}
-		}
-	}
-`;
-
-export const getAllUsers = `
-	query {
-		organization {
-			users {
-				id
-				username
-			}
-		}
-	}
-`;
-
-export const getLabels = `
-	query {
-		organization {
-			spaces {
-				labels {
-					id
-					name
-					color
-				}
-			}
-		}
-	}
-`;
-
-export const getOrganization = `
-	query {
-		organization {
-			id
-			name
-		}
-	}
-`;
-
-export const getSpaces = `
-	query {
-		organization {
-			spaces {
-				id
-				name
-				labels {
-					id
-					name
-					color
-				}
-				statuses {
-					id
-					name
-					type
-					default
-				}
-			}
-		}
-	}
-`;
-
-export const getStatuses = `
-	query {
-		organization {
-			spaces {
-				id
-				statuses {
-					id
-					name
-					type
-					default
-				}
-			}
-		}
-	}
-`;
-
-export const getUsers = `
-	query {
-		organization {
-			users {
-				id
-				username
-			}
-		}
-	}
-`;
-
-export const getWorkItems = `
-	query($spaceId: ID!) {
-		workItems(spaceId: $spaceId) {
-			workItems {
-				id
-				title
-			}
-		}
-	}
-`;
-
-export const getWorkItem = `
-	query($workItemId: ID!) {
-		workItem(id: $workItemId) {
-			id
-			number
-			title
-			description
-			status {
-				id
-				name
-			}
-			sort
-			members {
-				id
-				username
-			}
-			watchers {
-				id
-				username
-			}
-			labels {
-				id
-				name
-			}
-			comments {
-				id
-				actor {
-					__typename
-				}
-				body
-				threadId
-				updatedAt
-				createdAt
-			}
-			effort
-			impact
-			updatedAt
-			createdAt
-		}
-	}
-`;
-
-export const getAllWorkItems = `
-	query($spaceId: ID!, $cursor: String) {
-		workItems(spaceId: $spaceId, cursor: $cursor) {
-			hasMore,
-			cursor,
-			workItems {
-				id
-				title
-				description
-				labels {
-					id
-				}
-				comments {
-					id
-					body
-					actor {
-						... on User {
-							id
-							username
-						}
-						... on IntegrationUser {
-							id
-							externalName
-						}
-						... on Integration {
-							id
-							type
-						}
-						... on Application {
-							id
-							name
-						}
-					}
-				}
-			}
-		}
-	}
-`;
diff --git a/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts b/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts
index 2d556f9fd1e..a4cac576d98 100644
--- a/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts
+++ b/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts
@@ -6,7 +6,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeConnectionTypes } from 'n8n-workflow';
 
-type eventType = 'Instance started' | 'Workflow activated' | 'Workflow updated' | undefined;
+type eventType = 'Instance started' | 'Workflow published' | 'Workflow updated' | undefined;
 
 export class N8nTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -32,15 +32,16 @@ export class N8nTrigger implements INodeType {
 				default: [],
 				description: `Specifies under which conditions an execution should happen:
 				<ul>
-					<li><b>Active Workflow Updated</b>: Triggers when this workflow is updated</li>
+					<li><b>Published Workflow Updated</b>: Triggers when workflow version is published from a published state (workflow was already published)</li>
 					<li><b>Instance Started</b>:  Triggers when this n8n instance is started or re-started</li>
-					<li><b>Workflow Activated</b>: Triggers when this workflow is activated</li>
+					<li><b>Workflow Published</b>: Triggers when workflow version is published from an unpublished state (workflow was unpublished)</li>
 				</ul>`,
 				options: [
 					{
-						name: 'Active Workflow Updated',
+						name: 'Published Workflow Updated',
 						value: 'update',
-						description: 'Triggers when this workflow is updated',
+						description:
+							'Triggers when workflow version is published from a published state (workflow was already published)',
 					},
 					{
 						name: 'Instance Started',
@@ -48,9 +49,10 @@ export class N8nTrigger implements INodeType {
 						description: 'Triggers when this n8n instance is started or re-started',
 					},
 					{
-						name: 'Workflow Activated',
+						name: 'Workflow Published',
 						value: 'activate',
-						description: 'Triggers when this workflow is activated',
+						description:
+							'Triggers when workflow version is published from an unpublished state (workflow was not published)',
 					},
 				],
 			},
@@ -65,7 +67,7 @@ export class N8nTrigger implements INodeType {
 		if (events.includes(activationMode)) {
 			let event: eventType;
 			if (activationMode === 'activate') {
-				event = 'Workflow activated';
+				event = 'Workflow published';
 			}
 			if (activationMode === 'update') {
 				event = 'Workflow updated';
diff --git a/packages/nodes-base/nodes/N8nTrigger/test/trigger.test.ts b/packages/nodes-base/nodes/N8nTrigger/test/trigger.test.ts
index 3d8ab05b247..c9a01688256 100644
--- a/packages/nodes-base/nodes/N8nTrigger/test/trigger.test.ts
+++ b/packages/nodes-base/nodes/N8nTrigger/test/trigger.test.ts
@@ -29,7 +29,7 @@ describe('N8nTrigger', () => {
 			expect(mockTriggerFunctions.emit).toHaveBeenCalledWith([
 				[
 					{
-						event: 'Workflow activated',
+						event: 'Workflow published',
 						timestamp: expect.any(String),
 						workflow_id: 'test-workflow-id',
 					},
diff --git a/packages/nodes-base/nodes/Spontit/GenericFunctions.ts b/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
deleted file mode 100644
index d4ca5e48fd8..00000000000
--- a/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-import type {
-	IDataObject,
-	IExecuteFunctions,
-	IHookFunctions,
-	IHttpRequestMethods,
-	ILoadOptionsFunctions,
-	IRequestOptions,
-	IWebhookFunctions,
-	JsonObject,
-} from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
-export async function spontitApiRequest(
-	this: IExecuteFunctions | ILoadOptionsFunctions | IHookFunctions | IWebhookFunctions,
-	method: IHttpRequestMethods,
-	resource: string,
-
-	body: any = {},
-	qs: IDataObject = {},
-) {
-	const credentials = await this.getCredentials('spontitApi');
-
-	try {
-		const options: IRequestOptions = {
-			headers: {
-				'X-Authorization': credentials.apiKey as string,
-				'X-UserId': credentials.username as string,
-			},
-			method,
-			body,
-			qs,
-			uri: `https://api.spontit.com/v3${resource}`,
-			json: true,
-		};
-		if (Object.keys(body as IDataObject).length === 0) {
-			delete options.body;
-		}
-
-		return await this.helpers?.request(options);
-	} catch (error) {
-		throw new NodeApiError(this.getNode(), error as JsonObject);
-	}
-}
diff --git a/packages/nodes-base/nodes/Spontit/PushDescription.ts b/packages/nodes-base/nodes/Spontit/PushDescription.ts
deleted file mode 100644
index 93e5675ddb5..00000000000
--- a/packages/nodes-base/nodes/Spontit/PushDescription.ts
+++ /dev/null
@@ -1,152 +0,0 @@
-import type { INodeProperties } from 'n8n-workflow';
-
-export const pushOperations: INodeProperties[] = [
-	{
-		displayName: 'Operation',
-		name: 'operation',
-		type: 'options',
-		noDataExpression: true,
-		displayOptions: {
-			show: {
-				resource: ['push'],
-			},
-		},
-		options: [
-			{
-				name: 'Create',
-				value: 'create',
-				description: 'Create a push notification',
-				action: 'Create a push notification',
-			},
-		],
-		default: 'create',
-	},
-];
-
-export const pushFields: INodeProperties[] = [
-	/* -------------------------------------------------------------------------- */
-	/*                                push:create                                 */
-	/* -------------------------------------------------------------------------- */
-	{
-		displayName: 'Content',
-		name: 'content',
-		type: 'string',
-		default: '',
-		displayOptions: {
-			show: {
-				operation: ['create'],
-				resource: ['push'],
-			},
-		},
-		description:
-			'To provide text in a push, supply one of either "content" or "pushContent" (or both). Limited to 2500 characters. (Required if a value for "pushContent" is not provided).',
-	},
-	{
-		displayName: 'Additional Fields',
-		name: 'additionalFields',
-		type: 'collection',
-		placeholder: 'Add Field',
-		displayOptions: {
-			show: {
-				operation: ['create'],
-				resource: ['push'],
-			},
-		},
-		default: {},
-		options: [
-			{
-				displayName: 'Channel Name',
-				name: 'channelName',
-				type: 'string',
-				default: '',
-				description:
-					"The name of a channel you created. If you have not yet created a channel, simply don't provide this value and the push will be sent to your main account.",
-			},
-			{
-				displayName: 'Expiration Stamp',
-				name: 'expirationStamp',
-				type: 'dateTime',
-				default: '',
-				description:
-					'A Unix timestamp. When to automatically expire your push notification. The default is 10 days after pushing. The push will become unaccessible within 15-30 minutes of the selected time, but will remain on all device screens until dismissed or clicked.',
-			},
-			{
-				displayName: 'iOS DeepLink',
-				name: 'iOSDeepLink',
-				type: 'string',
-				default: '',
-				description:
-					'An iOS deep link. Use this to deep link into other apps. Alternatively, you can provide a universal link in the link attribute and set openLinkInApp to false.',
-			},
-			{
-				displayName: 'Link',
-				name: 'link',
-				type: 'string',
-				default: '',
-				description: 'A link that can be attached to your push. Must be a valid URL.',
-			},
-			{
-				displayName: 'Open In Home Feed',
-				name: 'openInHomeFeed',
-				type: 'boolean',
-				default: false,
-				description:
-					'Whether the notification opens to the home feed or to a standalone page with the notification. The default (openInHomeFeed=False) is to open the notification on a standalone page.',
-			},
-			{
-				displayName: 'Open Link In App',
-				name: 'openLinkInApp',
-				type: 'boolean',
-				default: false,
-				description:
-					'Whether to open the provided link within the iOS app or in Safari. Android PWA opens all links in the default web browser.',
-			},
-			{
-				displayName: 'Push To Emails',
-				name: 'pushToEmails',
-				type: 'string',
-				default: '',
-				description:
-					"<p>Emails (strings) to whom to send the notification. If all three attributes 'pushToFollowers', 'pushToPhoneNumbers' and 'pushToEmails' are not supplied, then everyone who follows the channel will receive the push notification.</p><p>If 'pushToFollowers' is supplied, only those listed in the array will receive the push notification.</p><p>If one of the userIds supplied does not follow the specified channel, then that userId value will be ignored.</p><p>See the \"Followers\" section to learn how to list the userIds of those who follow one of your channels.</p>.",
-			},
-			{
-				displayName: 'Push To Followers',
-				name: 'pushToFollowers',
-				type: 'string',
-				default: '',
-				description:
-					"<p>User IDs (strings) to whom to send the notification. If all three attributes 'pushToFollowers', 'pushToPhoneNumbers' and 'pushToEmails' are not supplied, then everyone who follows the channel will receive the push notification.</p><p>If 'pushToFollowers' is supplied, only those listed in the array will receive the push notification.</p><p>If one of the userIds supplied does not follow the specified channel, then that userId value will be ignored.</p><p>See the \"Followers\" section to learn how to list the userIds of those who follow one of your channels.</p>.",
-			},
-			{
-				displayName: 'Push To Phone Numbers',
-				name: 'pushToPhoneNumbers',
-				type: 'string',
-				default: '',
-				description:
-					"<p>Phone numbers (strings) to whom to send the notification. If all three attributes 'pushToFollowers', 'pushToPhoneNumbers' and 'pushToEmails' are not supplied, then everyone who follows the channel will receive the push notification.</p><p>If 'pushToFollowers' is supplied, only those listed in the array will receive the push notification.</p><p>If one of the userIds supplied does not follow the specified channel, then that userId value will be ignored.</p><p>See the \"Followers\" section to learn how to list the userIds of those who follow one of your channels.</p>.",
-			},
-			{
-				displayName: 'Schedule',
-				name: 'schedule',
-				type: 'dateTime',
-				default: '',
-				description: 'A Unix timestamp. Schedule a push to be sent at a later date and time.',
-			},
-			{
-				displayName: 'Subtitle',
-				name: 'subtitle',
-				type: 'string',
-				default: '',
-				description:
-					'The subtitle of your push. Limited to 20 characters. Only appears on iOS devices.',
-			},
-			{
-				displayName: 'Title',
-				name: 'pushTitle',
-				type: 'string',
-				default: '',
-				description: 'The title of push. Appears in bold at the top. Limited to 100 characters.',
-			},
-		],
-	},
-];
diff --git a/packages/nodes-base/nodes/Spontit/Spontit.node.json b/packages/nodes-base/nodes/Spontit/Spontit.node.json
deleted file mode 100644
index 3b86105ee16..00000000000
--- a/packages/nodes-base/nodes/Spontit/Spontit.node.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"node": "n8n-nodes-base.spontit",
-	"nodeVersion": "1.0",
-	"codexVersion": "1.0",
-	"categories": ["Communication"],
-	"resources": {
-		"credentialDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/credentials/spontit/"
-			}
-		],
-		"primaryDocumentation": [
-			{
-				"url": "https://docs.n8n.io/integrations/builtin/app-nodes/n8n-nodes-base.spontit/"
-			}
-		]
-	}
-}
diff --git a/packages/nodes-base/nodes/Spontit/Spontit.node.ts b/packages/nodes-base/nodes/Spontit/Spontit.node.ts
deleted file mode 100644
index 7b324375d87..00000000000
--- a/packages/nodes-base/nodes/Spontit/Spontit.node.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-import moment from 'moment-timezone';
-import type {
-	IExecuteFunctions,
-	IDataObject,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-import { NodeConnectionTypes } from 'n8n-workflow';
-
-import { spontitApiRequest } from './GenericFunctions';
-import { pushFields, pushOperations } from './PushDescription';
-
-export class Spontit implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Spontit',
-		name: 'spontit',
-		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
-		icon: 'file:spontit.png',
-		group: ['output'],
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Spontit API',
-		defaults: {
-			name: 'Spontit',
-		},
-		usableAsTool: true,
-		inputs: [NodeConnectionTypes.Main],
-		outputs: [NodeConnectionTypes.Main],
-		credentials: [
-			{
-				name: 'spontitApi',
-				required: true,
-			},
-		],
-		properties: [
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Push',
-						value: 'push',
-					},
-				],
-				default: 'push',
-			},
-			...pushOperations,
-			...pushFields,
-		],
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
-		const timezone = this.getTimezone();
-		let responseData;
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-		for (let i = 0; i < items.length; i++) {
-			try {
-				if (resource === 'push') {
-					if (operation === 'create') {
-						const content = this.getNodeParameter('content', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						const body: IDataObject = {
-							content,
-						};
-
-						Object.assign(body, additionalFields);
-
-						if (body.pushToFollowers) {
-							body.pushToFollowers = (body.pushToFollowers as string).split(',');
-						}
-
-						if (body.pushToPhoneNumbers) {
-							body.pushToPhoneNumbers = (body.pushToPhoneNumbers as string).split(',');
-						}
-
-						if (body.pushToEmails) {
-							body.pushToEmails = (body.pushToEmails as string).split(',');
-						}
-
-						if (body.schedule) {
-							body.scheduled = moment.tz(body.schedule, timezone).unix();
-						}
-
-						if (body.expirationStamp) {
-							body.expirationStamp = moment.tz(body.expirationStamp, timezone).unix();
-						}
-
-						responseData = await spontitApiRequest.call(this, 'POST', '/push', body);
-
-						responseData = responseData.data;
-					}
-				}
-				if (Array.isArray(responseData)) {
-					returnData.push.apply(returnData, responseData as IDataObject[]);
-				} else if (responseData !== undefined) {
-					returnData.push(responseData as IDataObject);
-				}
-			} catch (error) {
-				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
-					continue;
-				}
-				throw error;
-			}
-		}
-
-		return [this.helpers.returnJsonArray(returnData)];
-	}
-}
diff --git a/packages/nodes-base/nodes/Spontit/spontit.png b/packages/nodes-base/nodes/Spontit/spontit.png
deleted file mode 100644
index 8fec5b438b7327c525de83cc5c256498e1aaa51e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1688
zcmV;J250$+P)<h;3K|Lk000e1NJLTq002Ay002A)0{{R34I(K(0005$P)t-sHaR{3
z<Nu`ZxB%e)Hv#}QIzI*5`>6H1qwcmgKSluJ|29EL1l;}r<^MT9Kqdn$srS8(&7YOn
zr#3u6H9kZI+x?;Iv^P9I0p9;rabYhcHyr{a0Nwqk^SS`s`#M5GHakE!CM68e>=Mc4
z8oARegOe_Li7s(}D;hC3Dk=il_Y=qBD3Yaov5Yq!90t|%7r)sbu*atIxuWc~B%ZT=
zw2m`LP&q$AFe*4VA|L?Y{tMCW4bABf%jO-j$|jnwH8eOk2>=ts-xb2#AgRBe<*+7~
zsws`2DutFTe~>PAg)VM;FK2TyQ(ZGmR7P1*Ff>3lG(0seFE<$!Hx&#B)9@I+*B!LX
zA*Q@4ikyYMl`v~~Flu%&T4YXTST;UEA{je7JUTfyH8n3WI5IFg5d%9H06Yx<Hw*we
z0{|Dl+asd5o8YdK)uk(lnrM-AFJ^IHf@@cHWHL}$OJG$#OG!LNMJ*~kGB7$N5;h?P
zHXQ^s90Mjf9u+nN008Iz8@SLZkD`pqoh*HhcBh4LpMEf9aWG?VF<)pnP*p)tO*lY9
zCL}&PC?G2XATt600^0Z=t;CGToQcJnd##8vU~DB#UsY;WLQ+g13ppwnF)9=-D-9_x
z6(tt}9XTW#3IP-=0ssI20D!eDCIA2gYDq*vR7l6|m3Md2P#DI!+)E%KQ8b~Al_DD%
zrG+AvvhA?jF0CDQ+3Bj?yY9XBo}bh=wDla7l+=IqIfoE(_}%AS_eS+!ze)r8J5tc=
zX+fa%dSSODujj3VkW2<HQTVY7)S_=Eo+f{_<J>t%^|dAsIjdJ3KCL3nVY>-|82Fg&
z;aLI?6-nQzI`2i8rC1DtF9wx{(;a#x71k4XoWqoekm+PRUTQ*|NMSDCNEFa|a@>R{
zk@F^RM4}{PZK>~i%9$v})D3iA){iiS%;(RN-c(mvl_TsX>C><rMt-34uuev#kiD7I
z+AxPe91}~CGjRxpaqdhDo-<zXJw^I#95zx=FVSekoUM<Pfw%XJN7$iQ!o(>=p(=6-
zBdQYN(nO*ZBavcoH>pCf=!78OZ<^F0BR<(tpG`a1aBpbno-1gU5_WdR;F*)q@=*tl
zA&PND%<w<ooyjK$*VZ0)PBz(rHn+II`dEh`Yuw?+Mo1X)L+3n?-rb+Nd2_n;;iGmb
z<T7~7V)r^NTk2{sZs^4<whfF7-l{1!7>f7L3=Ru1%rboqu*7M(f?F(BAA@Zq$x)1R
zbnvAiqyuTy(+|h%5XA*2PGaU*l(*#0xV_mcqAn7{I5Dz3U98rrK?T~Hh1QV-hE=aZ
z{b$eexl;}_npm!Owvt8F<15d#<?5_-hFh!S)rd7kQXFf(9Hn!^6ZM!yPB&vj{*Czy
zA>9_NeX%m;hhjBdf{SaEmg_RZB9{vpQTLM*H6isjyl;67IL2L%j7%MofiupmGr-4*
z{zCCj=bqKEYXCRaNzR=zaKK#&IX6Sj=SNq23|l#uYo}JmPb0RnxfaRiEbR&rB|D{#
zd|B)-4`t~B!^H~0YG-h1APLoOk*T&t({7hK(#08Z!}{QqS}O%^xG>i`b_3?sL2R(<
zI&YDiuxC(`MwleVZr!td;35=U*E7F3)SiH`b@ehvxd{W&qpqxj55aX~XssWLwf}SL
z@P-2(_=p2`oV!DITk#${!{Xjo7@JX9<kO4<w+=_jkQrCrZ3K5;l;7#_gOKCI4<{by
z`*1+5E8btE@^O?1&9gBS>fT{LTX?G!@>P;TSj4a2NbuvkaEtv!3cV`8Yh+<)b)N~t
z1|rTF4t_fzg}vwr;#fUNN(aL2D4p-*WhpK-*>ZX0V>axHVNX-bWSFB&(%j{FPmwSu
zUI`LD@Zj)f&I5daC&?=!7tY73G&D(h?RTuSuniYlXxe%^;jJaKMwO4|Gm*3vI&yRy
zmU?JSM=}Evo7X$75mZ~SR)Rr-CY{%Jd&pJ4!LX!7rBr{wpnn10^L`W7><-f$lC)4U
zBlWp$;ZRl@g>2hFNqfJ~f%C<$2RGHGh%Q{ZUvi{GQjb~}swp{=RmuF45_(Tjf3YDe
zts1m>XHcK0C{*HHG*?hwkQKZnx9@6{!2?D8A?<Hc?p$%=`o2GO{q0hrvTE<mp*F?y
ikweO-B!^W0mDLYV9>@>%u;C8?0000<MNUMnLSTYd@b&!w

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 1ca95253cf0..245f528923c 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -39,7 +39,6 @@
       "dist/credentials/AsanaApi.credentials.js",
       "dist/credentials/AsanaOAuth2Api.credentials.js",
       "dist/credentials/Auth0ManagementApi.credentials.js",
-      "dist/credentials/AutomizyApi.credentials.js",
       "dist/credentials/AutopilotApi.credentials.js",
       "dist/credentials/Aws.credentials.js",
       "dist/credentials/AwsAssumeRole.credentials.js",
@@ -82,7 +81,6 @@
       "dist/credentials/CortexApi.credentials.js",
       "dist/credentials/CrateDb.credentials.js",
       "dist/credentials/CrowdStrikeOAuth2Api.credentials.js",
-      "dist/credentials/CrowdDevApi.credentials.js",
       "dist/credentials/CustomerIoApi.credentials.js",
       "dist/credentials/DatadogApi.credentials.js",
       "dist/credentials/DeepLApi.credentials.js",
@@ -200,7 +198,6 @@
       "dist/credentials/Kafka.credentials.js",
       "dist/credentials/KeapOAuth2Api.credentials.js",
       "dist/credentials/KibanaApi.credentials.js",
-      "dist/credentials/KitemakerApi.credentials.js",
       "dist/credentials/KoBoToolboxApi.credentials.js",
       "dist/credentials/Ldap.credentials.js",
       "dist/credentials/LemlistApi.credentials.js",
@@ -340,7 +337,6 @@
       "dist/credentials/SolarWindsIpamApi.credentials.js",
       "dist/credentials/SolarWindsObservabilityApi.credentials.js",
       "dist/credentials/SplunkApi.credentials.js",
-      "dist/credentials/SpontitApi.credentials.js",
       "dist/credentials/SpotifyOAuth2Api.credentials.js",
       "dist/credentials/ShufflerApi.credentials.js",
       "dist/credentials/SshPassword.credentials.js",
@@ -431,7 +427,6 @@
       "dist/nodes/ApiTemplateIo/ApiTemplateIo.node.js",
       "dist/nodes/Asana/Asana.node.js",
       "dist/nodes/Asana/AsanaTrigger.node.js",
-      "dist/nodes/Automizy/Automizy.node.js",
       "dist/nodes/Autopilot/Autopilot.node.js",
       "dist/nodes/Autopilot/AutopilotTrigger.node.js",
       "dist/nodes/Aws/AwsLambda.node.js",
@@ -487,8 +482,6 @@
       "dist/nodes/Cortex/Cortex.node.js",
       "dist/nodes/CrateDb/CrateDb.node.js",
       "dist/nodes/Cron/Cron.node.js",
-      "dist/nodes/CrowdDev/CrowdDev.node.js",
-      "dist/nodes/CrowdDev/CrowdDevTrigger.node.js",
       "dist/nodes/Crypto/Crypto.node.js",
       "dist/nodes/CustomerIo/CustomerIo.node.js",
       "dist/nodes/CustomerIo/CustomerIoTrigger.node.js",
@@ -617,7 +610,6 @@
       "dist/nodes/Kafka/KafkaTrigger.node.js",
       "dist/nodes/Keap/Keap.node.js",
       "dist/nodes/Keap/KeapTrigger.node.js",
-      "dist/nodes/Kitemaker/Kitemaker.node.js",
       "dist/nodes/KoBoToolbox/KoBoToolbox.node.js",
       "dist/nodes/KoBoToolbox/KoBoToolboxTrigger.node.js",
       "dist/nodes/Ldap/Ldap.node.js",
@@ -772,7 +764,6 @@
       "dist/nodes/Snowflake/Snowflake.node.js",
       "dist/nodes/SplitInBatches/SplitInBatches.node.js",
       "dist/nodes/Splunk/Splunk.node.js",
-      "dist/nodes/Spontit/Spontit.node.js",
       "dist/nodes/Spotify/Spotify.node.js",
       "dist/nodes/SpreadsheetFile/SpreadsheetFile.node.js",
       "dist/nodes/SseTrigger/SseTrigger.node.js",
diff --git a/packages/nodes-base/test/setup.ts b/packages/nodes-base/test/setup.ts
index 15955498ebd..8d136f8c61d 100644
--- a/packages/nodes-base/test/setup.ts
+++ b/packages/nodes-base/test/setup.ts
@@ -5,3 +5,5 @@ import 'reflect-metadata';
 process.env.N8N_RUNNERS_ENABLED = 'false';
 process.env.N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = 'false';
 process.env.N8N_VERSION = '0.0.0-test';
+// Disable file access restrictions for tests so they can read/write test files
+process.env.N8N_RESTRICT_FILE_ACCESS_TO = '';
diff --git a/packages/testing/playwright/fixtures/base.ts b/packages/testing/playwright/fixtures/base.ts
index 06d813038a2..a156c57f610 100644
--- a/packages/testing/playwright/fixtures/base.ts
+++ b/packages/testing/playwright/fixtures/base.ts
@@ -81,6 +81,7 @@ export const test = base.extend<
 					...baseConfig.env,
 					...addContainerCapability.env,
 					E2E_TESTS: 'true',
+					N8N_RESTRICT_FILE_ACCESS_TO: '',
 				},
 			};
 
diff --git a/packages/testing/playwright/pages/CanvasPage.ts b/packages/testing/playwright/pages/CanvasPage.ts
index 7b41673dbe8..992389e1989 100644
--- a/packages/testing/playwright/pages/CanvasPage.ts
+++ b/packages/testing/playwright/pages/CanvasPage.ts
@@ -164,7 +164,13 @@ export class CanvasPage extends BasePage {
 	}
 
 	async saveWorkflow(): Promise<void> {
+		const responsePromise = this.page.waitForResponse(
+			(response) =>
+				response.url().includes('/rest/workflows') &&
+				(response.request().method() === 'POST' || response.request().method() === 'PATCH'),
+		);
 		await this.clickSaveWorkflowButton();
+		await responsePromise;
 	}
 
 	getExecuteWorkflowButton(triggerNodeName?: string): Locator {
@@ -290,22 +296,27 @@ export class CanvasPage extends BasePage {
 		await this.page.locator('body').click({ position: { x: 0, y: 0 } });
 	}
 
-	async activateWorkflow() {
-		const switchElement = this.page.getByTestId('workflow-activate-switch');
-		const statusElement = this.page.getByTestId('workflow-activator-status');
-
+	async publishWorkflow(): Promise<void> {
 		const responsePromise = this.page.waitForResponse(
 			(response) =>
-				response.url().includes('/rest/workflows/') && response.request().method() === 'PATCH',
+				response.url().includes('/rest/workflows/') &&
+				response.url().includes('/activate') &&
+				response.request().method() === 'POST',
 		);
 
-		await switchElement.click();
-		await statusElement.locator('span').filter({ hasText: 'Active' }).waitFor({ state: 'visible' });
+		await this.getOpenPublishModalButton().click();
+		await this.getPublishButton().click();
+
 		await responsePromise;
 	}
 
+	async cancelPublishWorkflowModal(): Promise<void> {
+		await this.page.getByTestId('workflow-publish-cancel-button').click();
+	}
+
 	async openShareModal(): Promise<void> {
-		await this.clickByTestId('workflow-share-button');
+		await this.clickByTestId('workflow-menu');
+		await this.clickByTestId('workflow-menu-item-share');
 		await this.page.getByTestId('workflowShare-modal').waitFor({ state: 'visible' });
 	}
 
@@ -363,7 +374,7 @@ export class CanvasPage extends BasePage {
 	}
 
 	async clickWorkflowTagsContainer(): Promise<void> {
-		await this.page.getByTestId('workflow-tags-container').click();
+		await this.page.getByTestId('workflow-tags-dropdown').click();
 	}
 
 	getTagPills(): Locator {
@@ -430,8 +441,20 @@ export class CanvasPage extends BasePage {
 		return this.page.getByTestId('workflow-save-button');
 	}
 
-	getWorkflowActivatorSwitch(): Locator {
-		return this.page.getByTestId('workflow-activate-switch');
+	getOpenPublishModalButton(): Locator {
+		return this.page.getByTestId('workflow-open-publish-modal-button');
+	}
+
+	getPublishModalCallout(): Locator {
+		return this.page.getByTestId('workflowPublish-modal').locator('.n8n-callout');
+	}
+
+	getPublishButton(): Locator {
+		return this.page.getByTestId('workflow-publish-button');
+	}
+
+	getPublishedIndicator(): Locator {
+		return this.page.getByTestId('workflow-active-version-indicator');
 	}
 
 	getLoadingMask(): Locator {
diff --git a/packages/testing/playwright/pages/WorkflowSettingsModal.ts b/packages/testing/playwright/pages/WorkflowSettingsModal.ts
index 5c64d595fab..7192b1781e2 100644
--- a/packages/testing/playwright/pages/WorkflowSettingsModal.ts
+++ b/packages/testing/playwright/pages/WorkflowSettingsModal.ts
@@ -67,6 +67,22 @@ export class WorkflowSettingsModal extends BasePage {
 		return this.page.getByTestId('workflow-menu-item-push');
 	}
 
+	getUnpublishMenuItem(): Locator {
+		return this.page.getByTestId('workflow-menu-item-unpublish');
+	}
+
+	getUnpublishModal(): Locator {
+		return this.page.getByTestId('workflow-history-version-unpublish-modal');
+	}
+
+	async clickUnpublishMenuItem(): Promise<void> {
+		await this.getUnpublishMenuItem().click();
+	}
+
+	async confirmUnpublishModal(): Promise<void> {
+		await this.getUnpublishModal().getByRole('button', { name: 'Unpublish' }).click();
+	}
+
 	getSaveButton(): Locator {
 		return this.page.getByRole('button', { name: 'Save' });
 	}
diff --git a/packages/testing/playwright/playwright.config.ts b/packages/testing/playwright/playwright.config.ts
index 6bdf9aa8bd9..ac2ffc43faf 100644
--- a/packages/testing/playwright/playwright.config.ts
+++ b/packages/testing/playwright/playwright.config.ts
@@ -61,6 +61,7 @@ export default defineConfig<CurrentsFixtures, CurrentsWorkerFixtures>({
 					N8N_USER_FOLDER: USER_FOLDER,
 					N8N_LOG_LEVEL: 'debug',
 					N8N_METRICS: 'true',
+					N8N_RESTRICT_FILE_ACCESS_TO: '',
 					...getTestEnv(),
 				},
 			}
diff --git a/packages/testing/playwright/services/workflow-api-helper.ts b/packages/testing/playwright/services/workflow-api-helper.ts
index 1e67a364029..36a18d23b66 100644
--- a/packages/testing/playwright/services/workflow-api-helper.ts
+++ b/packages/testing/playwright/services/workflow-api-helper.ts
@@ -77,15 +77,21 @@ export class WorkflowApiHelper {
 		};
 	}
 
-	async setActive(workflowId: string, active: boolean) {
-		const response = await this.api.request.patch(`/rest/workflows/${workflowId}?forceSave=true`, {
-			data: { active },
+	async activate(workflowId: string, versionId: string) {
+		const response = await this.api.request.post(`/rest/workflows/${workflowId}/activate`, {
+			data: { versionId },
 		});
 
 		if (!response.ok()) {
-			throw new TestError(
-				`Failed to ${active ? 'activate' : 'deactivate'} workflow: ${await response.text()}`,
-			);
+			throw new TestError(`Failed to activate workflow: ${await response.text()}`);
+		}
+	}
+
+	async deactivate(workflowId: string) {
+		const response = await this.api.request.post(`/rest/workflows/${workflowId}/deactivate`);
+
+		if (!response.ok()) {
+			throw new TestError(`Failed to deactivate workflow: ${await response.text()}`);
 		}
 	}
 
@@ -172,13 +178,12 @@ export class WorkflowApiHelper {
 		workflowDefinition: Partial<IWorkflowBase>,
 		options?: { webhookPrefix?: string; idLength?: number; makeUnique?: boolean },
 	): Promise<WorkflowImportResult> {
+		// Store original active state
 		const result = await this.createWorkflowFromDefinition(workflowDefinition, options);
 
-		// Ensure the workflow is in the correct active state as specified in the JSON
 		if (workflowDefinition.active) {
-			await this.setActive(result.workflowId, workflowDefinition.active);
+			await this.activate(result.workflowId, result.createdWorkflow.versionId!);
 		}
-
 		return result;
 	}
 
diff --git a/packages/testing/playwright/tests/cli-workflows/credentials.json b/packages/testing/playwright/tests/cli-workflows/credentials.json
index e4c3d0df8a2..2490733714e 100644
--- a/packages/testing/playwright/tests/cli-workflows/credentials.json
+++ b/packages/testing/playwright/tests/cli-workflows/credentials.json
@@ -727,20 +727,6 @@
 			}
 		]
 	},
-	{
-		"createdAt": "2021-02-25T09:33:08.283Z",
-		"updatedAt": "2021-02-25T09:33:08.283Z",
-		"id": "54",
-		"name": "Spontit creds",
-		"data": "U2FsdGVkX1+QF2n37wTEYca2sh443csUZOySmaVJKlkMmJI5l/WuQAosIp6svTJxIDiQUtfPgT1HoxjuGqE/gZxduaAukURLug1zFrPA2zDrzcNtDnH1vColOJB1Rlr3WpmpPxQUVtmlkFgmA/evrDlEsHs6y/aGXoi3oXaqVxD0icyEiK0sqnjkOjx2K15q3pdK3+MNlKfEhLSvtceRhg==",
-		"type": "spontitApi",
-		"nodesAccess": [
-			{
-				"nodeType": "n8n-nodes-base.spontit",
-				"date": "2021-02-25T09:33:08.272Z"
-			}
-		]
-	},
 	{
 		"createdAt": "2021-02-25T10:01:00.363Z",
 		"updatedAt": "2021-02-25T10:11:56.314Z",
@@ -2181,20 +2167,6 @@
 			}
 		]
 	},
-	{
-		"createdAt": "2021-05-03T07:29:32.307Z",
-		"updatedAt": "2021-05-03T07:29:32.307Z",
-		"id": "159",
-		"name": "Kitemaker API creds",
-		"data": "U2FsdGVkX1+t3XGAixnfonj+DKGY3E9e89cyuNIQ0HOJ7b+tRdw6oot4mR/E5Rs4DFvTmQ8fSVmmksz0eA/Jlj/lsZphI3c9OjmbZIimFSY=",
-		"type": "kitemakerApi",
-		"nodesAccess": [
-			{
-				"nodeType": "n8n-nodes-base.kitemaker",
-				"date": "2021-05-03T07:29:32.301Z"
-			}
-		]
-	},
 	{
 		"createdAt": "2021-05-03T14:31:02.284Z",
 		"updatedAt": "2021-11-12T13:13:11.267Z",
diff --git a/packages/testing/playwright/tests/cli-workflows/workflow-tests.spec.ts-snapshots/workflow-195-schema-mode-workflows.snap b/packages/testing/playwright/tests/cli-workflows/workflow-tests.spec.ts-snapshots/workflow-195-schema-mode-workflows.snap
deleted file mode 100644
index d33ca688800..00000000000
--- a/packages/testing/playwright/tests/cli-workflows/workflow-tests.spec.ts-snapshots/workflow-195-schema-mode-workflows.snap
+++ /dev/null
@@ -1,429 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "type": "object",
-  "properties": {
-    "data": {
-      "type": "object",
-      "properties": {
-        "startData": {
-          "type": "object",
-          "properties": {}
-        },
-        "resultData": {
-          "type": "object",
-          "properties": {
-            "runData": {
-              "type": "object",
-              "properties": {
-                "Start": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "startTime": {
-                        "type": "number"
-                      },
-                      "executionIndex": {
-                        "type": "number"
-                      },
-                      "source": {
-                        "type": "array",
-                        "items": {}
-                      },
-                      "hints": {
-                        "type": "array",
-                        "items": {}
-                      },
-                      "executionTime": {
-                        "type": "number"
-                      },
-                      "executionStatus": {
-                        "type": "string"
-                      },
-                      "data": {
-                        "type": "object",
-                        "properties": {
-                          "main": {
-                            "type": "array",
-                            "items": {
-                              "type": "array"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "Kitemaker1": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "startTime": {
-                        "type": "number"
-                      },
-                      "executionIndex": {
-                        "type": "number"
-                      },
-                      "source": {
-                        "type": "array",
-                        "items": {
-                          "type": "object",
-                          "properties": {
-                            "previousNode": {
-                              "type": "string"
-                            }
-                          }
-                        }
-                      },
-                      "hints": {
-                        "type": "array",
-                        "items": {}
-                      },
-                      "executionTime": {
-                        "type": "number"
-                      },
-                      "executionStatus": {
-                        "type": "string"
-                      },
-                      "data": {
-                        "type": "object",
-                        "properties": {
-                          "main": {
-                            "type": "array",
-                            "items": {
-                              "type": "array"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "Kitemaker": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "startTime": {
-                        "type": "number"
-                      },
-                      "executionIndex": {
-                        "type": "number"
-                      },
-                      "source": {
-                        "type": "array",
-                        "items": {
-                          "type": "object",
-                          "properties": {
-                            "previousNode": {
-                              "type": "string"
-                            }
-                          }
-                        }
-                      },
-                      "hints": {
-                        "type": "array",
-                        "items": {}
-                      },
-                      "executionTime": {
-                        "type": "number"
-                      },
-                      "executionStatus": {
-                        "type": "string"
-                      },
-                      "data": {
-                        "type": "object",
-                        "properties": {
-                          "main": {
-                            "type": "array",
-                            "items": {
-                              "type": "array"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "Kitemaker2": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "startTime": {
-                        "type": "number"
-                      },
-                      "executionIndex": {
-                        "type": "number"
-                      },
-                      "source": {
-                        "type": "array",
-                        "items": {
-                          "type": "object",
-                          "properties": {
-                            "previousNode": {
-                              "type": "string"
-                            }
-                          }
-                        }
-                      },
-                      "hints": {
-                        "type": "array",
-                        "items": {}
-                      },
-                      "executionTime": {
-                        "type": "number"
-                      },
-                      "executionStatus": {
-                        "type": "string"
-                      },
-                      "data": {
-                        "type": "object",
-                        "properties": {
-                          "main": {
-                            "type": "array",
-                            "items": {
-                              "type": "array"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "Kitemaker3": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "startTime": {
-                        "type": "number"
-                      },
-                      "executionIndex": {
-                        "type": "number"
-                      },
-                      "source": {
-                        "type": "array",
-                        "items": {
-                          "type": "object",
-                          "properties": {
-                            "previousNode": {
-                              "type": "string"
-                            }
-                          }
-                        }
-                      },
-                      "hints": {
-                        "type": "array",
-                        "items": {}
-                      },
-                      "executionTime": {
-                        "type": "number"
-                      },
-                      "executionStatus": {
-                        "type": "string"
-                      },
-                      "data": {
-                        "type": "object",
-                        "properties": {
-                          "main": {
-                            "type": "array",
-                            "items": {
-                              "type": "array"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "Kitemaker4": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "startTime": {
-                        "type": "number"
-                      },
-                      "executionIndex": {
-                        "type": "number"
-                      },
-                      "source": {
-                        "type": "array",
-                        "items": {
-                          "type": "object",
-                          "properties": {
-                            "previousNode": {
-                              "type": "string"
-                            }
-                          }
-                        }
-                      },
-                      "hints": {
-                        "type": "array",
-                        "items": {}
-                      },
-                      "executionTime": {
-                        "type": "number"
-                      },
-                      "executionStatus": {
-                        "type": "string"
-                      },
-                      "data": {
-                        "type": "object",
-                        "properties": {
-                          "main": {
-                            "type": "array",
-                            "items": {
-                              "type": "array"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "Kitemaker5": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "startTime": {
-                        "type": "number"
-                      },
-                      "executionIndex": {
-                        "type": "number"
-                      },
-                      "source": {
-                        "type": "array",
-                        "items": {
-                          "type": "object",
-                          "properties": {
-                            "previousNode": {
-                              "type": "string"
-                            }
-                          }
-                        }
-                      },
-                      "hints": {
-                        "type": "array",
-                        "items": {}
-                      },
-                      "executionTime": {
-                        "type": "number"
-                      },
-                      "executionStatus": {
-                        "type": "string"
-                      },
-                      "data": {
-                        "type": "object",
-                        "properties": {
-                          "main": {
-                            "type": "array",
-                            "items": {
-                              "type": "array"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                },
-                "Kitemaker6": {
-                  "type": "array",
-                  "items": {
-                    "type": "object",
-                    "properties": {
-                      "startTime": {
-                        "type": "number"
-                      },
-                      "executionIndex": {
-                        "type": "number"
-                      },
-                      "source": {
-                        "type": "array",
-                        "items": {
-                          "type": "object",
-                          "properties": {
-                            "previousNode": {
-                              "type": "string"
-                            }
-                          }
-                        }
-                      },
-                      "hints": {
-                        "type": "array",
-                        "items": {}
-                      },
-                      "executionTime": {
-                        "type": "number"
-                      },
-                      "executionStatus": {
-                        "type": "string"
-                      },
-                      "data": {
-                        "type": "object",
-                        "properties": {
-                          "main": {
-                            "type": "array",
-                            "items": {
-                              "type": "array"
-                            }
-                          }
-                        }
-                      }
-                    }
-                  }
-                }
-              }
-            },
-            "lastNodeExecuted": {
-              "type": "string"
-            }
-          }
-        },
-        "executionData": {
-          "type": "object",
-          "properties": {
-            "contextData": {
-              "type": "object",
-              "properties": {}
-            },
-            "nodeExecutionStack": {
-              "type": "array",
-              "items": {}
-            },
-            "metadata": {
-              "type": "object",
-              "properties": {}
-            },
-            "waitingExecution": {
-              "type": "object",
-              "properties": {}
-            },
-            "waitingExecutionSource": {
-              "type": "object",
-              "properties": {}
-            }
-          }
-        }
-      }
-    },
-    "mode": {
-      "type": "string"
-    },
-    "startedAt": {
-      "type": "string"
-    },
-    "stoppedAt": {
-      "type": "string"
-    },
-    "status": {
-      "type": "string"
-    },
-    "finished": {
-      "type": "boolean"
-    }
-  }
-}
\ No newline at end of file
diff --git a/packages/testing/playwright/tests/cli-workflows/workflows/65.json b/packages/testing/playwright/tests/cli-workflows/workflows/65.json
deleted file mode 100644
index 1245284e696..00000000000
--- a/packages/testing/playwright/tests/cli-workflows/workflows/65.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-	"createdAt": "2021-02-25T09:43:01.461Z",
-	"updatedAt": "2021-02-25T09:43:01.461Z",
-	"id": "65",
-	"name": "Spontit:Push:create",
-	"active": false,
-	"nodes": [
-		{
-			"parameters": {},
-			"name": "Start",
-			"type": "n8n-nodes-base.start",
-			"typeVersion": 1,
-			"position": [250, 300],
-			"id": "e33d511e-ced8-4880-a890-e943c6aab5dc"
-		},
-		{
-			"parameters": {
-				"content": "=Content {{Date.now()}}",
-				"additionalFields": {
-					"pushTitle": "=TestNotif {{Date.now()}}"
-				}
-			},
-			"name": "Spontit",
-			"type": "n8n-nodes-base.spontit",
-			"typeVersion": 1,
-			"position": [470, 300],
-			"credentials": {
-				"spontitApi": {
-					"id": "54",
-					"name": "Spontit creds"
-				}
-			},
-			"id": "06d02833-8870-4d12-a60f-59c1763f0361"
-		},
-		{
-			"parameters": {
-				"url": "={{$node[\"Spontit\"].json[\"message\"].replace(\"Pushed! Available at \",\"\")}}",
-				"responseFormat": "string",
-				"options": {}
-			},
-			"name": "HTTP Request",
-			"type": "n8n-nodes-base.httpRequest",
-			"typeVersion": 1,
-			"position": [650, 300],
-			"id": "e22a1da8-01dc-476f-b449-527888f5d58e"
-		},
-		{
-			"parameters": {
-				"extractionValues": {
-					"values": [
-						{
-							"key": "data-subscription",
-							"cssSelector": "#loadApp_script[data-subscription]",
-							"returnValue": "attribute",
-							"attribute": "data-subscription"
-						}
-					]
-				},
-				"options": {}
-			},
-			"name": "HTML Extract",
-			"type": "n8n-nodes-base.htmlExtract",
-			"typeVersion": 1,
-			"position": [850, 300],
-			"id": "641a91ef-f7a2-4f1a-8876-bd0b0cf133cb"
-		}
-	],
-	"connections": {
-		"Start": {
-			"main": [
-				[
-					{
-						"node": "Spontit",
-						"type": "main",
-						"index": 0
-					}
-				]
-			]
-		},
-		"Spontit": {
-			"main": [
-				[
-					{
-						"node": "HTTP Request",
-						"type": "main",
-						"index": 0
-					}
-				]
-			]
-		},
-		"HTTP Request": {
-			"main": [
-				[
-					{
-						"node": "HTML Extract",
-						"type": "main",
-						"index": 0
-					}
-				]
-			]
-		}
-	},
-	"settings": {},
-	"staticData": null,
-	"meta": null,
-	"pinData": null,
-	"versionId": null,
-	"triggerCount": 0,
-	"tags": []
-}
diff --git a/packages/testing/playwright/tests/ui/13-pinning.spec.ts b/packages/testing/playwright/tests/ui/13-pinning.spec.ts
index 92632314409..b54570bdde2 100644
--- a/packages/testing/playwright/tests/ui/13-pinning.spec.ts
+++ b/packages/testing/playwright/tests/ui/13-pinning.spec.ts
@@ -205,7 +205,7 @@ test.describe('Data pinning', () => {
 		}) => {
 			await setupRequirements(webhookTestRequirements);
 			await expect(n8n.canvas.getWorkflowSaveButton()).toContainText('Saved');
-			await n8n.canvas.activateWorkflow();
+			await n8n.canvas.publishWorkflow();
 			const webhookUrl = '/webhook/b0d79ddb-df2d-49b1-8555-9fa2b482608f';
 			const response = await n8n.ndv.makeWebhookRequest(webhookUrl);
 			expect(response.status(), 'Webhook response is: ' + (await response.text())).toBe(200);
diff --git a/packages/testing/playwright/tests/ui/53-workflow-production-checklist.spec.ts b/packages/testing/playwright/tests/ui/53-workflow-production-checklist.spec.ts
index 55626547b19..dc69d11b983 100644
--- a/packages/testing/playwright/tests/ui/53-workflow-production-checklist.spec.ts
+++ b/packages/testing/playwright/tests/ui/53-workflow-production-checklist.spec.ts
@@ -7,7 +7,7 @@ test.describe('Workflow Production Checklist', () => {
 		await n8n.start.fromBlankCanvas();
 	});
 
-	test('should show suggested actions automatically when workflow is first activated', async ({
+	test('should show suggested actions automatically when workflow is first published', async ({
 		n8n,
 	}) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
@@ -15,8 +15,7 @@ test.describe('Workflow Production Checklist', () => {
 
 		await expect(n8n.canvas.getProductionChecklistButton()).toBeHidden();
 
-		await n8n.canvas.activateWorkflow();
-
+		await n8n.canvas.publishWorkflow();
 		await expect(n8n.workflowActivationModal.getModal()).toBeVisible();
 		await n8n.workflowActivationModal.close();
 
@@ -37,7 +36,7 @@ test.describe('Workflow Production Checklist', () => {
 		await n8n.canvas.nodeDisableButton('Message a model').click();
 
 		await n8n.canvas.saveWorkflow();
-		await n8n.canvas.activateWorkflow();
+		await n8n.canvas.publishWorkflow();
 		await expect(n8n.workflowActivationModal.getModal()).toBeVisible();
 		await n8n.workflowActivationModal.close();
 
@@ -54,7 +53,7 @@ test.describe('Workflow Production Checklist', () => {
 	}) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
 		await n8n.canvas.saveWorkflow();
-		await n8n.canvas.activateWorkflow();
+		await n8n.canvas.publishWorkflow();
 		await expect(n8n.workflowActivationModal.getModal()).toBeVisible();
 		await n8n.workflowActivationModal.close();
 
@@ -71,7 +70,7 @@ test.describe('Workflow Production Checklist', () => {
 	test('should open workflow settings modal when time saved action is clicked', async ({ n8n }) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
 		await n8n.canvas.saveWorkflow();
-		await n8n.canvas.activateWorkflow();
+		await n8n.canvas.publishWorkflow();
 		await expect(n8n.workflowActivationModal.getModal()).toBeVisible();
 		await n8n.workflowActivationModal.close();
 
@@ -87,7 +86,7 @@ test.describe('Workflow Production Checklist', () => {
 	test('should allow ignoring individual actions', async ({ n8n }) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
 		await n8n.canvas.saveWorkflow();
-		await n8n.canvas.activateWorkflow();
+		await n8n.canvas.publishWorkflow();
 		await expect(n8n.workflowActivationModal.getModal()).toBeVisible();
 		await n8n.workflowActivationModal.close();
 
@@ -107,7 +106,7 @@ test.describe('Workflow Production Checklist', () => {
 	test('should show completed state for configured actions', async ({ n8n }) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
 		await n8n.canvas.saveWorkflow();
-		await n8n.canvas.activateWorkflow();
+		await n8n.canvas.publishWorkflow();
 		await expect(n8n.workflowActivationModal.getModal()).toBeVisible();
 		await n8n.workflowActivationModal.close();
 
@@ -132,7 +131,7 @@ test.describe('Workflow Production Checklist', () => {
 	test('should allow ignoring all actions with confirmation', async ({ n8n }) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
 		await n8n.canvas.saveWorkflow();
-		await n8n.canvas.activateWorkflow();
+		await n8n.canvas.publishWorkflow();
 		await expect(n8n.workflowActivationModal.getModal()).toBeVisible();
 		await n8n.workflowActivationModal.close();
 
diff --git a/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts b/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts
index 0b26e8bc16e..4f05ef1785d 100644
--- a/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts
+++ b/packages/testing/playwright/tests/ui/7-workflow-actions.spec.ts
@@ -101,38 +101,35 @@ test.describe('Workflow Actions', () => {
 		expect(patchRequests).toHaveLength(1);
 	});
 
-	test('should not be able to activate unsaved workflow', async ({ n8n }) => {
-		await expect(n8n.canvas.getWorkflowActivatorSwitch().locator('input').first()).toBeDisabled();
-	});
-
-	test('should not be able to activate workflow without trigger node', async ({ n8n }) => {
+	test('should not be able to publish workflow without trigger node', async ({ n8n }) => {
 		await n8n.canvas.addNode(MANUAL_TRIGGER_NODE_NAME);
-		await n8n.canvas.saveWorkflow();
+		await n8n.canvas.getOpenPublishModalButton().click();
 
-		await expect(n8n.canvas.getWorkflowActivatorSwitch().locator('input').first()).toBeDisabled();
+		await expect(n8n.canvas.getPublishButton()).toBeDisabled();
 	});
 
-	test('should be able to activate workflow', async ({ n8n }) => {
+	test('should be able to publish workflow', async ({ n8n }) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		await n8n.canvas.saveWorkflow();
-		await n8n.canvas.activateWorkflow();
+		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
 
-		await expect(n8n.canvas.getWorkflowActivatorSwitch()).toHaveClass(/is-checked/);
+		await n8n.canvas.publishWorkflow();
+
+		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
 	});
 
-	test('should not be able to activate workflow when nodes have errors', async ({ n8n }) => {
+	test('should not be able to publish workflow when nodes have errors', async ({ n8n }) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
 		await n8n.canvas.addNode(NOTION_NODE_NAME, { action: 'Append a block', closeNDV: true });
 		await n8n.canvas.saveWorkflow();
 
-		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+		await n8n.canvas.getOpenPublishModalButton().click();
 
-		await n8n.canvas.getWorkflowActivatorSwitch().click();
+		await expect(n8n.canvas.getPublishButton()).toBeDisabled();
 
-		await expect(n8n.notifications.getErrorNotifications().first()).toBeVisible();
+		await expect(n8n.canvas.getPublishModalCallout()).toBeVisible();
 	});
 
-	test('should be able to activate workflow when nodes with errors are disabled', async ({
+	test('should be able to publish workflow when nodes with errors are disabled', async ({
 		n8n,
 	}) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
@@ -141,16 +138,17 @@ test.describe('Workflow Actions', () => {
 
 		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
 
-		await n8n.canvas.getWorkflowActivatorSwitch().click();
+		await n8n.canvas.getOpenPublishModalButton().click();
 
-		await expect(n8n.notifications.getErrorNotifications().first()).toBeVisible();
+		await expect(n8n.canvas.getPublishButton()).toBeDisabled();
+		await n8n.canvas.cancelPublishWorkflowModal();
 
 		const nodeName = await n8n.canvas.getCanvasNodes().last().getAttribute('data-node-name');
 		await n8n.canvas.toggleNodeEnabled(nodeName!);
 
-		await n8n.canvas.activateWorkflow();
+		await n8n.canvas.publishWorkflow();
 
-		await expect(n8n.canvas.getWorkflowActivatorSwitch()).toHaveClass(/is-checked/);
+		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
 	});
 
 	test('should save new workflow after renaming', async ({ n8n }) => {
@@ -351,6 +349,7 @@ test.describe('Workflow Actions', () => {
 
 		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
 		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+
 		await n8n.workflowSettingsModal.clickArchiveMenuItem();
 
 		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
@@ -370,13 +369,13 @@ test.describe('Workflow Actions', () => {
 		await expect(n8n.page).toHaveURL(/\/workflows$/);
 	});
 
-	test('should archive active workflow and then delete it', async ({ n8n }) => {
+	test('should archive published workflow and then delete it', async ({ n8n }) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
 		const workflowId = await saveWorkflowAndGetId(n8n);
-		await n8n.canvas.activateWorkflow();
+		await n8n.canvas.publishWorkflow();
 		await n8n.page.keyboard.press('Escape');
 
-		await expect(n8n.canvas.getWorkflowActivatorSwitch()).toHaveClass(/is-checked/);
+		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
 		await expect(n8n.canvas.getArchivedTag()).not.toBeAttached();
 
 		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
@@ -391,7 +390,7 @@ test.describe('Workflow Actions', () => {
 
 		await expect(n8n.canvas.getArchivedTag()).toBeVisible();
 		await expect(n8n.canvas.getNodeCreatorPlusButton()).not.toBeAttached();
-		await expect(n8n.canvas.getWorkflowActivatorSwitch()).not.toHaveClass(/is-checked/);
+		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
 
 		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
 		await n8n.workflowSettingsModal.getWorkflowMenu().click();
@@ -408,6 +407,7 @@ test.describe('Workflow Actions', () => {
 
 		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
 		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+
 		await n8n.workflowSettingsModal.clickArchiveMenuItem();
 
 		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
@@ -427,13 +427,40 @@ test.describe('Workflow Actions', () => {
 		await expect(n8n.canvas.getNodeCreatorPlusButton()).toBeVisible();
 	});
 
-	test('should deactivate active workflow on archive', async ({ n8n }) => {
+	test('should not show unpublish menu item for non-published workflow', async ({ n8n }) => {
 		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
-		const workflowId = await saveWorkflowAndGetId(n8n);
-		await n8n.canvas.activateWorkflow();
+		await n8n.canvas.saveWorkflow();
+
+		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
+
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+		await expect(n8n.workflowSettingsModal.getUnpublishMenuItem()).not.toBeAttached();
+	});
+
+	test('should unpublish a published workflow', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		await n8n.canvas.publishWorkflow();
 		await n8n.page.keyboard.press('Escape');
 
-		await expect(n8n.canvas.getWorkflowActivatorSwitch()).toHaveClass(/is-checked/);
+		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
+
+		await n8n.workflowSettingsModal.getWorkflowMenu().click();
+		await n8n.workflowSettingsModal.clickUnpublishMenuItem();
+
+		await expect(n8n.workflowSettingsModal.getUnpublishModal()).toBeVisible();
+		await n8n.workflowSettingsModal.confirmUnpublishModal();
+
+		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
+		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
+	});
+
+	test('should unpublish published workflow on archive', async ({ n8n }) => {
+		await n8n.canvas.addNode(SCHEDULE_TRIGGER_NODE_NAME, { closeNDV: true });
+		const workflowId = await saveWorkflowAndGetId(n8n);
+		await n8n.canvas.publishWorkflow();
+		await n8n.page.keyboard.press('Escape');
+
+		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
 
 		await n8n.workflowSettingsModal.getWorkflowMenu().click();
 		await n8n.workflowSettingsModal.clickArchiveMenuItem();
@@ -445,8 +472,8 @@ test.describe('Workflow Actions', () => {
 		await goToWorkflow(n8n, workflowId);
 
 		await expect(n8n.canvas.getArchivedTag()).toBeVisible();
-		await expect(n8n.canvas.getWorkflowActivatorSwitch()).not.toHaveClass(/is-checked/);
-		await expect(n8n.canvas.getWorkflowActivatorSwitch().locator('input').first()).toBeDisabled();
+		await expect(n8n.canvas.getPublishedIndicator()).not.toBeVisible();
+		await expect(n8n.canvas.getPublishButton()).not.toBeVisible();
 
 		await expect(n8n.workflowSettingsModal.getWorkflowMenu()).toBeVisible();
 		await n8n.workflowSettingsModal.getWorkflowMenu().click();
@@ -455,10 +482,11 @@ test.describe('Workflow Actions', () => {
 		await expect(n8n.notifications.getSuccessNotifications().first()).toBeVisible();
 		await expect(n8n.canvas.getArchivedTag()).not.toBeAttached();
 
-		await n8n.canvas.activateWorkflow();
+		await n8n.canvas.publishWorkflow();
 		await n8n.page.keyboard.press('Escape');
 
-		await expect(n8n.canvas.getWorkflowActivatorSwitch()).toHaveClass(/is-checked/);
+		await expect(n8n.canvas.getPublishedIndicator()).toBeVisible();
+		await expect(n8n.canvas.getOpenPublishModalButton()).toBeVisible();
 	});
 
 	test.describe('duplicate workflow', () => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 745aeb3c714..2779171a65a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -555,8 +555,8 @@ importers:
         specifier: 1.12.0
         version: 1.12.0(debug@4.4.1)
       dotenv:
-        specifier: 8.6.0
-        version: 8.6.0
+        specifier: 17.2.3
+        version: 17.2.3
       nanoid:
         specifier: 'catalog:'
         version: 3.3.8
@@ -1584,8 +1584,8 @@ importers:
         specifier: 3.1.0
         version: 3.1.0
       dotenv:
-        specifier: 8.6.0
-        version: 8.6.0
+        specifier: 17.2.3
+        version: 17.2.3
       express:
         specifier: 5.1.0
         version: 5.1.0
@@ -11142,17 +11142,13 @@ packages:
     resolution: {integrity: sha512-1gxPBJpI/pcjQhKgIU91II6Wkay+dLcN3M6rf2uwP8hRur3HtQXjVrdAK3sjC0piaEuxzMwjXChcETiJl47lAQ==}
     engines: {node: '>=18'}
 
-  dotenv@16.3.1:
-    resolution: {integrity: sha512-IPzF4w4/Rd94bA9imS68tZBaYyBWSCE47V1RGuMrB94iyTOIEwRmVL2x/4An+6mETpLrKJ5hQkB8W4kFAadeIQ==}
-    engines: {node: '>=12'}
-
   dotenv@16.6.1:
     resolution: {integrity: sha512-uBq4egWHTcTt33a72vpSG0z3HnPuIl6NqYcTrKEg2azoEyl2hpW0zqlxysq2pK9HlDIHyHyakeYaYnSAwd8bow==}
     engines: {node: '>=12'}
 
-  dotenv@8.6.0:
-    resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==}
-    engines: {node: '>=10'}
+  dotenv@17.2.3:
+    resolution: {integrity: sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==}
+    engines: {node: '>=12'}
 
   dreamopt@0.8.0:
     resolution: {integrity: sha512-vyJTp8+mC+G+5dfgsY+r3ckxlz+QMX40VjPQsZc5gxVAxLmi64TBoVkP54A/pRAXMXsbu2GMMBrZPxNv23waMg==}
@@ -28360,11 +28356,9 @@ snapshots:
     dependencies:
       type-fest: 4.26.1
 
-  dotenv@16.3.1: {}
-
   dotenv@16.6.1: {}
 
-  dotenv@8.6.0: {}
+  dotenv@17.2.3: {}
 
   dreamopt@0.8.0:
     dependencies:
@@ -30282,7 +30276,7 @@ snapshots:
   infisical-node@1.3.0:
     dependencies:
       axios: 1.12.0(debug@4.4.1)
-      dotenv: 16.3.1
+      dotenv: 16.6.1
       tweetnacl: 1.0.3
       tweetnacl-util: 0.15.1
     transitivePeerDependencies: