diff --git a/workloads/grafana/grafana-proxy.yml b/workloads/grafana/grafana-proxy.yml
index b32be54..7cca2f5 100644
--- a/workloads/grafana/grafana-proxy.yml
+++ b/workloads/grafana/grafana-proxy.yml
@@ -2,23 +2,23 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: grafana-proxy
+  name: grafanaproxy
   namespace: grafana
 spec:
   replicas: 1
   selector:
     matchLabels:
-      app: grafana-proxy
+      app: grafanaproxy
   template:
     metadata:
       labels:
-        app: grafana-proxy
+        app: grafanaproxy
     spec:
       containers:
       - image: quay.io/oauth2-proxy/oauth2-proxy:v5.1.0
         args: ["-email-domain=*", "-upstream=http://grafana:3000/"]
         imagePullPolicy: IfNotPresent
-        name: grafana-proxy
+        name: grafanaproxy
         env:
         - name: OAUTH2_PROXY_SKIP_AUTH_REGEX
           value: "/metrics(.*)"
@@ -27,19 +27,19 @@ spec:
         - name: OAUTH2_PROXY_COOKIE_SECRET
           valueFrom:
             secretKeyRef:
-              name: grafana-proxy
+              name: grafanaproxy
               key: cookie_secret
         - name: OAUTH2_PROXY_PROVIDER
           value: nextcloud
         - name: OAUTH2_PROXY_CLIENT_ID
           valueFrom:
             secretKeyRef:
-              name: grafana-proxy
+              name: grafanaproxy
               key: client_id
         - name: OAUTH2_PROXY_CLIENT_SECRET
           valueFrom:
             secretKeyRef:
-              name: grafana-proxy
+              name: grafanaproxy
               key: client_secret
         - name: OAUTH2_PROXY_LOGIN_URL
           value: https://cloud.shoup.io/index.php/apps/oauth2/authorize
diff --git a/workloads/grafana/grafana-service.yml b/workloads/grafana/grafana-service.yml
index d42122b..9ddf2cd 100644
--- a/workloads/grafana/grafana-service.yml
+++ b/workloads/grafana/grafana-service.yml
@@ -14,11 +14,11 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: grafana-proxy
+  name: grafanaproxy
   namespace: grafana
 spec:
   selector:
-    app: grafana-proxy
+    app: grafanaproxy
   ports:
   - protocol: TCP
     port: 4180
@@ -35,6 +35,6 @@ spec:
     http:
       paths:
       - backend:
-          serviceName: grafana-proxy
+          serviceName: grafanaproxy
           servicePort: 4180
         path: /
diff --git a/workloads/grafana/proxy-secret.yml b/workloads/grafana/proxy-secret.yml
index aafa6fb..cf9ef24 100644
--- a/workloads/grafana/proxy-secret.yml
+++ b/workloads/grafana/proxy-secret.yml
@@ -2,7 +2,7 @@ apiVersion: bitnami.com/v1alpha1
 kind: SealedSecret
 metadata:
   creationTimestamp: null
-  name: grafana-proxy
+  name: grafanaproxy
   namespace: grafana
 spec:
   encryptedData:
@@ -12,8 +12,7 @@ spec:
   template:
     metadata:
       creationTimestamp: null
-      name: grafana-proxy
+      name: grafanaproxy
       namespace: grafana
     type: Opaque
 status: {}
-
diff --git a/workloads/kube-system/fluentd-config.yml b/workloads/kube-system/fluentd-config.yml
index 68c6b02..4c1d724 100644
--- a/workloads/kube-system/fluentd-config.yml
+++ b/workloads/kube-system/fluentd-config.yml
@@ -55,7 +55,7 @@ data:
   disable.conf: ""
 
   filters.conf: |
-    <filter kubernetes.var.log.containers.nextcloud-** kubernetes.var.log.containers.echoserver-**>
+    <filter kubernetes.var.log.containers.nextcloud-** kubernetes.var.log.containers.echoserver-** kubernetes.var.log.containers.grafanaproxy-**>
       @type parser
       key_name log
       reserve_data true
@@ -74,7 +74,7 @@ data:
       </parse>
     </filter>
 
-    <filter kubernetes.var.log.containers.flux-**>
+    <filter kubernetes.var.log.containers.flux-** kubernetes.var.log.containers.grafana-**>
       @type parser
       key_name log
       reserve_data true