diff --git a/argo/apps/values.yaml b/argo/apps/values.yaml
index 839ef57..583ff2b 100644
--- a/argo/apps/values.yaml
+++ b/argo/apps/values.yaml
@@ -40,3 +40,8 @@ helmApps:
     repoURL: https://charts.gabe565.com
     chart: miniflux
     revision: 0.6.1
+  - app: chartmuseum
+    namespace: chartmuseum
+    repoURL: https://chartmuseum.github.io/charts
+    chart: chartmuseum
+    revision: 3.10.1
diff --git a/argo/chartmuseum/values.yaml b/argo/chartmuseum/values.yaml
new file mode 100644
index 0000000..c359c32
--- /dev/null
+++ b/argo/chartmuseum/values.yaml
@@ -0,0 +1,43 @@
+---
+name: chartmuseum
+namespace: chartmuseum
+serviceAccountName: chartmuseum
+externalSecrets:
+  secretStoreName: chartmuseum
+  vaultRole: chartmuseum
+  secretPaths:
+    - name: chartmuseum
+      secrets:
+      - secretKey: basic-auth-user
+        key: chartmuseum
+        property: basic-auth-user
+      - secretKey: basic-auth-pass
+        key: chartmuseum
+        property: basic-auth-pass
+
+istio:
+  commonName: charts.minhas.io
+  ingressSelector: ingressgateway
+  issuer: letsencrypt-prod
+  port: 8080
+  backendHost: chartmuseum
+
+env:
+  open:
+    STORAGE: local
+    DISABLE_API: false
+    ALLOW_OVERWRITE: true
+    CHART_URL: https://charts.minhas.io/
+    AUTH_ANONYMOUS_GET: true
+  existingSecret: chartmuseum
+  existingSecretMappings:
+    BASIC_AUTH_USER: basic-auth-user
+    BASIC_AUTH_PASS: basic-auth-pass
+
+persistence:
+  enabled: true
+  accessMode: ReadWriteOnce
+  size: 8Gi
+  path: /storage
+  storageClass: "longhorn-retain"
+  existingClaim: chartmuseum
diff --git a/helm/chartmuseum/external-secrets.yaml b/helm/chartmuseum/external-secrets.yaml
deleted file mode 100644
index 319ba73..0000000
--- a/helm/chartmuseum/external-secrets.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
----
-apiVersion: v1
-kind: Secret
-type: kubernetes.io/service-account-token
-metadata:
-  name: serviceaccounttoken
-  namespace: chartmuseum
-  annotations:
-    kubernetes.io/service-account.name: "chartmuseum"
-...
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: chartmuseum-tokenreview-binding
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: system:auth-delegator
-subjects:
-- kind: ServiceAccount
-  name: chartmuseum
-  namespace: chartmuseum
-...
----
-apiVersion: external-secrets.io/v1beta1
-kind: SecretStore
-metadata:
-  name: chartmuseum
-  namespace: chartmuseum
-spec:
-  provider:
-    vault:
-      server: "https://vault.service.masked.name:8200"
-      path: "kv"
-      version: "v2"
-      caBundle: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUROVENDQWgyZ0F3SUJBZ0lVWXA4eG81dDJsSkZQM1NpRDFmSmlyZ0dVUUowd0RRWUpLb1pJaHZjTkFRRUwKQlFBd0ZqRVVNQklHQTFVRUF4TUxiV0Z6YTJWa0xtNWhiV1V3SGhjTk1qQXdPREk1TVRreU16RXlXaGNOTXpBdwpPREkzTVRreU16UXlXakFXTVJRd0VnWURWUVFERXd0dFlYTnJaV1F1Ym1GdFpUQ0NBU0l3RFFZSktvWklodmNOCkFRRUJCUUFEZ2dFUEFEQ0NBUW9DZ2dFQkFNSTdvUitLSHZ2em5mbmFBWERNTzVxcFNUQ0FZQ3lmakZFb2hZSmYKbE9jbkxPTlhiM2Y2c1A1ZDFlbHRMK1VUcTBSVlU1VVAwYU5XN2hxRFRhNDFNUncwSkNEdEI2OHlLZFlxMmhaZgo5N2dBK2xqM01FSlU2UlRBS0xyZzc1R1JoL0FiTkVJZ3d2UHVIS1c2aE1idHdPeU05REZVLy9XM3hwdXNhbFh5ClJNRnpBSGZTRGo5Y2krVXlnVXQ5SElOV2QvU21NR0cvOFBnaGFSaGZFNDR3UkZNcVllemVsaUl0MkpJczQzQlYKN0hxRzBPZXY5V1BlWG1pYVpVWUtRZXRIaVFxUjE0TXhpdjFJR3pDbXd3Tis5YjR0WnRaVGE1OG9NNWRQWGZiYgpsckVMUUU1T3NQYU50TXRFUjNNZ3hvdkROM1ZTQ0dIL08vR3lhRVdWYW5ZNVVGOENBd0VBQWFON01Ia3dEZ1lEClZSMFBBUUgvQkFRREFnRUdNQThHQTFVZEV3RUIvd1FGTUFNQkFmOHdIUVlEVlIwT0JCWUVGQlk4alczZkRWVXAKVVJ0MXByaG1ETWprVmlrZ01COEdBMVVkSXdRWU1CYUFGQlk4alczZkRWVXBVUnQxcHJobURNamtWaWtnTUJZRwpBMVVkRVFRUE1BMkNDMjFoYzJ0bFpDNXVZVzFsTUEwR0NTcUdTSWIzRFFFQkN3VUFBNElCQVFBV1F6NGQzUXpFClc4TkdBMTZaUGFtbFZ1Yk9MQjVEdFp6MnFyU3JuM0RlT2JMSURTaEluVjNxdFJsRHg5SFlKTFRDQTc1S2V0MEoKTlRzeU1jVHkydHhkNEk4aGdkRjMwWEplRWNpTjl3WjBtS0VlUC9ZS0R3ZThWMlh3V3E0WFlrRGVjaGxXSHBabwpQZldjb0xwckt3VlVJNEh6YXFrTm13Y21NVUk0eEFzQytTTGUxbXJlYnNlS200OW9Pd2RRcy9vUFZMSyswbkVwClJ2RDBhT3ZvaElMSWEvMlp0S2N6dmhCL0wzZm81cGc5RXgvMEpEQmRESEllZE1hYkQzcW44SWRzZStQNURmd2EKSnUyQ3R5YituMVRUUHhSRE14czJjRmJBNWlycisyQVJKZDhqdEdTKzFmeXhvZ2pPV1MxUlI1MjNGK3FJUzNzdQpLaWJHZWwrZ0ZQcHEKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQotLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0KTUlJRDB6Q0NBcnVnQXdJQkFnSVVNNTJ1aFhTZVRDaW0xcG16dWNtL2NuSWdOcDh3RFFZSktvWklodmNOQVFFTApCUUF3RmpFVU1CSUdBMVVFQXhNTGJXRnphMlZrTG01aGJXVXdIaGNOTWpBd09ESTVNVGt5TnpBd1doY05NalV3Ck9ESTRNVGt5TnpNd1dqQXRNU3N3S1FZRFZRUURFeUp0WVhOclpXUXVibUZ0WlNCSmJuUmxjbTFsWkdsaGRHVWcKUVhWMGFHOXlhWFI1TUlJQklqQU5CZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUE4THVHbytBcwpJQ1lXZEpqQkNZMHNuRi9YK2pGMXRkY3JRek5pUktFU0ViNWRzRGl5OTc5YnVnQ2JsUFFEUStnNVdHcVhYNHBqClV5WlpFM1p3aE91ZklTbEdLMG93MWFNanFTK3BGbFE4NUtSRC9qVXRMUFJVSnVRRittMll3SWQvTWc2L0I3UWsKZDE2NnVKa054UytNR1pDaTJPWVhlb2l2bk9ZN1EwS2ovMHZJYmM1VnQza0NSVmcybGpMU1Fob0JkKzg1QUhNUgpqZVJqWk1lWUVZRjJIVFZ3cmc0RHJDL3IwME1WdERjTnFzNitNN1laL3J6bnk3M0d2ZkpXZldvQjFDNHBpWmxnCmZ2VWNTREw1SEFoaml1NWNTZUlSN0RUdVZ4N3Q0UG9LNkFxVWtQeWdEdHExWmFMeWJYVDdYNmQwNzJkUjVBWE8KbldGTFBhYUdKOTc5aXdJREFRQUJvNElCQURDQi9UQU9CZ05WSFE4QkFmOEVCQU1DQVFZd0R3WURWUjBUQVFILwpCQVV3QXdFQi96QWRCZ05WSFE0RUZnUVVJa2hWWUJhSzlDY3ZYRzhGTTJqS1ZaMTZvWkF3SHdZRFZSMGpCQmd3CkZvQVVGanlOYmQ4TlZTbFJHM1dtdUdZTXlPUldLU0F3VVFZSUt3WUJCUVVIQVFFRVJUQkRNRUVHQ0NzR0FRVUYKQnpBQ2hqVm9kSFJ3T2k4dmRtRjFiSFF1WTI5c2RXMWlhV0V1YldGemEyVmtMbTVoYldVNk9ESXdNQzkyTVM5dwphMmxmY205dmRDOWpZVEJIQmdOVkhSOEVRREErTUR5Z09xQTRoalpvZEhSd09pOHZkbUYxYkhRdVkyOXNkVzFpCmFXRXViV0Z6YTJWa0xtNWhiV1U2T0RJd01DOTJNUzl3YTJsZmNtOXZkQzlqY213d0RRWUpLb1pJaHZjTkFRRUwKQlFBRGdnRUJBSzZITWdSK2hwd2paQ21mNU5zekRTSHI3ZFlLWlhQNExyY0hQV3M5NG5MTTMzVVo1NzJ1YkdIcwpkS2pSdzhZRDBjbmNyc3lwc1ltRWdSNTdVK0RIa3lzMzk0d2tiN1VPd3kxWnZkNUlJUlhkUDBjRHlsejBRenFNCkFQblFZTitpc21rb2xqaGs5ZXkwUWJvM0NtUGpNK1VRY0F4dVpRdEE0TStyaUMxK2prdWRlMXVZTDBzekM2WTkKNEtldGZ2Yk5rZWRTYVY1eUphUktDQmhSY0M0L0dqcEJHL29kUS81QWZCUEFGalpxaGNJSldCclZZYlRRVkM3OQpoTUExaXdXSlBtVDlMc2pNU1VmeEZUUHp4Um5OWFFpS0Z6NWtUMk9pUzFucWg4YU9jeVU5WUM5Mjhwa2lmTkpWCktva3VEZXpKRk03aWUzZCtFY0JrMVY5bEh3T1dkdG89Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
-      auth:
-        kubernetes:
-          mountPath: "k8s-teapot"
-          role: "chartmuseum"
-          secretRef:
-            name: "serviceaccounttoken"
-...
----
-apiVersion: external-secrets.io/v1beta1
-kind: ExternalSecret
-metadata:
-  name: chartmuseum
-  namespace: chartmuseum
-spec:
-  secretStoreRef:
-    name: chartmuseum
-    kind: SecretStore
-  data:
-  - secretKey: basic-auth-user
-    remoteRef:
-      key: chartmuseum
-      property: basic-auth-user
-  - secretKey: basic-auth-pass
-    remoteRef:
-      key: chartmuseum
-      property: basic-auth-pass
-...
diff --git a/helm/chartmuseum/install.sh b/helm/chartmuseum/install.sh
deleted file mode 100755
index fb270b3..0000000
--- a/helm/chartmuseum/install.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-CHART_VERSION=3.9.2
-NAMESPACE=chartmuseum
-VAULT_AUTH_NAMESPACE="k8s-teapot"
-
-helm repo add chartmuseum https://chartmuseum.github.io/charts
-helm repo update
-
-cat << EOH > chartmuseum.hcl
-path "kv/data/chartmuseum" {
-  capabilities = ["read"]
-}
-EOH
-vault policy write chartmuseum chartmuseum.hcl
-rm chartmuseum.hcl
-
-kubectl create ns chartmuseum
-kubectl create serviceaccount -n ${NAMESPACE} chartmuseum
-HOST_IP=$(ip addr show eth0 | grep -Po 'inet \K[\d.]+')
-TOKEN="$(kubectl get secret serviceaccounttoken -n chartmuseum -o go-template='{{ .data.token }}' | base64 -d)"
-
-vault write auth/${VAULT_AUTH_NAMESPACE}/role/chartmuseum \
-    bound_service_account_names=chartmuseum \
-    bound_service_account_namespaces=chartmuseum \
-    policies=chartmuseum \
-    ttl=24h
-
-vault write auth/${VAULT_AUTH_NAMESPACE}/login role=chartmuseum jwt=${TOKEN} iss=https://${HOST_IP}:6443
-
-kubectl apply -n ${NAMESPACE} -f external-secrets.yaml
-kubectl apply -n ${NAMESPACE} -f pvc.yaml
-helm upgrade --install \
-	chartmuseum \
-	chartmuseum/chartmuseum \
-	-f values.yaml \
-	-n ${NAMESPACE} \
-	--version ${CHART_VERSION} \
-	--cleanup-on-fail
diff --git a/helm/chartmuseum/istio-ingress.yaml b/helm/chartmuseum/istio-ingress.yaml
deleted file mode 100644
index c8447ac..0000000
--- a/helm/chartmuseum/istio-ingress.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-apiVersion: cert-manager.io/v1
-kind: Certificate
-metadata:
-  name: chartmuseum-cert
-  namespace: istio-system
-spec:
-  secretName: chartmuseum-cert
-  commonName: charts.minhas.io
-  dnsNames:
-    - charts.minhas.io
-  issuerRef:
-    name: letsencrypt-prod
-    kind: ClusterIssuer
-    group: cert-manager.io
-...
----
-apiVersion: networking.istio.io/v1beta1
-kind: Gateway
-metadata:
-  name: chartmuseum-gateway
-  namespace: chartmuseum
-spec:
-  selector:
-    istio: ingressgateway
-  servers:
-  - port:
-      number: 443
-      name: https
-      protocol: HTTPS
-    tls:
-      mode: SIMPLE
-      credentialName: chartmuseum-cert
-    hosts:
-    - charts.minhas.io
-  - port:
-      number: 80
-      name: http
-      protocol: HTTP
-    tls:
-      httpsRedirect: true
-    hosts:
-    - charts.minhas.io
-...
----
-apiVersion: networking.istio.io/v1beta1
-kind: VirtualService
-metadata:
-  name: chartmuseum-gateway
-  namespace: chartmuseum
-spec:
-  hosts:
-  - charts.minhas.io
-  gateways:
-  - chartmuseum-gateway
-  http:
-  - match:
-    - uri:
-        prefix: /
-    route:
-    - destination:
-        port:
-          number: 8080
-        host: chartmuseum
-...
diff --git a/helm/chartmuseum/values.yaml b/helm/chartmuseum/values.yaml
deleted file mode 100644
index a2e8732..0000000
--- a/helm/chartmuseum/values.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-env:
-  open:
-    STORAGE: local
-    DISABLE_API: false
-    ALLOW_OVERWRITE: true
-    CHART_URL: https://charts.minhas.io/
-    AUTH_ANONYMOUS_GET: true
-  existingSecret: chartmuseum
-  existingSecretMappings:
-    BASIC_AUTH_USER: basic-auth-user
-    BASIC_AUTH_PASS: basic-auth-pass
-
-persistence:
-  enabled: true
-  accessMode: ReadWriteOnce
-  size: 8Gi
-  path: /storage
-  storageClass: "longhorn-retain"
-  existingClaim: chartmuseum
diff --git a/helm/chartmuseum/pvc.yaml b/manifests/chartmuseum-pvc.yaml
similarity index 100%
rename from helm/chartmuseum/pvc.yaml
rename to manifests/chartmuseum-pvc.yaml