diff --git a/terminfinder-chart/charts/resources/templates/postgresql.yaml b/terminfinder-chart/charts/resources/templates/postgresql.yaml
index 50c277c..07e9d3f 100644
--- a/terminfinder-chart/charts/resources/templates/postgresql.yaml
+++ b/terminfinder-chart/charts/resources/templates/postgresql.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.postgres.enabled -}}
 apiVersion: cloud.dataport.de/v1alpha1
 kind: PostgreSQL
 metadata:
@@ -7,3 +8,4 @@ spec:
   storageSize: {{ .Values.postgres.storageSize }}
   pgVersion: "{{ .Values.postgres.pgVersion }}"
   instances: {{ .Values.postgres.instances }}
+{{- end }}
diff --git a/terminfinder-chart/charts/resources/templates/traefik.yaml b/terminfinder-chart/charts/resources/templates/traefik.yaml
index d2fafe2..3ab3dfa 100644
--- a/terminfinder-chart/charts/resources/templates/traefik.yaml
+++ b/terminfinder-chart/charts/resources/templates/traefik.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.traefik.enabled -}}
 apiVersion: traefik.io/v1alpha1
 kind: Middleware
 metadata:
@@ -7,3 +8,4 @@ spec:
   stripPrefix:
     prefixes:
     - /api
+{{- end }}
diff --git a/terminfinder-chart/charts/resources/values.yaml b/terminfinder-chart/charts/resources/values.yaml
index 469caa8..e7a855c 100644
--- a/terminfinder-chart/charts/resources/values.yaml
+++ b/terminfinder-chart/charts/resources/values.yaml
@@ -6,3 +6,7 @@ postgres:
   storageSize: "2Gi"
   pgVersion: "15"
   instances: 3
+  enabled: true
+
+traefik:
+  enabled: true
diff --git a/terminfinder-chart/values.yaml b/terminfinder-chart/values.yaml
index f37db23..115e24b 100644
--- a/terminfinder-chart/values.yaml
+++ b/terminfinder-chart/values.yaml
@@ -293,3 +293,7 @@ terminfinder-resources:
     storageSize: "2Gi"
     pgVersion: "15"
     instances: 3
+    enabled: true
+
+  traefik:
+    enabled: true