diff --git a/apps/kimai/helmrelease.yaml b/apps/kimai/helmrelease.yaml
index b02c6cd..6d5e6c4 100644
--- a/apps/kimai/helmrelease.yaml
+++ b/apps/kimai/helmrelease.yaml
@@ -12,4 +12,9 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: robjuz
-        namespace: flux-system
\ No newline at end of file
+        namespace: flux-system
+  
+  valuesFrom:
+    - kind: ConfigMap
+      name: kimai-values
+      valuesKey: values.yaml
\ No newline at end of file
diff --git a/apps/kimai/kustomization.yaml b/apps/kimai/kustomization.yaml
index 9be7d15..68d1176 100644
--- a/apps/kimai/kustomization.yaml
+++ b/apps/kimai/kustomization.yaml
@@ -10,5 +10,5 @@ configMapGenerator:
   files:
   - values.yaml
 
-#generatorOptions:
-#  disableNameSuffixHash: true
\ No newline at end of file
+generatorOptions:
+  disableNameSuffixHash: true
\ No newline at end of file
diff --git a/apps/kimai/values.yaml b/apps/kimai/values.yaml
index 0f68661..70c85e7 100644
--- a/apps/kimai/values.yaml
+++ b/apps/kimai/values.yaml
@@ -3,7 +3,7 @@
 
 ingress:
   enabled: true
-  className: nginx
+  className: traefik
 
   hosts:
     - host: kimai.local
@@ -24,4 +24,7 @@ mariadb:
     rootPassword: j6drtf47
     database: kimai
     username: kimai
-    password: kimai
\ No newline at end of file
+    password: kimai
+
+service:
+  type: ClusterIP
\ No newline at end of file