diff --git a/.github/workflows/flow-citr-extended-ci-tests.yaml b/.github/workflows/flow-citr-extended-ci-tests.yaml
index 8bdf739a36db..cbb2c6c4233e 100644
--- a/.github/workflows/flow-citr-extended-ci-tests.yaml
+++ b/.github/workflows/flow-citr-extended-ci-tests.yaml
@@ -19,7 +19,6 @@ on:
   schedule:
     # Runs Extended Test Suite every three hours
     - cron: '0 */3 * * *'
-    - cron: '0 3 * * *' # use this schedule for the extended release check 0300 UTC
 
 defaults:
   run:
@@ -42,35 +41,37 @@ jobs:
       - name: Checkout Code
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-  release-adhoc:
-    name: Nightly Release [Adhoc]
-    # only run release-adhoc at 0300 UTC scheduled job
-    if: github.event.schedule == '0 3 * * *'
-    needs: [hammer, fuzz]
-    uses: ./.github/workflows/node-zxc-build-release-artifact.yaml
-    with:
-      version-policy: branch-commit
-      trigger-env-deploy: none
-      release-profile: AdhocCommit
-      dry-run-enabled: ${{ github.event.inputs.dry-run-enabled == 'true' }}
-      java-version: ${{ github.event.inputs.java-version || '21.0.1' }}
-      java-distribution: ${{ github.event.inputs.java-distribution || 'temurin' }}
-      gradle-version: ${{ github.event.inputs.gradle-version || 'wrapper' }}
+  longtest:
+    name: Long-Running Tests
+    runs-on: [ self-hosted, Linux, medium, ephemeral ]
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+  smoke: # Testnet / mainnet migration tests
+    name: Smoke Tests
+    runs-on: [ self-hosted, Linux, medium, ephemeral ]
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+        run: echo "Upload test result data"
+
+  reports:
+    name: Upload Test Results
+    runs-on: [ self-hosted, Linux, medium, ephemeral ]
+
+  tag:
+    name: Tag for promotion / release
+    runs-on: [ self-hosted, Linux, medium, ephemeral ]
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
+
+      - name: Add BuildID Tag
+        run: echo "Add Build Identifier"
 
-    secrets:
-      access-token: ${{ secrets.GITHUB_TOKEN }}
-      bucket-name: ${{ secrets.RELEASE_ARTIFACT_BUCKET_NAME }}
-      cdn-bucket-name: ${{ secrets.CDN_ARTIFACT_BUCKET_NAME }}
-      svcs-ossrh-username: ${{ secrets.SVCS_OSSRH_USERNAME }}
-      svcs-ossrh-password: ${{ secrets.SVCS_OSSRH_PASSWORD }}
-      svcs-gpg-key-contents: ${{ secrets.SVCS_GPG_KEY_CONTENTS }}
-      svcs-gpg-key-passphrase: ${{ secrets.SVCS_GPG_KEY_PASSPHRASE }}
-      sdk-ossrh-username: ${{ secrets.PLATFORM_OSSRH_USERNAME }}
-      sdk-ossrh-password: ${{ secrets.PLATFORM_OSSRH_PASSWORD }}
-      sdk-gpg-key-contents: ${{ secrets.PLATFORM_GPG_KEY_CONTENTS }}
-      sdk-gpg-key-passphrase: ${{ secrets.PLATFORM_GPG_KEY_PASSPHRASE }}
-      slack-webhook-url: ${{ secrets.PLATFORM_SLACK_RELEASE_WEBHOOK }}
-      jf-url: ${{ vars.JF_URL }}
-      jf-docker-registry: ${{ vars.JF_DOCKER_REGISTRY }}
-      jf-user-name: ${{ vars.JF_USER_NAME }}
-      jf-access-token: ${{ secrets.JF_ACCESS_TOKEN }}
\ No newline at end of file
+      - name: Add Promotion Tag
+        run: echo "Add promotion tag"
diff --git a/.github/workflows/node-flow-deploy-adhoc-artifact.yaml b/.github/workflows/node-flow-deploy-adhoc-artifact.yaml
index 2160fee3da9b..272c31a857d1 100644
--- a/.github/workflows/node-flow-deploy-adhoc-artifact.yaml
+++ b/.github/workflows/node-flow-deploy-adhoc-artifact.yaml
@@ -16,6 +16,8 @@
 
 name: "Node: Deploy Adhoc Release"
 on:
+  schedule:
+    - cron: '0 3 * * *' # use this schedule for the extended release check 0300 UTC
   workflow_dispatch:
     inputs:
       dry-run-enabled:
@@ -45,7 +47,7 @@ defaults:
 
 jobs:
   release-adhoc:
-    name: Release [Adhoc]
+    name: Release [Adhoc] (workflow_dispatch)
     if: ${{ github.event_name == 'workflow_dispatch' }}
     uses: ./.github/workflows/node-zxc-build-release-artifact.yaml
     with:
@@ -74,3 +76,34 @@ jobs:
       jf-docker-registry: ${{ vars.JF_DOCKER_REGISTRY }}
       jf-user-name: ${{ vars.JF_USER_NAME }}
       jf-access-token: ${{ secrets.JF_ACCESS_TOKEN }}
+
+  release-adhoc-cron:
+    name: Release [Adhoc] (Nightly)
+    if: ${{ github.event_name != 'workflow_dispatch' && github.event.schedule == '0 3 * * *' }}
+    uses: ./.github/workflows/node-zxc-build-release-artifact.yaml
+    with:
+      version-policy: branch-commit
+      trigger-env-deploy: none
+      release-profile: AdhocCommit
+      dry-run-enabled: false
+      java-version: '21.0.1'
+      java-distribution: 'temurin'
+      gradle-version: 'wrapper'
+
+    secrets:
+      access-token: ${{ secrets.GITHUB_TOKEN }}
+      bucket-name: ${{ secrets.RELEASE_ARTIFACT_BUCKET_NAME }}
+      cdn-bucket-name: ${{ secrets.CDN_ARTIFACT_BUCKET_NAME }}
+      svcs-ossrh-username: ${{ secrets.SVCS_OSSRH_USERNAME }}
+      svcs-ossrh-password: ${{ secrets.SVCS_OSSRH_PASSWORD }}
+      svcs-gpg-key-contents: ${{ secrets.SVCS_GPG_KEY_CONTENTS }}
+      svcs-gpg-key-passphrase: ${{ secrets.SVCS_GPG_KEY_PASSPHRASE }}
+      sdk-ossrh-username: ${{ secrets.PLATFORM_OSSRH_USERNAME }}
+      sdk-ossrh-password: ${{ secrets.PLATFORM_OSSRH_PASSWORD }}
+      sdk-gpg-key-contents: ${{ secrets.PLATFORM_GPG_KEY_CONTENTS }}
+      sdk-gpg-key-passphrase: ${{ secrets.PLATFORM_GPG_KEY_PASSPHRASE }}
+      slack-webhook-url: ${{ secrets.PLATFORM_SLACK_RELEASE_WEBHOOK }}
+      jf-url: ${{ vars.JF_URL }}
+      jf-docker-registry: ${{ vars.JF_DOCKER_REGISTRY }}
+      jf-user-name: ${{ vars.JF_USER_NAME }}
+      jf-access-token: ${{ secrets.JF_ACCESS_TOKEN }}
\ No newline at end of file