diff --git a/deployment/Jenkinsfile b/deployment/Jenkinsfile
index 40f28bc..54066c1 100644
--- a/deployment/Jenkinsfile
+++ b/deployment/Jenkinsfile
@@ -28,7 +28,7 @@ podTemplate(
         stage("Get Source") {
             checkout scm
             props = readProperties file: "deployment/deploy_env_vars"
-            namespace = "${props.teamid}-${props.root_project}-ns"
+            namespace = "${props.namespace}"
         }
 
         stage("Setup AKS") {
diff --git a/deployment/Jenkinsfile_ArgoCD b/deployment/Jenkinsfile_ArgoCD
index f6a5c37..1fb159f 100644
--- a/deployment/Jenkinsfile_ArgoCD
+++ b/deployment/Jenkinsfile_ArgoCD
@@ -33,10 +33,12 @@ podTemplate(
         def imageTag = getImageTag()
         def manifestRepo = 'cna-bootcamp/lifesub-manifest'
         def manifestBranch = 'main'
+        def namespace
         
         stage("Get Source") {
             checkout scm
             props = readProperties file: "deployment/deploy_env_vars"
+            namespace = "${props.namespace}"
         }
 
         stage('Build & Push Image') {
diff --git a/deployment/Jenkinsfile_SonarQube b/deployment/Jenkinsfile_SonarQube
index 1a7eb3e..b542d0f 100644
--- a/deployment/Jenkinsfile_SonarQube
+++ b/deployment/Jenkinsfile_SonarQube
@@ -31,7 +31,7 @@ podTemplate(
         stage("Get Source") {
             checkout scm
             props = readProperties file: "deployment/deploy_env_vars"
-            namespace = "${props.teamid}-${props.root_project}-ns"
+            namespace = "${props.namespace}"
         }
 
         stage('Code Analysis & Quality Gate') {
diff --git a/deployment/deploy.yaml.template b/deployment/deploy.yaml.template
index 666d114..6170205 100644
--- a/deployment/deploy.yaml.template
+++ b/deployment/deploy.yaml.template
@@ -48,7 +48,8 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: backend-ingress
+  name: lifesub
+  namespace: ${namespace}
   annotations:
     kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/rewrite-target: /$2
diff --git a/deployment/deploy_env_vars b/deployment/deploy_env_vars
index f56d9a0..35db082 100644
--- a/deployment/deploy_env_vars
+++ b/deployment/deploy_env_vars
@@ -1,6 +1,7 @@
 # Team Settings
 teamid=unicorn
 root_project=lifesub-web
+namespace=lifesub
 
 # Container Registry Settings
 registry=unicorncr.azurecr.io