diff --git a/kubernetes/helm/openslice/templates/kroki-ingress.yaml b/kubernetes/helm/openslice/templates/kroki-ingress.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..5127bdb12296565a01db48edf23d8da25c270674
--- /dev/null
+++ b/kubernetes/helm/openslice/templates/kroki-ingress.yaml
@@ -0,0 +1,23 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app: {{ include "openslice.fullname" . }}
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
+    {{- include "openslice.labels" . | nindent 4 }}
+  annotations:
+    nginx.ingress.kubernetes.io/rewrite-target: "/$1"
+  name: {{ include "openslice.fullname" . }}-kroki-ingress
+spec:
+  ingressClassName: nginx
+  rules:
+    - http:
+        paths:
+          - pathType: ImplementationSpecific
+            path: "/kroki/(.*)"
+            backend:
+              service:
+                name: {{ include "openslice.fullname" . }}-kroki
+                port:
+                  number: 8000
diff --git a/kubernetes/helm/openslice/templates/kroki.yaml b/kubernetes/helm/openslice/templates/kroki.yaml
index 3139d11f6a3c164693ec045c753586ec917ad651..5b34ae58df9ab87f202e7753f91e6423dc0beef3 100644
--- a/kubernetes/helm/openslice/templates/kroki.yaml
+++ b/kubernetes/helm/openslice/templates/kroki.yaml
@@ -32,7 +32,7 @@ spec:
             {{- toYaml .Values.resources | nindent 12 }}
           env:
             - name: KROKI_BLOCKDIAG_HOST
-              value: "blockdiag"
+              value: {{ include "openslice.fullname" . }}-blockdiag
           ports:
             - containerPort: 8000
       restartPolicy: Always
diff --git a/kubernetes/helm/openslice/templates/openslice-ingress.yaml b/kubernetes/helm/openslice/templates/openslice-ingress.yaml
index a2c4b575a06fd55db1ad7e31cc047e1dd5c20c39..a5f731485acad1a42297e77910cf176a152cc576 100644
--- a/kubernetes/helm/openslice/templates/openslice-ingress.yaml
+++ b/kubernetes/helm/openslice/templates/openslice-ingress.yaml
@@ -1,6 +1,6 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
-metadata:  
+metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     app: {{ include "openslice.fullname" . }}
@@ -12,15 +12,17 @@ metadata:
 spec:
   ingressClassName: nginx
   rules:
-  - http:
-      paths:
-      {{- $root := . }} # Preserve the root context
-      {{- range .Values.ingress.paths }}
-      - pathType: Prefix
-        path: "{{ .path }}"
-        backend:
-          service:
-            name: {{ include "openslice.fullname" $root }}-{{ .service }}
-            port:
-              number: {{ .port }}
-      {{- end }}
+    - http:
+        paths:
+          {{- $root := . }} # Preserve the root context
+          {{- range .Values.ingress.paths }}
+          {{- if ne .path "/kroki/(.*)" }}
+          - pathType: ImplementationSpecific
+            path: "{{ .path }}"
+            backend:
+              service:
+                name: {{ include "openslice.fullname" $root }}-{{ .service }}
+                port:
+                  number: {{ .port }}
+          {{- end }}
+          {{- end }}
diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml
index 76e3296cc123fc183c92b1399b71209ac62d9a21..59e39e5b9701b38fe5fe6445b9ff4ad0caa94d18 100644
--- a/kubernetes/helm/openslice/values.yaml
+++ b/kubernetes/helm/openslice/values.yaml
@@ -185,6 +185,9 @@ ingress:
   - path: "/auth"
     service: "keycloak"
     port: 8080
+  - path: "/kroki/(.*)"
+    service: "kroki"
+    port: 8000
   - path: "/osapi"
     service: "osportalapi"
     port: 13000