diff --git a/apps/logs.yaml b/apps/logs.yaml
index 5c776b0..9019d2c 100644
--- a/apps/logs.yaml
+++ b/apps/logs.yaml
@@ -9,42 +9,122 @@ spec:
   project: default
   source:
     repoURL: https://grafana.github.io/helm-charts
-    chart: loki-stack
-    targetRevision: 2.10.2
+    chart: loki
+    targetRevision: 6.30.1
     helm:
       values: |
-        promtail:
-          enabled: true
-          resources:
-            requests:
-              memory: 50Mi
-              cpu: 50m
-            limits:
-              memory: 150Mi
-              cpu: 200m
-
-        grafana:
-          enabled: false
+        deploymentMode: SingleBinary
 
         loki:
-          enabled: true
+          auth_enabled: false
+
+          commonConfig:
+            replication_factor: 1
+
+          schemaConfig:
+            configs:
+              - from: "2024-04-01"
+                store: tsdb
+                object_store: filesystem
+                schema: v13
+                index:
+                  prefix: index_
+                  period: 24h
+
+          storage:
+            type: filesystem
+
+          limits_config:
+            allow_structured_metadata: true
+
+        singleBinary:
+          replicas: 1
+
           persistence:
             enabled: true
-            storageClassName: "local-path"
+            storageClass: local-path
             size: 20Gi
+
           resources:
             requests:
-              memory: 200Mi
               cpu: 100m
+              memory: 300Mi
             limits:
-              memory: 400Mi
               cpu: 500m
-          config:
-            auth_enabled: false
+              memory: 600Mi
+
+        gateway:
+          enabled: false
+
+        lokiCanary:
+          enabled: false
+
+        test:
+          enabled: false
+
+        backend:
+          replicas: 0
+
+        read:
+          replicas: 0
+
+        write:
+          replicas: 0
+
+        chunksCache:
+          enabled: false
+
+        resultsCache:
+          enabled: false
+
+        minio:
+          enabled: false
+
+  destination:
+    server: https://kubernetes.default.svc
+    namespace: monitoring
+  syncPolicy:
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
+---
+apiVersion: argoproj.io/v1alpha1
+kind: Application
+metadata:
+  name: promtail
+  namespace: argocd
+  finalizers:
+    - resources-finalizer.argocd.argoproj.io
+spec:
+  project: default
+
+  source:
+    repoURL: https://grafana.github.io/helm-charts
+    chart: promtail
+    targetRevision: 6.17.0
+
+    helm:
+      values: |
+        config:
+          clients:
+            - url: http://grafana-loki.monitoring.svc.cluster.local:3100/loki/api/v1/push
+
+        resources:
+          requests:
+            cpu: 50m
+            memory: 50Mi
+          limits:
+            cpu: 100m
+            memory: 100Mi
 
   destination:
     server: https://kubernetes.default.svc
     namespace: monitoring
   syncPolicy:
-    automated: { prune: true, selfHeal: true }
-    syncOptions: [CreateNamespace=true]
\ No newline at end of file
+    automated:
+      prune: true
+      selfHeal: true
+    syncOptions:
+      - CreateNamespace=true
\ No newline at end of file
diff --git a/apps/monitoring.yaml b/apps/monitoring.yaml
index 3edfc0b..b97a02a 100644
--- a/apps/monitoring.yaml
+++ b/apps/monitoring.yaml
@@ -10,7 +10,7 @@ spec:
   source:
     repoURL: https://prometheus-community.github.io/helm-charts
     chart: kube-prometheus-stack
-    targetRevision: 69.3.0
+    targetRevision: 86.2.3
     helm:
       values: |
         prometheusOperator:
@@ -53,7 +53,7 @@ spec:
             - name: Loki
               type: loki
               access: proxy
-              url: http://grafana-loki-single-binary.monitoring.svc.cluster.local:3100
+              url: http://grafana-loki.monitoring.svc.cluster.local:3100
               jsonData:
                 maxLines: 1000
               editable: true