diff --git a/argocd/applications/cluster-secrets/Readme.md b/argocd/applications/cluster-secrets/Readme.md
new file mode 100644
index 0000000..5b626da
--- /dev/null
+++ b/argocd/applications/cluster-secrets/Readme.md
@@ -0,0 +1,3 @@
+Argocd applications dedicated to the clusters's secrets configuration
+
+The secrets are applied from the k8s private data repository
diff --git a/argocd/applications/cluster-secrets/argocd.yaml b/argocd/applications/cluster-secrets/argocd.yaml
new file mode 100644
index 0000000..f4d9980
--- /dev/null
+++ b/argocd/applications/cluster-secrets/argocd.yaml
@@ -0,0 +1,18 @@
+# Declare the application applying the argocd cluster secrets
+# like the repositories credentials, the cluster definitions, ...
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: production-argocd-secrets
+  namespace: argocd
+spec:
+  project: default # Todo define a project to limit the deployment types
+  source:
+    repoURL: ssh://git@forge.softwareheritage.org/source/k8s-swh-private-data.git
+    targetRevision: HEAD
+    path: argocd
+    directory:
+      recurse: true
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: argocd
diff --git a/argocd/applications/cluster-secrets/production-cassandra.yaml b/argocd/applications/cluster-secrets/production-cassandra.yaml
new file mode 100644
index 0000000..406d8f5
--- /dev/null
+++ b/argocd/applications/cluster-secrets/production-cassandra.yaml
@@ -0,0 +1,16 @@
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: production-cassandra-secrets
+  namespace: argocd
+spec:
+  project: default # Todo define a project to limit the deployment types
+  source:
+    repoURL: https://forge.softwareheritage.org/source/k8s-private-config.git
+    targetRevision: HEAD
+    path: production-cassandra
+    directory:
+      recurse: true
+  destination:
+    server: https://rancher.euwest.azure.internal.softwareheritage.org/k8s/clusters/c-pcndd
+    namespace: default
diff --git a/argocd/configmaps/argocd-ssh-known-hosts-cm.yaml b/argocd/configmaps/argocd-ssh-known-hosts-cm.yaml
new file mode 100644
index 0000000..83acfee
--- /dev/null
+++ b/argocd/configmaps/argocd-ssh-known-hosts-cm.yaml
@@ -0,0 +1,23 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: argocd-ssh-known-hosts-cm
+  namespace: argocd
+  labels:
+    app.kubernetes.io/name: argocd-cm
+    app.kubernetes.io/part-of: argocd
+data:
+  ssh_known_hosts: |
+    bitbucket.org ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAubiN81eDcafrgMeLzaFPsw2kNvEcqTKl/VqLat/MaB33pZy0y3rJZtnqwR2qOOvbwKZYKiEO1O6VqNEBxKvJJelCq0dTXWT5pbO2gDXC6h6QDXCaHo6pOHGPUy+YBaGQRGuSusMEASYiWunYN0vCAI8QaXnWMXNMdFP3jHAJH0eDsoiGnLPBlBp4TNm6rYI74nMzgz3B9IikW4WVK+dc8KZJZWYjAuORU3jc1c/NPskD2ASinf8v3xnfXeukU0sJ5N6m5E8VLjObPEO+mN2t/FZTMZLiFqPWc/ALSqnMnnhwrNi2rbfg/rd/IpL8Le3pSBne8+seeFVBoGqzHM9yXw==
+    github.com ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
+    gitlab.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFSMqzJeV9rUzU4kWitGjeR4PWSa29SPqJ1fVkhtj3Hw9xjLVXVYrU9QlYWrOLXBpQ6KWjbjTDTdDkoohFzgbEY=
+    gitlab.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAfuCHKVTjquxvt6CM6tdG4SLp1Btn/nOeHHE5UOzRdf
+    gitlab.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCsj2bNKTBSpIYDEGk9KxsGh3mySTRgMtXL583qmBpzeQ+jqCMRgBqB98u3z++J1sKlXHWfM9dyhSevkMwSbhoR8XIq/U0tCNyokEi/ueaBMCvbcTHhO7FcwzY92WK4Yt0aGROY5qX2UKSeOvuP4D6TPqKF1onrSzH9bx9XUf2lEdWT/ia1NEKjunUqu1xOB/StKDHMoX4/OKyIzuS0q/T1zOATthvasJFoPrAjkohTyaDUz2LN5JoH839hViyEG82yB+MjcFV5MU3N1l1QL3cVUCh93xSaua1N85qivl+siMkPGbO5xR/En4iEY6K2XPASUEMaieWVNTRCtJ4S8H+9
+    ssh.dev.azure.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOfGJ4NakVyIzf1rXYd4d7wo6jBlkLvCA4odBlL0mDUyZ0/QUfTTqeu+tm22gOsv+VrVTMk6vwRU75gY/y9ut5Mb3bR5BV58dKXyq9A9UeB5Cakehn5Zgm6x1mKoVyf+FFn26iYqXJRgzIZZcZ5V6hrE0Qg39kZm4az48o0AUbf6Sp4SLdvnuMa2sVNwHBboS7EJkm57XQPVU3/QpyNLHbWDdzwtrlS+ez30S3AdYhLKEOxAG8weOnyrtLJAUen9mTkol8oII1edf7mWWbWVf0nBmly21+nZcmCTISQBtdcyPaEno7fFQMDD26/s0lfKob4Kw8H
+    vs-ssh.visualstudio.com ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC7Hr1oTWqNqOlzGJOfGJ4NakVyIzf1rXYd4d7wo6jBlkLvCA4odBlL0mDUyZ0/QUfTTqeu+tm22gOsv+VrVTMk6vwRU75gY/y9ut5Mb3bR5BV58dKXyq9A9UeB5Cakehn5Zgm6x1mKoVyf+FFn26iYqXJRgzIZZcZ5V6hrE0Qg39kZm4az48o0AUbf6Sp4SLdvnuMa2sVNwHBboS7EJkm57XQPVU3/QpyNLHbWDdzwtrlS+ez30S3AdYhLKEOxAG8weOnyrtLJAUen9mTkol8oII1edf7mWWbWVf0nBmly21+nZcmCTISQBtdcyPaEno7fFQMDD26/s0lfKob4Kw8H
+    github.com ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
+    github.com ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
+    forge.softwareheritage.org ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDIEv052pq1mvCDxaP+IBjYSEiAAjUwX+rLl1Tc4ZJ8ck7+/JuR9uSiBspeF4E8M6YE0JFczGqpJdMeU5uf/rUqeMLp53g7Q9BWdIzHBOGLSW80NZ9SYLoPZdhiLd+W3nHu6tze79txvwSqbVpw91NRiaQT8MmI3f7gcRYKClmtODO9Sz8hIUIwGtty7/SJEpZC8httIbsY6jjGM/IUbh6FWsfN3G7jxoq8OvwErSZ+zkfJ6IpPdkTrPRCbGNaO8DDQOBdhGu1z1DXkXeaa6jD7t2SiTpJ1B6BgjwuefimczGNohUisLdtUFarAByb7iklpeMvbiS9N/TsxV88D8qMD
+    forge.softwareheritage.org ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBKLfgPwdf08OA0ajHnb89l+AvHk1Zg1MQiWCtaEwn6Em3pPQjoQ+mrm5afgoCd5aKrG2dlNnwZsHapP7p0AIcqc=
+    forge.softwareheritage.org ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKsVk4jv4nkFQQGnxvpM503e420waZ4xqeTiEhCaa6pm
+
diff --git a/production-cassandra/pv.yaml b/production-cassandra/pv.yaml
deleted file mode 100644
index effe592..0000000
--- a/production-cassandra/pv.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: prometheus-node1
-  labels:
-    prometheus: "true"
-spec:
-  capacity:
-    storage: 35Gi
-  volumeMode: Filesystem
-  storageClassName: local-storage
-  accessModes:
-  - ReadWriteOnce # required
-  local:
-    path: "/srv/prometheus/data"
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: kubernetes.io/hostname
-          operator: In
-          values:
-          - rancher-node-cassandra1
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: prometheus-node2
-  labels:
-    prometheus: "true"
-spec:
-  capacity:
-    storage: 35Gi
-  volumeMode: Filesystem
-  storageClassName: local-storage
-  accessModes:
-  - ReadWriteOnce # required
-  local:
-    path: "/srv/prometheus/data"
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: kubernetes.io/hostname
-          operator: In
-          values:
-          - rancher-node-cassandra2
----
-apiVersion: v1
-kind: PersistentVolume
-metadata:
-  name: prometheus-node3
-  labels:
-    prometheus: "true"
-spec:
-  capacity:
-    storage: 35Gi
-  volumeMode: Filesystem
-  storageClassName: local-storage
-  accessModes:
-  - ReadWriteOnce # required
-  local:
-    path: "/srv/prometheus/data"
-  nodeAffinity:
-    required:
-      nodeSelectorTerms:
-      - matchExpressions:
-        - key: kubernetes.io/hostname
-          operator: In
-          values:
-          - rancher-node-cassandra3
-