diff --git a/argocd-image-updater/README.md b/argocd-image-updater/README.md
new file mode 100644
index 0000000..85b7784
--- /dev/null
+++ b/argocd-image-updater/README.md
@@ -0,0 +1 @@
+argocd/appications/argocd-image-updater.yaml
diff --git a/argocd/applications/proxmox-csi.yaml b/argocd/applications/csi-proxmox.yaml
similarity index 91%
rename from argocd/applications/proxmox-csi.yaml
rename to argocd/applications/csi-proxmox.yaml
index 6fb8375..4cb4930 100644
--- a/argocd/applications/proxmox-csi.yaml
+++ b/argocd/applications/csi-proxmox.yaml
@@ -2,7 +2,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: proxmox-csi
+  name: csi-proxmox
   namespace: argocd
 spec:
   project: k-space.ee
@@ -10,7 +10,7 @@ spec:
     # also depends on git@git.k-space.ee:secretspace/kube.git
     repoURL: git@git.k-space.ee:k-space/kube.git
     targetRevision: HEAD
-    path: proxmox-csi
+    path: csi-proxmox
   destination:
     server: 'https://kubernetes.default.svc'
     namespace: csi-proxmox
diff --git a/argocd/applications/harbor.yaml b/argocd/applications/harbor-operator.yaml
similarity index 89%
rename from argocd/applications/harbor.yaml
rename to argocd/applications/harbor-operator.yaml
index d8a6585..b80a714 100644
--- a/argocd/applications/harbor.yaml
+++ b/argocd/applications/harbor-operator.yaml
@@ -2,7 +2,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: harbor
+  name: harbor-operator
   namespace: argocd
 spec:
   project: k-space.ee
@@ -10,7 +10,7 @@ spec:
     # also depends on git@git.k-space.ee:secretspace/kube.git
     repoURL: git@git.k-space.ee:k-space/kube.git
     targetRevision: HEAD
-    path: harbor
+    path: harbor-operator
   destination:
     server: 'https://kubernetes.default.svc'
     namespace: harbor-operator
diff --git a/argocd/applications/metallb.yaml b/argocd/applications/metallb-system.yaml
similarity index 90%
rename from argocd/applications/metallb.yaml
rename to argocd/applications/metallb-system.yaml
index 16d1d11..4e1d777 100644
--- a/argocd/applications/metallb.yaml
+++ b/argocd/applications/metallb-system.yaml
@@ -2,7 +2,7 @@
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: metallb
+  name: metallb-system
   namespace: argocd
 spec:
   project: k-space.ee
@@ -10,7 +10,7 @@ spec:
     # also depends on git@git.k-space.ee:secretspace/kube.git
     repoURL: git@git.k-space.ee:k-space/kube.git
     targetRevision: HEAD
-    path: metallb
+    path: metallb-system
   destination:
     server: 'https://kubernetes.default.svc'
     namespace: metallb-system
diff --git a/proxmox-csi/README.md b/csi-proxmox/README.md
similarity index 100%
rename from proxmox-csi/README.md
rename to csi-proxmox/README.md
diff --git a/proxmox-csi/kustomization.yaml b/csi-proxmox/kustomization.yaml
similarity index 100%
rename from proxmox-csi/kustomization.yaml
rename to csi-proxmox/kustomization.yaml
diff --git a/harbor/README.md b/harbor-operator/README.md
similarity index 100%
rename from harbor/README.md
rename to harbor-operator/README.md
diff --git a/harbor/application-extras.yml b/harbor-operator/application-extras.yml
similarity index 100%
rename from harbor/application-extras.yml
rename to harbor-operator/application-extras.yml
diff --git a/harbor/harbor-oidc-config.png b/harbor-operator/harbor-oidc-config.png
similarity index 100%
rename from harbor/harbor-oidc-config.png
rename to harbor-operator/harbor-oidc-config.png
diff --git a/harbor/kustomization.yaml b/harbor-operator/kustomization.yaml
similarity index 100%
rename from harbor/kustomization.yaml
rename to harbor-operator/kustomization.yaml
diff --git a/harbor/values.yaml b/harbor-operator/values.yaml
similarity index 100%
rename from harbor/values.yaml
rename to harbor-operator/values.yaml
diff --git a/metallb/README.md b/metallb-system/README.md
similarity index 100%
rename from metallb/README.md
rename to metallb-system/README.md
diff --git a/metallb/application-extras.yaml b/metallb-system/application-extras.yaml
similarity index 100%
rename from metallb/application-extras.yaml
rename to metallb-system/application-extras.yaml
diff --git a/metallb/kustomization.yaml b/metallb-system/kustomization.yaml
similarity index 100%
rename from metallb/kustomization.yaml
rename to metallb-system/kustomization.yaml
diff --git a/metallb/values.yaml b/metallb-system/values.yaml
similarity index 100%
rename from metallb/values.yaml
rename to metallb-system/values.yaml
diff --git a/metallb/.gitignore b/metallb/.gitignore
deleted file mode 100644
index ab356d7..0000000
--- a/metallb/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-metallb-operator.yaml
diff --git a/prometheus-operator/README.md b/prometheus-operator/README.md
new file mode 100644
index 0000000..cf33867
--- /dev/null
+++ b/prometheus-operator/README.md
@@ -0,0 +1 @@
+argocd/appications/prometheus-operator.yaml
diff --git a/secret-claim-operator/README.md b/secret-claim-operator/README.md
new file mode 100644
index 0000000..dbb8d6c
--- /dev/null
+++ b/secret-claim-operator/README.md
@@ -0,0 +1 @@
+argocd/appications/secret-claim-operator.yaml
diff --git a/tigera-operator/README.md b/tigera-operator/README.md
index 2227251..ec8c30d 100644
--- a/tigera-operator/README.md
+++ b/tigera-operator/README.md
@@ -8,3 +8,8 @@ Render and apply locally:
 kustomize build . | kubectl diff -f-
 kustomize build . | kubectl apply --server-side --force-conflicts -f-
 ```
+
+Namespaces:
+- tigera-operator
+- calico-system
+- calico-apiserver