diff --git a/resources/draft/workflow-helm.yml b/resources/draft/workflow-helm.yml
index bea88c1f..9bb5adb7 100644
--- a/resources/draft/workflow-helm.yml
+++ b/resources/draft/workflow-helm.yml
@@ -46,6 +46,7 @@ env:
   CHART_PATH: "your-chart-path"
   CHART_OVERRIDE_PATH: "your-chart-override-path"
   CHART_OVERRIDES: "your-chart-overrides"
+  NAMESPACE: 'your-namespace-name'
 
 jobs:
   buildImage:
@@ -103,6 +104,11 @@ jobs:
           admin: 'false'
           use-kubelogin: 'true'
 
+      # Check if namespace exists, if not create it
+      - name: Ensure Namespace exists
+        run: |
+          kubectl get namespace ${{ env.NAMESPACE }} || kubectl create namespace ${{ env.NAMESPACE }}
+
       # Deploys application based on manifest files from previous step
       - name: Deploy application
         run: HELM_DEPLOY_COMMAND
diff --git a/resources/draft/workflow-manifests.yml b/resources/draft/workflow-manifests.yml
index 34f04301..ab368c31 100644
--- a/resources/draft/workflow-manifests.yml
+++ b/resources/draft/workflow-manifests.yml
@@ -39,6 +39,7 @@ env:
   ACR_RESOURCE_GROUP: "your-cluster-resource-group"
   CLUSTER_NAME: "your-cluster-name"
   DEPLOYMENT_MANIFEST_PATH: 'your-deployment-manifest-path'
+  NAMESPACE: 'your-namespace-name'
 
 jobs:
   buildImage:
@@ -96,6 +97,11 @@ jobs:
           admin: 'false'
           use-kubelogin: 'true'
 
+       # Check if namespace exists, if not create it
+      - name: Ensure Namespace exists
+        run: |
+          kubectl get namespace ${{ env.NAMESPACE }} || kubectl create namespace ${{ env.NAMESPACE }}
+
       # Deploys application based on given manifest file
       - name: Deploys application
         uses: Azure/k8s-deploy@v4
diff --git a/src/commands/draft/baseWorkflowEditor.ts b/src/commands/draft/baseWorkflowEditor.ts
index a9cb3acc..ffcc9dd4 100644
--- a/src/commands/draft/baseWorkflowEditor.ts
+++ b/src/commands/draft/baseWorkflowEditor.ts
@@ -96,6 +96,7 @@ export abstract class BaseWorkflowEditor<TDeploymentType extends WorkflowDeploym
         this.updateEnvVar(envSymbol, "AZURE_CONTAINER_REGISTRY", this.createParams.acrName);
         this.updateEnvVar(envSymbol, "CLUSTER_RESOURCE_GROUP", this.createParams.clusterResourceGroup);
         this.updateEnvVar(envSymbol, "ACR_RESOURCE_GROUP", this.createParams.acrResourceGroup);
+        this.updateEnvVar(envSymbol, "NAMESPACE", this.createParams.namespace);
     }
 
     /**
diff --git a/webview-ui/src/Draft/DraftWorkflow/DraftWorkflow.tsx b/webview-ui/src/Draft/DraftWorkflow/DraftWorkflow.tsx
index 51bbb5c2..aa13f33d 100644
--- a/webview-ui/src/Draft/DraftWorkflow/DraftWorkflow.tsx
+++ b/webview-ui/src/Draft/DraftWorkflow/DraftWorkflow.tsx
@@ -391,6 +391,9 @@ export function DraftWorkflow(initialState: InitialState) {
     const gitHubRepoTooltipMessage =
         "Select the primary/upstream fork of this repository.\n\nThis will allow you to select which branch will trigger the workflow.";
 
+    const namespaceTooltipMessage =
+        "To create a new namespace, write the desired name in the field. If the namespace does not already exist, it will be not be created until the workflow runs.";
+
     return (
         <>
             <form className={styles.wrapper} onSubmit={handleFormSubmit}>
@@ -656,6 +659,9 @@ export function DraftWorkflow(initialState: InitialState) {
                         <>
                             <label htmlFor="namespace-input" className={styles.label}>
                                 Namespace *
+                                <span className={"tooltip-holder"} data-tooltip-text={namespaceTooltipMessage}>
+                                    <i className={`${styles.inlineIcon} codicon codicon-info`} />
+                                </span>
                             </label>
 
                             <TextWithDropdown