diff --git a/.github/shared-actions/start-venv/action.yaml b/.github/shared-actions/start-venv/action.yaml
index 6aa4533..9a4dd10 100644
--- a/.github/shared-actions/start-venv/action.yaml
+++ b/.github/shared-actions/start-venv/action.yaml
@@ -31,6 +31,10 @@ inputs:
     description: "Should the venv disable dashboard"
     required: false
     default: "false"
+  extended:
+    description: "Should the venv deploy the extended applications"
+    required: false
+    default: "false"
   ref:
     description: "The branch name to start the venv from"
     required: false
@@ -82,6 +86,7 @@ runs:
         venvRepository: ${{ inputs.venvRepository }}
         venvRepositoryMainBranchName: ${{ inputs.venvRepositoryMainBranchName }}
         disableDashboard: ${{ inputs.disableDashboard }}
+        extended: ${{ inputs.extended }}
         branchName: ${{ inputs.ref }}
     - name: Commit venv file to repo
       shell: bash
diff --git a/.github/workflows/ai-agent-test-suite.yaml b/.github/workflows/ai-agent-test-suite.yaml
index bf364f0..d27ca32 100644
--- a/.github/workflows/ai-agent-test-suite.yaml
+++ b/.github/workflows/ai-agent-test-suite.yaml
@@ -75,6 +75,7 @@ jobs:
     with:
       volatileEnvironment: true
       triggerSlack: false
+      extended: true
       ref: ${{ inputs.ref }}
     secrets: inherit
 
diff --git a/.github/workflows/build-docker-start-venv.yaml b/.github/workflows/build-docker-start-venv.yaml
index 92d9e8c..4530130 100644
--- a/.github/workflows/build-docker-start-venv.yaml
+++ b/.github/workflows/build-docker-start-venv.yaml
@@ -36,6 +36,11 @@ on:
         required: false
         description: 'Set to true in order to disable starting dashboard application'
         default: false
+      extended:
+        type: boolean
+        required: false
+        description: 'Set to true in order to deploy the extended applications into the venv, currently mcp-gateway and custom-code'
+        default: false
       ref:
         type: string
         required: false
@@ -102,6 +107,7 @@ jobs:
           leaseTime: ${{ inputs.leaseTime }}
           venvRepoDirectory: ${{ github.workspace }}/venv/environments
           disableDashboard: ${{ inputs.disableDashboard }}
+          extended: ${{ inputs.extended }}
           ref: ${{ inputs.ref }}
       - name: Generate matrix for docker build
         uses: actions/github-script@v7
diff --git a/.github/workflows/start-venv.yaml b/.github/workflows/start-venv.yaml
index 15c1be0..b651ecd 100644
--- a/.github/workflows/start-venv.yaml
+++ b/.github/workflows/start-venv.yaml
@@ -36,6 +36,11 @@ on:
         required: false
         description: 'Set to true in order to disable starting dashboard application'
         default: false
+      extended:
+        type: boolean
+        required: false
+        description: 'Set to true in order to deploy the extended applications into the venv, currently mcp-gateway and custom-code'
+        default: false
       ref:
         type: string
         required: false
@@ -112,6 +117,7 @@ jobs:
           leaseTime: ${{ inputs.leaseTime }}
           venvRepoDirectory: ${{ github.workspace }}/venv/environments
           disableDashboard: ${{ inputs.disableDashboard }}
+          extended: ${{ inputs.extended }}
           ref: ${{ inputs.ref }}
       - name: Generate matrix for docker build
         uses: actions/github-script@v7