diff --git a/.freeleaps/devops/helm-pkg/templates/authentication/authentication-config.yaml b/.freeleaps/devops/helm-pkg/templates/authentication-config.yaml
similarity index 100%
rename from .freeleaps/devops/helm-pkg/templates/authentication/authentication-config.yaml
rename to .freeleaps/devops/helm-pkg/templates/authentication-config.yaml
diff --git a/.freeleaps/devops/helm-pkg/templates/authentication/certificate.yaml b/.freeleaps/devops/helm-pkg/templates/certificate.yaml
similarity index 100%
rename from .freeleaps/devops/helm-pkg/templates/authentication/certificate.yaml
rename to .freeleaps/devops/helm-pkg/templates/certificate.yaml
diff --git a/.freeleaps/devops/helm-pkg/templates/authentication/dashboard.yaml b/.freeleaps/devops/helm-pkg/templates/dashboard.yaml
similarity index 100%
rename from .freeleaps/devops/helm-pkg/templates/authentication/dashboard.yaml
rename to .freeleaps/devops/helm-pkg/templates/dashboard.yaml
diff --git a/.freeleaps/devops/helm-pkg/templates/authentication/deployment.yaml b/.freeleaps/devops/helm-pkg/templates/deployment.yaml
similarity index 100%
rename from .freeleaps/devops/helm-pkg/templates/authentication/deployment.yaml
rename to .freeleaps/devops/helm-pkg/templates/deployment.yaml
diff --git a/.freeleaps/devops/helm-pkg/templates/authentication/freeleapssecret.yaml b/.freeleaps/devops/helm-pkg/templates/freeleapssecret.yaml
similarity index 100%
rename from .freeleaps/devops/helm-pkg/templates/authentication/freeleapssecret.yaml
rename to .freeleaps/devops/helm-pkg/templates/freeleapssecret.yaml
diff --git a/.freeleaps/devops/helm-pkg/templates/authentication/ingress.yaml b/.freeleaps/devops/helm-pkg/templates/ingress.yaml
similarity index 100%
rename from .freeleaps/devops/helm-pkg/templates/authentication/ingress.yaml
rename to .freeleaps/devops/helm-pkg/templates/ingress.yaml
diff --git a/.freeleaps/devops/helm-pkg/templates/authentication/opentelemetry-rbac.yaml b/.freeleaps/devops/helm-pkg/templates/opentelemetry-rbac.yaml
similarity index 100%
rename from .freeleaps/devops/helm-pkg/templates/authentication/opentelemetry-rbac.yaml
rename to .freeleaps/devops/helm-pkg/templates/opentelemetry-rbac.yaml
diff --git a/.freeleaps/devops/helm-pkg/templates/authentication/opentelemetry.yaml b/.freeleaps/devops/helm-pkg/templates/opentelemetry.yaml
similarity index 100%
rename from .freeleaps/devops/helm-pkg/templates/authentication/opentelemetry.yaml
rename to .freeleaps/devops/helm-pkg/templates/opentelemetry.yaml
diff --git a/.freeleaps/devops/helm-pkg/templates/authentication/service.yaml b/.freeleaps/devops/helm-pkg/templates/service.yaml
similarity index 100%
rename from .freeleaps/devops/helm-pkg/templates/authentication/service.yaml
rename to .freeleaps/devops/helm-pkg/templates/service.yaml
diff --git a/.freeleaps/devops/helm-pkg/templates/authentication/servicemonitor.yaml b/.freeleaps/devops/helm-pkg/templates/servicemonitor.yaml
similarity index 100%
rename from .freeleaps/devops/helm-pkg/templates/authentication/servicemonitor.yaml
rename to .freeleaps/devops/helm-pkg/templates/servicemonitor.yaml
diff --git a/.freeleaps/devops/helm-pkg/templates/authentication/vpa.yaml b/.freeleaps/devops/helm-pkg/templates/vpa.yaml
similarity index 100%
rename from .freeleaps/devops/helm-pkg/templates/authentication/vpa.yaml
rename to .freeleaps/devops/helm-pkg/templates/vpa.yaml
diff --git a/.freeleaps/devops/helm-pkg/values.alpha.yaml b/.freeleaps/devops/helm-pkg/values.alpha.yaml
index b6e49a7..fd571bb 100644
--- a/.freeleaps/devops/helm-pkg/values.alpha.yaml
+++ b/.freeleaps/devops/helm-pkg/values.alpha.yaml
@@ -8,14 +8,14 @@ logIngest:
 global:
   environment: alpha
   registry: docker.io
-  repository: freeleaps
+  repository: freeleapsdevops
 authentication:
   replicas: 1
   image:
     registry: docker.io
     repository: null
-    name: authentication
-    tag: snapshot-512e418
+    name: 6901bcf4ed3725f39f11343d-authentication
+    tag: snapshot-2346a42
     imagePullPolicy: IfNotPresent
   ports:
   - name: http
diff --git a/.freeleaps/devops/helm-pkg/values.prod.yaml b/.freeleaps/devops/helm-pkg/values.prod.yaml
index f753a8a..ce2fe08 100644
--- a/.freeleaps/devops/helm-pkg/values.prod.yaml
+++ b/.freeleaps/devops/helm-pkg/values.prod.yaml
@@ -11,14 +11,14 @@ logIngest:
 global:
   environment: prod
   registry: docker.io
-  repository: freeleaps
+  repository: freeleapsdevops
 authentication:
   replicas: 1
   image:
     registry: docker.io
     repository: null
-    name: authentication
-    tag: 1.15.0
+    name: 6901bcf4ed3725f39f11343d-authentication
+    tag: snapshot-73d6a46
     imagePullPolicy: IfNotPresent
   ports:
   - name: http
diff --git a/.freeleaps/devops/helm-pkg/values.yaml b/.freeleaps/devops/helm-pkg/values.yaml
index a77b97d..68ccf39 100644
--- a/.freeleaps/devops/helm-pkg/values.yaml
+++ b/.freeleaps/devops/helm-pkg/values.yaml
@@ -1,6 +1,6 @@
 global:
   registry: docker.io
-  repository: freeleaps
+  repository: freeleapsdevops
   nodeSelector: {}
 dashboard:
   enabled: false
diff --git a/backend/models/base_doc.py b/backend/models/base_doc.py
index 77fca47..37bc148 100644
--- a/backend/models/base_doc.py
+++ b/backend/models/base_doc.py
@@ -15,6 +15,10 @@ class QueryExpression:
     def __init__(self, field_name: str):
         self.field_name = field_name
 
+    def __getattr__(self, name: str) -> 'QueryExpression':
+        """Handle nested field access like FLID.identity"""
+        return QueryExpression(f"{self.field_name}.{name}")
+
     def __eq__(self, other: Any) -> Dict[str, Any]:
         """Handle field == value comparisons"""
         return {self.field_name: other}