diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
index 5ecfdff19..9224fb7da 100644
--- a/licenses.d2iq.yaml
+++ b/licenses.d2iq.yaml
@@ -30,11 +30,11 @@ resources:
         notice_path: NOTICE.md
         ref: v${image_tag}
         url: https://github.com/grafana/grafana
-  - container_image: docker.io/grafana/grafana:11.1.0
+  - container_image: docker.io/grafana/grafana:11.2.2-security-01
     sources:
       - license_path: LICENSE
         notice_path: NOTICE.md
-        ref: v${image_tag}
+        ref: v${image_tag%-security-01}
         url: https://github.com/grafana/grafana
   - container_image: docker.io/grafana/loki:2.9.8
     sources:
diff --git a/services/grafana-logging/8.3.6/defaults/cm.yaml b/services/grafana-logging/8.5.8/defaults/cm.yaml
similarity index 98%
rename from services/grafana-logging/8.3.6/defaults/cm.yaml
rename to services/grafana-logging/8.5.8/defaults/cm.yaml
index 9f8155cfa..a5f6f72e3 100644
--- a/services/grafana-logging/8.3.6/defaults/cm.yaml
+++ b/services/grafana-logging/8.5.8/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: grafana-logging-8.3.6-d2iq-defaults
+  name: grafana-logging-8.5.8-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
diff --git a/services/grafana-logging/8.3.6/defaults/kustomization.yaml b/services/grafana-logging/8.5.8/defaults/kustomization.yaml
similarity index 100%
rename from services/grafana-logging/8.3.6/defaults/kustomization.yaml
rename to services/grafana-logging/8.5.8/defaults/kustomization.yaml
diff --git a/services/grafana-logging/8.3.6/grafana.yaml b/services/grafana-logging/8.5.8/grafana.yaml
similarity index 96%
rename from services/grafana-logging/8.3.6/grafana.yaml
rename to services/grafana-logging/8.5.8/grafana.yaml
index 530bdf064..8850f7f4a 100644
--- a/services/grafana-logging/8.3.6/grafana.yaml
+++ b/services/grafana-logging/8.5.8/grafana.yaml
@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: grafana.github.io
         namespace: kommander-flux
-      version: 8.3.4
+      version: 8.5.8
   interval: 15s
   install:
     crds: CreateReplace
@@ -24,7 +24,7 @@ spec:
   releaseName: grafana-logging
   valuesFrom:
     - kind: ConfigMap
-      name: grafana-logging-8.3.6-d2iq-defaults
+      name: grafana-logging-8.5.8-d2iq-defaults
   targetNamespace: ${releaseNamespace}
 ---
 apiVersion: v1
diff --git a/services/grafana-logging/8.3.6/kustomization.yaml b/services/grafana-logging/8.5.8/kustomization.yaml
similarity index 100%
rename from services/grafana-logging/8.3.6/kustomization.yaml
rename to services/grafana-logging/8.5.8/kustomization.yaml
diff --git a/services/project-grafana-logging/8.3.5/defaults/cm.yaml b/services/project-grafana-logging/8.5.8/defaults/cm.yaml
similarity index 98%
rename from services/project-grafana-logging/8.3.5/defaults/cm.yaml
rename to services/project-grafana-logging/8.5.8/defaults/cm.yaml
index b2f143893..5d084a306 100644
--- a/services/project-grafana-logging/8.3.5/defaults/cm.yaml
+++ b/services/project-grafana-logging/8.5.8/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: project-grafana-logging-8.3.5-d2iq-defaults
+  name: project-grafana-logging-8.5.8-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
diff --git a/services/project-grafana-logging/8.3.5/defaults/kustomization.yaml b/services/project-grafana-logging/8.5.8/defaults/kustomization.yaml
similarity index 100%
rename from services/project-grafana-logging/8.3.5/defaults/kustomization.yaml
rename to services/project-grafana-logging/8.5.8/defaults/kustomization.yaml
diff --git a/services/project-grafana-logging/8.3.5/kustomization.yaml b/services/project-grafana-logging/8.5.8/kustomization.yaml
similarity index 100%
rename from services/project-grafana-logging/8.3.5/kustomization.yaml
rename to services/project-grafana-logging/8.5.8/kustomization.yaml
diff --git a/services/project-grafana-logging/8.3.5/project-grafana.yaml b/services/project-grafana-logging/8.5.8/project-grafana.yaml
similarity index 87%
rename from services/project-grafana-logging/8.3.5/project-grafana.yaml
rename to services/project-grafana-logging/8.5.8/project-grafana.yaml
index b597a192c..22774a238 100644
--- a/services/project-grafana-logging/8.3.5/project-grafana.yaml
+++ b/services/project-grafana-logging/8.5.8/project-grafana.yaml
@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: grafana.github.io
         namespace: kommander-flux
-      version: 8.3.4
+      version: 8.5.8
   interval: 15s
   install:
     crds: CreateReplace
@@ -23,5 +23,5 @@ spec:
       retries: 30
   valuesFrom:
     - kind: ConfigMap
-      name: project-grafana-logging-8.3.5-d2iq-defaults
+      name: project-grafana-logging-8.5.8-d2iq-defaults
   targetNamespace: ${releaseNamespace}