diff --git a/apps/mosquitto/kustomization.yaml b/apps/mosquitto/kustomization.yaml
deleted file mode 100644
index 660c50c..0000000
--- a/apps/mosquitto/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- resources.yaml
diff --git a/apps/mosquitto/resources.yaml b/apps/mosquitto/resources.yaml
deleted file mode 100644
index 4c9cbac..0000000
--- a/apps/mosquitto/resources.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: mosquitto-config
-data:
-  mosquitto.conf: |
-    listener 1883
-    allow_anonymous true
----
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: mosquitto
-spec:
-  selector:
-    matchLabels:
-      app: mosquitto
-  template:
-    metadata:
-      labels:
-        app: mosquitto
-    spec:
-      containers:
-      - name: mosquitto
-        image: eclipse-mosquitto:latest
-        imagePullPolicy: Always
-        ports:
-        - name: mqtt
-          containerPort: 1883
-        volumeMounts:
-        - name: mosquitto-config
-          mountPath: /mosquitto/config/mosquitto.conf
-          subPath: mosquitto.conf
-      volumes:
-      - name: mosquitto-config
-        configMap:
-          name: mosquitto-config
-      imagePullSecrets:
-      - name: quay-pull-secret
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: mosquitto
-spec:
-  ports:
-  - name: mqtt
-    port: 1883
-    protocol: TCP
-    targetPort: 1883
-  selector:
-    app: mosquitto
-  type: LoadBalancer
-  loadBalancerIP: 192.168.0.11
diff --git a/apps/mosquitto/values.yaml b/apps/mosquitto/values.yaml
new file mode 100644
index 0000000..d74dd3e
--- /dev/null
+++ b/apps/mosquitto/values.yaml
@@ -0,0 +1,3 @@
+service:
+  type: LoadBalancer
+  loadBalancerIP: 192.168.0.11
diff --git a/apps/visual-studio-code/kustomization.yaml b/apps/visual-studio-code/kustomization.yaml
deleted file mode 100644
index 660c50c..0000000
--- a/apps/visual-studio-code/kustomization.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: kustomize.config.k8s.io/v1beta1
-kind: Kustomization
-resources:
-- resources.yaml
diff --git a/apps/visual-studio-code/resources.yaml b/apps/visual-studio-code/resources.yaml
deleted file mode 100644
index c171f7e..0000000
--- a/apps/visual-studio-code/resources.yaml
+++ /dev/null
@@ -1,105 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: visual-studio-code
-spec:
-  selector:
-    matchLabels:
-      app: visual-studio-code
-  template:
-    metadata:
-      labels:
-        app: visual-studio-code
-    spec:
-      containers:
-      - name: visual-studio-code
-        image: ghcr.io/coder/code-server:4.141.0
-        imagePullPolicy: IfNotPresent
-        args: [--auth, none]
-        ports:
-        - name: http
-          containerPort: 8080
-        startupProbe:
-          httpGet:
-            path: /healthz
-            port: http
-          failureThreshold: 30
-          periodSeconds: 2
-        readinessProbe:
-          httpGet:
-            path: /healthz
-            port: http
-          periodSeconds: 10
-        livenessProbe:
-          httpGet:
-            path: /healthz
-            port: http
-          periodSeconds: 30
-        volumeMounts:
-        - name: brgkepler-com
-          mountPath: /home/coder/brgkepler-com
-        - name: brunner-ninja
-          mountPath: /home/coder/brunner-ninja
-        - name: gschissenes-equipment
-          mountPath: /home/coder/gschissenes-equipment
-        - name: immich-crack
-          mountPath: /home/coder/immich-crack
-        - name: pfostendynamics-com
-          mountPath: /home/coder/pfostendynamics-com
-        - name: watschn-studio
-          mountPath: /home/coder/watschn-studio
-      volumes:
-      - name: brgkepler-com
-        persistentVolumeClaim:
-          claimName: brgkepler-com
-      - name: brunner-ninja
-        persistentVolumeClaim:
-          claimName: brunner-ninja
-      - name: gschissenes-equipment
-        persistentVolumeClaim:
-          claimName: gschissenes-equipment
-      - name: immich-crack
-        persistentVolumeClaim:
-          claimName: immich-crack
-      - name: pfostendynamics-com
-        persistentVolumeClaim:
-          claimName: pfostendynamics-com
-      - name: watschn-studio
-        persistentVolumeClaim:
-          claimName: watschn-studio
-      imagePullSecrets:
-      - name: quay-pull-secret
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: visual-studio-code
-spec:
-  ports:
-  - name: http
-    port: 80
-    protocol: TCP
-    targetPort: 8080
-  selector:
-    app: visual-studio-code
----
-apiVersion: networking.k8s.io/v1
-kind: Ingress
-metadata:
-  name: visual-studio-code
-  annotations:
-    traefik.ingress.kubernetes.io/router.entrypoints: websecure
-    traefik.ingress.kubernetes.io/router.middlewares: default-authentik@kubernetescrd
-spec:
-  ingressClassName: traefik
-  rules:
-  - host: dev.brunner.ninja
-    http:
-      paths:
-      - path: /
-        pathType: Prefix
-        backend:
-          service:
-            name: visual-studio-code
-            port:
-              name: http
diff --git a/apps/visual-studio-code/values.yaml b/apps/visual-studio-code/values.yaml
new file mode 100644
index 0000000..b5a85b5
--- /dev/null
+++ b/apps/visual-studio-code/values.yaml
@@ -0,0 +1,27 @@
+persistence:
+  mounts:
+  - name: brgkepler-com
+    claimName: brgkepler-com
+    mountPath: /home/coder/brgkepler-com
+  - name: brunner-ninja
+    claimName: brunner-ninja
+    mountPath: /home/coder/brunner-ninja
+  - name: gschissenes-equipment
+    claimName: gschissenes-equipment
+    mountPath: /home/coder/gschissenes-equipment
+  - name: immich-crack
+    claimName: immich-crack
+    mountPath: /home/coder/immich-crack
+  - name: pfostendynamics-com
+    claimName: pfostendynamics-com
+    mountPath: /home/coder/pfostendynamics-com
+  - name: watschn-studio
+    claimName: watschn-studio
+    mountPath: /home/coder/watschn-studio
+ingress:
+  enabled: true
+  className: traefik
+  host: dev.brunner.ninja
+  annotations:
+    traefik.ingress.kubernetes.io/router.entrypoints: websecure
+    traefik.ingress.kubernetes.io/router.middlewares: default-authentik@kubernetescrd
diff --git a/bootstrap/mosquitto.yaml b/bootstrap/mosquitto.yaml
index ea59945..3e3d20b 100644
--- a/bootstrap/mosquitto.yaml
+++ b/bootstrap/mosquitto.yaml
@@ -5,10 +5,17 @@ metadata:
   namespace: argocd
 spec:
   project: homelab
-  source:
-    repoURL: https://code.brunner.ninja/feedc0de/homelab-gitops.git
+  sources:
+  - repoURL: https://brunner.ninja/charts
+    chart: mosquitto
+    targetRevision: 1.0.0
+    helm:
+      releaseName: mosquitto
+      valueFiles:
+      - $values/apps/mosquitto/values.yaml
+  - repoURL: https://code.brunner.ninja/feedc0de/homelab-gitops.git
     targetRevision: main
-    path: apps/mosquitto
+    ref: values
   destination:
     server: https://kubernetes.default.svc
     namespace: default
diff --git a/bootstrap/visual-studio-code.yaml b/bootstrap/visual-studio-code.yaml
index 7e1c179..d59401f 100644
--- a/bootstrap/visual-studio-code.yaml
+++ b/bootstrap/visual-studio-code.yaml
@@ -5,10 +5,17 @@ metadata:
   namespace: argocd
 spec:
   project: homelab
-  source:
-    repoURL: https://code.brunner.ninja/feedc0de/homelab-gitops.git
+  sources:
+  - repoURL: https://brunner.ninja/charts
+    chart: visual-studio-code
+    targetRevision: 1.0.0
+    helm:
+      releaseName: visual-studio-code
+      valueFiles:
+      - $values/apps/visual-studio-code/values.yaml
+  - repoURL: https://code.brunner.ninja/feedc0de/homelab-gitops.git
     targetRevision: main
-    path: apps/visual-studio-code
+    ref: values
   destination:
     server: https://kubernetes.default.svc
     namespace: default