diff --git a/osm-seed/templates/letsencrypt-issuer.yaml b/osm-seed/templates/letsencrypt-issuer.yaml
index 7f73166f..8514fc4d 100644
--- a/osm-seed/templates/letsencrypt-issuer.yaml
+++ b/osm-seed/templates/letsencrypt-issuer.yaml
@@ -2,7 +2,7 @@
 apiVersion: cert-manager.io/v1
 kind: ClusterIssuer
 metadata:
-    name: letsencrypt-prod-issuer
+    name: {{ template ".Release.Name" . }}-letsencrypt-prod-issuer
 spec:
     acme:
         # You must replace this email address with your own.
diff --git a/osm-seed/templates/nominatim-api/nominatim-api-ingress.yaml b/osm-seed/templates/nominatim-api/nominatim-api-ingress.yaml
index f6ca8f60..2424316c 100644
--- a/osm-seed/templates/nominatim-api/nominatim-api-ingress.yaml
+++ b/osm-seed/templates/nominatim-api/nominatim-api-ingress.yaml
@@ -5,8 +5,7 @@ metadata:
   name: {{ template "osm-seed.fullname" . }}-ingress-nominatim-api
   annotations:
     kubernetes.io/ingress.class: nginx
-    cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
-spec:
+    cert-manager.io/cluster-issuer: {{ template ".Release.Name" . }}-letsencrypt-prod-issuer
   tls:
     - hosts:
       - nominatim.{{ .Values.domain }}
diff --git a/osm-seed/templates/overpass-api/overpass-api-ingress.yaml b/osm-seed/templates/overpass-api/overpass-api-ingress.yaml
index 8ca0e8c1..b7311fff 100644
--- a/osm-seed/templates/overpass-api/overpass-api-ingress.yaml
+++ b/osm-seed/templates/overpass-api/overpass-api-ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "osm-seed.fullname" . }}-ingress-overpass-api
   annotations:
     kubernetes.io/ingress.class: nginx
-    cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
+    cert-manager.io/cluster-issuer: {{ template ".Release.Name" . }}-letsencrypt-prod-issuer
 spec:
   tls:
     - hosts:
diff --git a/osm-seed/templates/taginfo/taginfo-ingress.yaml b/osm-seed/templates/taginfo/taginfo-ingress.yaml
index 5db7bce5..ef3f9125 100644
--- a/osm-seed/templates/taginfo/taginfo-ingress.yaml
+++ b/osm-seed/templates/taginfo/taginfo-ingress.yaml
@@ -5,8 +5,7 @@ metadata:
   name: {{ template "osm-seed.fullname" . }}-ingress-taginfo-api
   annotations:
     kubernetes.io/ingress.class: nginx
-    cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
-spec:
+    cert-manager.io/cluster-issuer: {{ template ".Release.Name" . }}-letsencrypt-prod-issuer
   tls:
     - hosts:
       - taginfo.{{ .Values.domain }}
diff --git a/osm-seed/templates/tasking-manager-api/tasking-manager-api-ingress.yaml b/osm-seed/templates/tasking-manager-api/tasking-manager-api-ingress.yaml
index 45771c75..166820a7 100644
--- a/osm-seed/templates/tasking-manager-api/tasking-manager-api-ingress.yaml
+++ b/osm-seed/templates/tasking-manager-api/tasking-manager-api-ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "osm-seed.fullname" . }}-ingress-tm-api
   annotations:
     kubernetes.io/ingress.class: nginx
-    cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
+    cert-manager.io/cluster-issuer: {{ template ".Release.Name" . }}-letsencrypt-prod-issuer
 spec:
   tls:
     - hosts:
diff --git a/osm-seed/templates/tiler-server/tiler-server-ingress.yaml b/osm-seed/templates/tiler-server/tiler-server-ingress.yaml
index d89042f0..0fb0a7f3 100644
--- a/osm-seed/templates/tiler-server/tiler-server-ingress.yaml
+++ b/osm-seed/templates/tiler-server/tiler-server-ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "osm-seed.fullname" . }}-ingress-tiler-server
   annotations:
     kubernetes.io/ingress.class: nginx
-    cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
+    cert-manager.io/cluster-issuer: {{ template ".Release.Name" . }}-letsencrypt-prod-issuer
 spec:
   tls:
     - hosts:
diff --git a/osm-seed/templates/tiler-visor/tiler-visor-ingress.yaml b/osm-seed/templates/tiler-visor/tiler-visor-ingress.yaml
index 836ca7da..547b1496 100644
--- a/osm-seed/templates/tiler-visor/tiler-visor-ingress.yaml
+++ b/osm-seed/templates/tiler-visor/tiler-visor-ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "osm-seed.fullname" . }}-ingress-tiler-visor
   annotations:
     kubernetes.io/ingress.class: nginx
-    cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
+    cert-manager.io/cluster-issuer: {{ template ".Release.Name" . }}-letsencrypt-prod-issuer
 spec:
   tls:
     - hosts:
diff --git a/osm-seed/templates/web/web-ingress.yaml b/osm-seed/templates/web/web-ingress.yaml
index 4df537c9..85334c70 100644
--- a/osm-seed/templates/web/web-ingress.yaml
+++ b/osm-seed/templates/web/web-ingress.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ template "osm-seed.fullname" . }}-ingress-web
   annotations:
     kubernetes.io/ingress.class: nginx
-    cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
+    cert-manager.io/cluster-issuer: {{ template ".Release.Name" . }}-letsencrypt-prod-issuer
 spec:
   tls:
     - hosts: