diff --git a/projects/argocd/values/argocd.yaml b/projects/argocd/values/argocd.yaml
index fa262679..39e0fc05 100644
--- a/projects/argocd/values/argocd.yaml
+++ b/projects/argocd/values/argocd.yaml
@@ -8,7 +8,7 @@ installCRDs: true
 global:
   image:
     repository: quay.io/argoproj/argocd
-    tag: latest
+    tag: v2.2.2
 #    imagePullPolicy: IfNotPresent
   securityContext:
     runAsUser: 999
@@ -172,7 +172,7 @@ repoServer:
 
   initContainers:
   - name: copy-cmp-server
-    image: quay.io/argoproj/argocd:latest
+    image: quay.io/argoproj/argocd:v2.2.2
     command:
     - cp
     - -n
diff --git a/projects/arrstack/values/bazarr.yaml b/projects/arrstack/values/bazarr.yaml
index 23ef2dbc..aa18a9b9 100644
--- a/projects/arrstack/values/bazarr.yaml
+++ b/projects/arrstack/values/bazarr.yaml
@@ -1,3 +1,7 @@
+image:
+  repository: ghcr.io/k8s-at-home/bazarr
+  tag: v0.9.9
+
 ingress:
   main:
     enabled: true
diff --git a/projects/arrstack/values/lidarr.yaml b/projects/arrstack/values/lidarr.yaml
index 789fb895..ea578063 100644
--- a/projects/arrstack/values/lidarr.yaml
+++ b/projects/arrstack/values/lidarr.yaml
@@ -1,3 +1,7 @@
+image:
+  repository: ghcr.io/k8s-at-home/lidarr
+  tag: v1.0.0.2255
+
 ingress:
   main:
     enabled: true
diff --git a/projects/arrstack/values/ombi.yaml b/projects/arrstack/values/ombi.yaml
index a9eec3db..a73c8429 100644
--- a/projects/arrstack/values/ombi.yaml
+++ b/projects/arrstack/values/ombi.yaml
@@ -1,3 +1,7 @@
+image:
+  repository: ghcr.io/linuxserver/ombi
+  tag: version-v4.0.1430
+
 ingress:
   main:
     enabled: true
diff --git a/projects/arrstack/values/radarr.yaml b/projects/arrstack/values/radarr.yaml
index f5b9139c..bd2fc1c4 100644
--- a/projects/arrstack/values/radarr.yaml
+++ b/projects/arrstack/values/radarr.yaml
@@ -1,3 +1,7 @@
+image:
+  repository: ghcr.io/k8s-at-home/radarr
+  tag: v3.2.2.5080
+
 ingress:
   main:
     enabled: true
diff --git a/projects/arrstack/values/sonarr.yaml b/projects/arrstack/values/sonarr.yaml
index 62a2f911..b3f60b19 100644
--- a/projects/arrstack/values/sonarr.yaml
+++ b/projects/arrstack/values/sonarr.yaml
@@ -1,5 +1,7 @@
-#image:
-#  tag: version-3.0.6.1265
+image:
+  repository: ghcr.io/k8s-at-home/sonarr
+  tag: v3.0.6.1342
+
 
 ingress:
   main:
diff --git a/projects/arrstack/values/unpackerr.yaml b/projects/arrstack/values/unpackerr.yaml
index e2a41a16..a4d87242 100644
--- a/projects/arrstack/values/unpackerr.yaml
+++ b/projects/arrstack/values/unpackerr.yaml
@@ -1,3 +1,7 @@
+image:
+  repository: golift/unpackerr
+  tag: 0.9.7
+
 env:
   UN_FOLDER_0_PATH: /downloads
   UN_FOLDER_0_DELETE_AFTER: "0"
diff --git a/projects/blocky/values/blocky.yaml b/projects/blocky/values/blocky.yaml
index 37df5501..947328ee 100644
--- a/projects/blocky/values/blocky.yaml
+++ b/projects/blocky/values/blocky.yaml
@@ -1,3 +1,7 @@
+image:
+  repository: spx01/blocky
+  tag: v0.15
+
 env:
   TZ: Europe/Amsterdam
 
diff --git a/projects/downloader/values/deluge.yaml b/projects/downloader/values/deluge.yaml
index 9276cba9..44b9ecdd 100644
--- a/projects/downloader/values/deluge.yaml
+++ b/projects/downloader/values/deluge.yaml
@@ -1,3 +1,7 @@
+image:
+  repository: linuxserver/deluge
+  tag: version-2.0.3-2201906121747ubuntu18.04.1
+
 ingress:
   main:
     enabled: true
diff --git a/projects/downloader/values/pyload.yaml b/projects/downloader/values/pyload.yaml
index f7797dd7..68174292 100644
--- a/projects/downloader/values/pyload.yaml
+++ b/projects/downloader/values/pyload.yaml
@@ -1,3 +1,7 @@
+image:
+  repository: ghcr.io/linuxserver/pyload
+  tag: version-7867da43
+
 ingress:
   main:
     enabled: true
diff --git a/projects/downloader/values/youtubedl.yaml b/projects/downloader/values/youtubedl.yaml
index 83448d4e..e38a3857 100644
--- a/projects/downloader/values/youtubedl.yaml
+++ b/projects/downloader/values/youtubedl.yaml
@@ -1,3 +1,7 @@
+image:
+  repository: tzahi12345/youtubedl-material
+  tag: "4.2"
+
 ingress:
   main:
     enabled: true
diff --git a/projects/gitea/values/gitea.yaml b/projects/gitea/values/gitea.yaml
index b6b9a277..f3f7a2ab 100644
--- a/projects/gitea/values/gitea.yaml
+++ b/projects/gitea/values/gitea.yaml
@@ -1,5 +1,7 @@
 # Gitea
 image:
+  repository: gitea/gitea
+  tag: 1.15.8
   rootless: true
 
 statefulset:
diff --git a/projects/grafana/values/loki-stack.yaml b/projects/grafana/values/loki-stack.yaml
index badc4fea..94c28cad 100755
--- a/projects/grafana/values/loki-stack.yaml
+++ b/projects/grafana/values/loki-stack.yaml
@@ -1,14 +1,23 @@
 loki:
   enabled: true
+  image:
+    repository: grafana/loki
+    tag: 2.4.1
 
 promtail:
   enabled: true
 
 fluent-bit:
   enabled: true
+  image:
+    repository: grafana/fluent-bit-plugin-loki
+    tag: 2.1.0-amd64
 
 grafana:
   enabled: true
+  image:
+    repository: grafana/grafana
+    tag: 8.3.3
 
   admin:
     existingSecret: "loki-stack-grafana"
@@ -62,20 +71,5 @@ grafana:
     server:
       root_url: https://grafana.dc
 
-    auth.generic_oauth:
-     name: Authentik
-     enabled: true
-     allow_sign_up: true
-     client_id: 779461ddc18a79dba69cf2eef895a20d59b21d59
-     #client_secret: IN ENV
-     scopes: "openid profile email"
-     #email_attribute_name: email:primary
-     role_attribute_path: "contains(groups[*], 'Grafana Admins') && 'Admin' || contains(groups[*], 'Grafana Editors') && 'Editor' || 'Viewer'"
-     auth_url: https://auth.dc/application/o/authorize/
-     token_url: https://auth.dc/application/o/token/
-     api_url: https://auth.dc/application/o/userinfo/
-     # meh.. but for now...
-     tls_skip_verify_insecure: true
- 
 prometheus:
   enabled: false
diff --git a/projects/grafana/values/prometheus.yaml b/projects/grafana/values/prometheus.yaml
index d9ee044e..0f42ed8d 100644
--- a/projects/grafana/values/prometheus.yaml
+++ b/projects/grafana/values/prometheus.yaml
@@ -6,6 +6,10 @@ kubeStateMetrics:
 
 nodeExporter:
   enabled: true
+  image:
+    repository: quay.io/prometheus/node-exporter
+    tag: v1.3.0
+
   hostNetwork: true
   hostPID: true
   hostRootfs: true
@@ -19,6 +23,9 @@ nodeExporter:
 
 server:
   enabled: true
+  image:
+    repository: quay.io/prometheus/prometheus
+    tag: v2.31.1
 
   persistentVolume:
     enabled: true
@@ -31,10 +38,10 @@ extraScrapeConfigs: |
    scrape_interval: 10s
    static_configs:
     - targets: ['192.168.1.1:9100']
- - job_name: 'borg'
-   scrape_interval: 120s
-   static_configs:
-    - targets: ['192.168.1.111:9942']
+# - job_name: 'borg'
+#   scrape_interval: 120s
+#   static_configs:
+#    - targets: ['192.168.1.111:9942']
 # - job_name: 'octoprint'
 #    scrape_interval: 5s
 #    metrics_path: '/plugin/prometheus_exporter/metrics'
diff --git a/projects/homeassistant/values/homeassistant.yaml b/projects/homeassistant/values/homeassistant.yaml
index 19b6329c..1cfc94f4 100644
--- a/projects/homeassistant/values/homeassistant.yaml
+++ b/projects/homeassistant/values/homeassistant.yaml
@@ -1,3 +1,7 @@
+image:
+  repository: homeassistant/home-assistant
+  tag: 2021.6.3
+
 additionalContainers:
   addon-homematic:
     name: addon-homematic
diff --git a/projects/homer/values/homer.yml b/projects/homer/values/homer.yml
index 3b983b83..b0ec367a 100644
--- a/projects/homer/values/homer.yml
+++ b/projects/homer/values/homer.yml
@@ -1,3 +1,7 @@
+image:
+  repository: b4bz/homer
+  tag: 21.03.2
+
 ingress:
   main:
     enabled: true
diff --git a/projects/services/values/minio.yaml b/projects/services/values/minio.yaml
index 0bb9fb74..99c44342 100644
--- a/projects/services/values/minio.yaml
+++ b/projects/services/values/minio.yaml
@@ -1,3 +1,8 @@
+image:
+  registry: docker.io
+  repository: bitnami/minio
+  tag: 2021.12.29-debian-10-r0
+
 defaultBuckets: "public, drone, temp"
 auth:
   existingSecret: minio-auth
diff --git a/projects/vault/values/vault.yaml b/projects/vault/values/vault.yaml
index ecf1cd6c..88147d3e 100644
--- a/projects/vault/values/vault.yaml
+++ b/projects/vault/values/vault.yaml
@@ -3,10 +3,15 @@ global:
   tlsDisable: true
   psp:
     enable: true
+
 injector:
   enabled: false
+
 server:
   enabled: true
+  image:
+    repository: "hashicorp/vault"
+    tag: "1.9.0"
   auditStorage:
     accessMode: ReadWriteOnce
     annotations: {}
@@ -27,6 +32,7 @@ server:
     enabled: false
   ha:
     enabled: false
+
   ingress:
     annotations:
       cert-manager.io/cluster-issuer: vault-issuer
@@ -41,9 +47,11 @@ server:
     - hosts:
       - vault.dc
       secretName: vault-tls
+
   networkPolicy:
     egress: []
     enabled: true
+
   standalone:
     enabled: true
     config: |
@@ -57,5 +65,6 @@ server:
       storage "file" {
         path = "/vault/data"
       }
+
 ui:
   enabled: true