diff --git a/argocd-apps/environment-provisioner.yaml b/argocd-apps/environment-provisioner.yaml
deleted file mode 100644
index a90a085..0000000
--- a/argocd-apps/environment-provisioner.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-apiVersion: argoproj.io/v1alpha1
-kind: Application
-metadata:
-  name: environment-provisioner-infra
-  namespace: argocd
-  labels:
-    app.kubernetes.io/name: environment-provisioner
-    app.kubernetes.io/component: infrastructure
-    app.kubernetes.io/managed-by: argocd
-spec:
-  project: default
-  source:
-    # Update this URL to point to your osmos-infra repository in Gitea
-    repoURL: https://gitea.os-tf-qa.onlinesales.ai/giteaAdmin/osmos-infra.git
-    targetRevision: HEAD
-    path: environment-provisioner
-  destination:
-    server: https://kubernetes.default.svc
-    namespace: argo
-  syncPolicy:
-    automated:
-      prune: true
-      selfHeal: true
-    syncOptions:
-      - CreateNamespace=true
-      - ServerSideApply=true
diff --git a/environment-provisioner/external-secrets.yaml b/environment-provisioner/external-secrets.yaml
index 864bd4e..997be4f 100644
--- a/environment-provisioner/external-secrets.yaml
+++ b/environment-provisioner/external-secrets.yaml
@@ -5,7 +5,7 @@ apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: gitea-credentials
-  namespace: argo
+  namespace: argo-workflows
 spec:
   refreshInterval: 1h
   secretStoreRef:
@@ -30,7 +30,7 @@ apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
 metadata:
   name: argocd-credentials
-  namespace: argo
+  namespace: argo-workflows
 spec:
   refreshInterval: 1h
   secretStoreRef:
diff --git a/environment-provisioner/workflow-rbac.yaml b/environment-provisioner/workflow-rbac.yaml
index 10f5137..1263a55 100644
--- a/environment-provisioner/workflow-rbac.yaml
+++ b/environment-provisioner/workflow-rbac.yaml
@@ -56,7 +56,7 @@ rules:
     verbs: ["get", "list", "patch", "update"]
 
 ---
-# Bind the workflow-executor role to the default service account in argo namespace
+# Bind the workflow-executor role to the service accounts in argo-workflows namespace
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -68,10 +68,10 @@ roleRef:
 subjects:
   - kind: ServiceAccount
     name: default
-    namespace: argo
+    namespace: argo-workflows
   - kind: ServiceAccount
-    name: argo
-    namespace: argo
+    name: argo-workflows
+    namespace: argo-workflows
   - kind: ServiceAccount
-    name: argo-server
-    namespace: argo
+    name: argo-workflows-server
+    namespace: argo-workflows
diff --git a/environment-provisioner/workflow-template.yaml b/environment-provisioner/workflow-template.yaml
index 37c678a..de898b6 100644
--- a/environment-provisioner/workflow-template.yaml
+++ b/environment-provisioner/workflow-template.yaml
@@ -2,9 +2,9 @@ apiVersion: argoproj.io/v1alpha1
 kind: WorkflowTemplate
 metadata:
   name: environment-provisioner
-  namespace: argo
+  namespace: argo-workflows
 spec:
-  serviceAccountName: argo
+  serviceAccountName: argo-workflows
   arguments:
     parameters:
     - name: namespace