diff --git a/k8s/applications/argocd.yaml b/k8s/applications/argocd.yaml
index a1377ff..e1502c5 100644
--- a/k8s/applications/argocd.yaml
+++ b/k8s/applications/argocd.yaml
@@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: argocd
-  namespace: argocd
 spec:
   destination:
     name: ''
diff --git a/k8s/applications/cert-manager.yaml b/k8s/applications/cert-manager.yaml
index d515ac6..e65d3be 100644
--- a/k8s/applications/cert-manager.yaml
+++ b/k8s/applications/cert-manager.yaml
@@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: cert-manager
-  namespace: argocd
 spec:
   destination:
     name: ''
diff --git a/k8s/applications/haproxy-ingress.yaml b/k8s/applications/haproxy-ingress.yaml
index 5d07207..f2a78d3 100644
--- a/k8s/applications/haproxy-ingress.yaml
+++ b/k8s/applications/haproxy-ingress.yaml
@@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: haproxy-ingress
-  namespace: argocd
 spec:
   syncPolicy:
     syncOptions:
diff --git a/k8s/applications/kustomization.yaml b/k8s/applications/kustomization.yaml
index 91f201f..9097811 100644
--- a/k8s/applications/kustomization.yaml
+++ b/k8s/applications/kustomization.yaml
@@ -1,6 +1,7 @@
 ---
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
+namespace: argocd
 
 resources:
   - haproxy-ingress.yaml
diff --git a/k8s/applications/metrics-server.yaml b/k8s/applications/metrics-server.yaml
index 4f8b8c0..004f300 100644
--- a/k8s/applications/metrics-server.yaml
+++ b/k8s/applications/metrics-server.yaml
@@ -2,7 +2,6 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   name: metrics-server
-  namespace: argocd
 spec:
   syncPolicy:
     syncOptions:
diff --git a/k8s/argocd/ingress.yaml b/k8s/argocd/ingress.yaml
index 26752ec..113a0b2 100644
--- a/k8s/argocd/ingress.yaml
+++ b/k8s/argocd/ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: argocd
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-production
-    kubernetes.io/ingress.class: nginx
+    kubernetes.io/ingress.class: haproxy
     kubernetes.io/tls-acme: "true"
     nginx.ingress.kubernetes.io/ssl-passthrough: "true"
     # If you encounter a redirect loop or are getting a 307 response code 
diff --git a/k8s/cert-manager/certificate-production.yaml b/k8s/cert-manager/certificate-production.yaml
deleted file mode 100644
index 486e283..0000000
--- a/k8s/cert-manager/certificate-production.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: production
-spec:
-  secretName: production-certificate
-  issuerRef:
-    name: letsencrypt-production
-  dnsNames:
-  - video.jamkazam.com
\ No newline at end of file
diff --git a/k8s/cert-manager/certificate-staging.yaml b/k8s/cert-manager/certificate-staging.yaml
deleted file mode 100644
index d5cafb3..0000000
--- a/k8s/cert-manager/certificate-staging.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: staging-cert
-spec:
-  secretName: staging-cert
-  dnsNames:
-  - argocd.staging.video.jamkazam.com
-  - monitoring.staging.video.jamkazam.com
-  issuerRef:
-    name: letsencrypt-production
-    kind: ClusterIssuer
\ No newline at end of file
diff --git a/k8s/cert-manager/cluster-issuer-production.yaml b/k8s/cert-manager/cluster-issuer-production.yaml
index 49f83e7..7764f2f 100644
--- a/k8s/cert-manager/cluster-issuer-production.yaml
+++ b/k8s/cert-manager/cluster-issuer-production.yaml
@@ -16,5 +16,5 @@ spec:
     solvers:
     - http01:
         ingress:
-          class: nginx
+          class: haproxy