diff --git a/licenses.d2iq.yaml b/licenses.d2iq.yaml
index 10f01e28d..d1451ee1f 100644
--- a/licenses.d2iq.yaml
+++ b/licenses.d2iq.yaml
@@ -106,7 +106,7 @@ resources:
         notice_path: NOTICE.md
         ref: v${image_tag}
         url: https://github.com/grafana/grafana
-  - container_image: docker.io/grafana/loki:2.8.2
+  - container_image: docker.io/grafana/loki:2.8.4
     sources:
       - license_path: LICENSE
         ref: v${image_tag}
diff --git a/services/grafana-loki/0.69.16/defaults/cm.yaml b/services/grafana-loki/0.71.2/defaults/cm.yaml
similarity index 99%
rename from services/grafana-loki/0.69.16/defaults/cm.yaml
rename to services/grafana-loki/0.71.2/defaults/cm.yaml
index 3390e276b..4a3d1b69b 100644
--- a/services/grafana-loki/0.69.16/defaults/cm.yaml
+++ b/services/grafana-loki/0.71.2/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: grafana-loki-0.69.16-d2iq-defaults
+  name: grafana-loki-0.71.2-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
diff --git a/services/grafana-loki/0.69.16/defaults/kustomization.yaml b/services/grafana-loki/0.71.2/defaults/kustomization.yaml
similarity index 100%
rename from services/grafana-loki/0.69.16/defaults/kustomization.yaml
rename to services/grafana-loki/0.71.2/defaults/kustomization.yaml
diff --git a/services/grafana-loki/0.69.16/grafana-dashboards-logging/kustomization.yaml b/services/grafana-loki/0.71.2/grafana-dashboards-logging/kustomization.yaml
similarity index 100%
rename from services/grafana-loki/0.69.16/grafana-dashboards-logging/kustomization.yaml
rename to services/grafana-loki/0.71.2/grafana-dashboards-logging/kustomization.yaml
diff --git a/services/grafana-loki/0.69.16/grafana-dashboards-logging/logging-loki-dashboard.json b/services/grafana-loki/0.71.2/grafana-dashboards-logging/logging-loki-dashboard.json
similarity index 100%
rename from services/grafana-loki/0.69.16/grafana-dashboards-logging/logging-loki-dashboard.json
rename to services/grafana-loki/0.71.2/grafana-dashboards-logging/logging-loki-dashboard.json
diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/grafana-loki.json b/services/grafana-loki/0.71.2/grafana-dashboards/grafana-loki.json
similarity index 100%
rename from services/grafana-loki/0.69.16/grafana-dashboards/grafana-loki.json
rename to services/grafana-loki/0.71.2/grafana-dashboards/grafana-loki.json
diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/kustomization.yaml b/services/grafana-loki/0.71.2/grafana-dashboards/kustomization.yaml
similarity index 100%
rename from services/grafana-loki/0.69.16/grafana-dashboards/kustomization.yaml
rename to services/grafana-loki/0.71.2/grafana-dashboards/kustomization.yaml
diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/loki-chunks.json b/services/grafana-loki/0.71.2/grafana-dashboards/loki-chunks.json
similarity index 100%
rename from services/grafana-loki/0.69.16/grafana-dashboards/loki-chunks.json
rename to services/grafana-loki/0.71.2/grafana-dashboards/loki-chunks.json
diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/loki-deletion.json b/services/grafana-loki/0.71.2/grafana-dashboards/loki-deletion.json
similarity index 100%
rename from services/grafana-loki/0.69.16/grafana-dashboards/loki-deletion.json
rename to services/grafana-loki/0.71.2/grafana-dashboards/loki-deletion.json
diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/loki-reads-resources.json b/services/grafana-loki/0.71.2/grafana-dashboards/loki-reads-resources.json
similarity index 100%
rename from services/grafana-loki/0.69.16/grafana-dashboards/loki-reads-resources.json
rename to services/grafana-loki/0.71.2/grafana-dashboards/loki-reads-resources.json
diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/loki-retention.json b/services/grafana-loki/0.71.2/grafana-dashboards/loki-retention.json
similarity index 100%
rename from services/grafana-loki/0.69.16/grafana-dashboards/loki-retention.json
rename to services/grafana-loki/0.71.2/grafana-dashboards/loki-retention.json
diff --git a/services/grafana-loki/0.69.16/grafana-dashboards/loki-writes-resources.json b/services/grafana-loki/0.71.2/grafana-dashboards/loki-writes-resources.json
similarity index 100%
rename from services/grafana-loki/0.69.16/grafana-dashboards/loki-writes-resources.json
rename to services/grafana-loki/0.71.2/grafana-dashboards/loki-writes-resources.json
diff --git a/services/grafana-loki/0.69.16/grafana-loki-helmrelease.yaml b/services/grafana-loki/0.71.2/grafana-loki-helmrelease.yaml
similarity index 91%
rename from services/grafana-loki/0.69.16/grafana-loki-helmrelease.yaml
rename to services/grafana-loki/0.71.2/grafana-loki-helmrelease.yaml
index c531bd16d..f032c3b0b 100644
--- a/services/grafana-loki/0.69.16/grafana-loki-helmrelease.yaml
+++ b/services/grafana-loki/0.71.2/grafana-loki-helmrelease.yaml
@@ -12,7 +12,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/grafana-loki/0.69.16/grafana-loki-helmrelease
+  path: ./services/grafana-loki/0.71.2/grafana-loki-helmrelease
   sourceRef:
     kind: GitRepository
     name: management
diff --git a/services/grafana-loki/0.69.16/grafana-loki-helmrelease/grafana-loki.yaml b/services/grafana-loki/0.71.2/grafana-loki-helmrelease/grafana-loki.yaml
similarity index 88%
rename from services/grafana-loki/0.69.16/grafana-loki-helmrelease/grafana-loki.yaml
rename to services/grafana-loki/0.71.2/grafana-loki-helmrelease/grafana-loki.yaml
index b9e465e46..aab8a1112 100644
--- a/services/grafana-loki/0.69.16/grafana-loki-helmrelease/grafana-loki.yaml
+++ b/services/grafana-loki/0.71.2/grafana-loki-helmrelease/grafana-loki.yaml
@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: grafana.github.io
         namespace: kommander-flux
-      version: 0.69.16
+      version: 0.71.2
   interval: 15s
   timeout: 15m
   install:
@@ -25,4 +25,4 @@ spec:
   releaseName: grafana-loki
   valuesFrom:
     - kind: ConfigMap
-      name: grafana-loki-0.69.16-d2iq-defaults
+      name: grafana-loki-0.71.2-d2iq-defaults
diff --git a/services/grafana-loki/0.69.16/grafana-loki-pre-install-jobs/pre-install.yaml b/services/grafana-loki/0.71.2/grafana-loki-pre-install-jobs/pre-install.yaml
similarity index 100%
rename from services/grafana-loki/0.69.16/grafana-loki-pre-install-jobs/pre-install.yaml
rename to services/grafana-loki/0.71.2/grafana-loki-pre-install-jobs/pre-install.yaml
diff --git a/services/grafana-loki/0.69.16/grafana-loki-pre-install.yaml b/services/grafana-loki/0.71.2/grafana-loki-pre-install.yaml
similarity index 84%
rename from services/grafana-loki/0.69.16/grafana-loki-pre-install.yaml
rename to services/grafana-loki/0.71.2/grafana-loki-pre-install.yaml
index bfb7fa7a1..7d89c329a 100644
--- a/services/grafana-loki/0.69.16/grafana-loki-pre-install.yaml
+++ b/services/grafana-loki/0.71.2/grafana-loki-pre-install.yaml
@@ -9,7 +9,7 @@ spec:
   wait: true
   interval: 6h
   retryInterval: 1m
-  path: ./services/grafana-loki/0.69.16/grafana-loki-pre-install-jobs
+  path: ./services/grafana-loki/0.71.2/grafana-loki-pre-install-jobs
   sourceRef:
     kind: GitRepository
     name: management
diff --git a/services/grafana-loki/0.69.16/kustomization.yaml b/services/grafana-loki/0.71.2/kustomization.yaml
similarity index 100%
rename from services/grafana-loki/0.69.16/kustomization.yaml
rename to services/grafana-loki/0.71.2/kustomization.yaml
diff --git a/services/project-grafana-loki/0.69.16/defaults/cm.yaml b/services/project-grafana-loki/0.71.2/defaults/cm.yaml
similarity index 99%
rename from services/project-grafana-loki/0.69.16/defaults/cm.yaml
rename to services/project-grafana-loki/0.71.2/defaults/cm.yaml
index 1a0a4591e..0fa2b0251 100644
--- a/services/project-grafana-loki/0.69.16/defaults/cm.yaml
+++ b/services/project-grafana-loki/0.71.2/defaults/cm.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: project-grafana-loki-0.69.16-d2iq-defaults
+  name: project-grafana-loki-0.71.2-d2iq-defaults
   namespace: ${releaseNamespace}
 data:
   values.yaml: |
diff --git a/services/project-grafana-loki/0.69.16/defaults/kustomization.yaml b/services/project-grafana-loki/0.71.2/defaults/kustomization.yaml
similarity index 100%
rename from services/project-grafana-loki/0.69.16/defaults/kustomization.yaml
rename to services/project-grafana-loki/0.71.2/defaults/kustomization.yaml
diff --git a/services/project-grafana-loki/0.69.16/grafana-dashboards-logging/kustomization.yaml b/services/project-grafana-loki/0.71.2/grafana-dashboards-logging/kustomization.yaml
similarity index 100%
rename from services/project-grafana-loki/0.69.16/grafana-dashboards-logging/kustomization.yaml
rename to services/project-grafana-loki/0.71.2/grafana-dashboards-logging/kustomization.yaml
diff --git a/services/project-grafana-loki/0.69.16/grafana-dashboards-logging/logging-loki-dashboard.json b/services/project-grafana-loki/0.71.2/grafana-dashboards-logging/logging-loki-dashboard.json
similarity index 100%
rename from services/project-grafana-loki/0.69.16/grafana-dashboards-logging/logging-loki-dashboard.json
rename to services/project-grafana-loki/0.71.2/grafana-dashboards-logging/logging-loki-dashboard.json
diff --git a/services/project-grafana-loki/0.69.16/kustomization.yaml b/services/project-grafana-loki/0.71.2/kustomization.yaml
similarity index 100%
rename from services/project-grafana-loki/0.69.16/kustomization.yaml
rename to services/project-grafana-loki/0.71.2/kustomization.yaml
diff --git a/services/project-grafana-loki/0.69.16/object-bucket-claims.yaml b/services/project-grafana-loki/0.71.2/object-bucket-claims.yaml
similarity index 92%
rename from services/project-grafana-loki/0.69.16/object-bucket-claims.yaml
rename to services/project-grafana-loki/0.71.2/object-bucket-claims.yaml
index b09e4f98b..f986d64a9 100644
--- a/services/project-grafana-loki/0.69.16/object-bucket-claims.yaml
+++ b/services/project-grafana-loki/0.71.2/object-bucket-claims.yaml
@@ -24,7 +24,7 @@ spec:
   releaseName: project-loki-object-bucket-claims
   valuesFrom:
     - kind: ConfigMap
-      name: project-grafana-loki-0.69.16-d2iq-defaults
+      name: project-grafana-loki-0.71.2-d2iq-defaults
     - kind: ConfigMap
       name: project-grafana-loki-overrides
       optional: true
diff --git a/services/project-grafana-loki/0.69.16/project-grafana-loki.yaml b/services/project-grafana-loki/0.71.2/project-grafana-loki.yaml
similarity index 87%
rename from services/project-grafana-loki/0.69.16/project-grafana-loki.yaml
rename to services/project-grafana-loki/0.71.2/project-grafana-loki.yaml
index 01ccc47d3..91342d352 100644
--- a/services/project-grafana-loki/0.69.16/project-grafana-loki.yaml
+++ b/services/project-grafana-loki/0.71.2/project-grafana-loki.yaml
@@ -11,7 +11,7 @@ spec:
         kind: HelmRepository
         name: grafana.github.io
         namespace: kommander-flux
-      version: 0.69.16
+      version: 0.71.2
   timeout: 15m
   interval: 15s
   install:
@@ -25,4 +25,4 @@ spec:
   releaseName: project-grafana-loki
   valuesFrom:
     - kind: ConfigMap
-      name: project-grafana-loki-0.69.16-d2iq-defaults
+      name: project-grafana-loki-0.71.2-d2iq-defaults