diff --git a/charts/birdnet-go/templates/configmaps/birdnet.yaml b/charts/birdnet-go/templates/configmaps/birdnet.yaml
index 20e5dae..ab6d2e5 100644
--- a/charts/birdnet-go/templates/configmaps/birdnet.yaml
+++ b/charts/birdnet-go/templates/configmaps/birdnet.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ template "birdnet-go.fullname" . }}-config
+  name: {{ template "birdnet-go.fullname" . }}-birdnet
   labels:
     app: {{ template "birdnet-go.name" . }}
     chart: {{ template "birdnet-go.chart" . }}
diff --git a/charts/birdnet-go/templates/deployments/birdnet.yaml b/charts/birdnet-go/templates/deployments/birdnet.yaml
index e991371..a396bbc 100644
--- a/charts/birdnet-go/templates/deployments/birdnet.yaml
+++ b/charts/birdnet-go/templates/deployments/birdnet.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ template "birdnet-go.fullname" . }}
+  name: {{ template "birdnet-go.fullname" . }}-birdnet
   labels:
     app: {{ template "birdnet-go.name" . }}
     chart: {{ template "birdnet-go.chart" . }}
diff --git a/charts/birdnet-go/templates/ingresses/birdnet.yaml b/charts/birdnet-go/templates/ingresses/birdnet.yaml
new file mode 100644
index 0000000..0276350
--- /dev/null
+++ b/charts/birdnet-go/templates/ingresses/birdnet.yaml
@@ -0,0 +1,37 @@
+{{- if .Values.ingress.enabled -}}
+{{- $ingressPath := .Values.ingress.path -}}
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: {{ template "birdnet-go.fullname" . }}-birdnet
+  labels:
+    app: {{ template "birdnet-go.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  {{- with .Values.ingress.annotations }}
+  annotations:
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+spec:
+{{- if .Values.ingress.ingressClassName }}
+  ingressClassName: {{ .Values.ingress.ingressClassName }}
+{{- end }}
+{{- if .Values.ingress.tls }}
+  tls:
+{{ toYaml .Values.ingress.tls | indent 4 }}
+{{- end }}
+  rules:
+  {{- range .Values.ingress.hosts }}
+    - host: {{ . | quote }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: {{ template "birdnet-go.name" . }}
+                port: 
+                  name: http
+  {{- end }}
+{{- end }}
\ No newline at end of file
diff --git a/charts/birdnet-go/templates/services/birdnet.yaml b/charts/birdnet-go/templates/services/birdnet.yaml
new file mode 100644
index 0000000..01692bd
--- /dev/null
+++ b/charts/birdnet-go/templates/services/birdnet.yaml
@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: {{ template "birdnet-go.fullname" . }}-birdnet
+  labels:
+    app: {{ template "birdnet-go.name" . }}
+    chart: {{ template "birdnet-go.chart" . }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+spec:
+  type: ClusterIP
+  selector:
+    app: {{ template "birdnet-go.name" . }}-birdnet
+  ports:
+    - name: http
+      protocol: TCP
+      port: 80
+      targetPort: http
diff --git a/charts/birdnet-go/templates/services/rtsp-server.yaml b/charts/birdnet-go/templates/services/rtsp-server.yaml
index b876427..67a1c3e 100644
--- a/charts/birdnet-go/templates/services/rtsp-server.yaml
+++ b/charts/birdnet-go/templates/services/rtsp-server.yaml
@@ -10,7 +10,7 @@ metadata:
 spec:
   type: ClusterIP
   selector:
-    app: {{ template "birdnet-go.name" . }}
+    app: {{ template "birdnet-go.name" . }}-rtsp-server
   ports:
     - name: rtsp
       protocol: TCP