diff --git a/light-graphql-4j/src/main/resources/templates/graphql/handlerYml.rocker.raw b/light-graphql-4j/src/main/resources/templates/graphql/handlerYml.rocker.raw
index 28a475dac..fe9b97464 100644
--- a/light-graphql-4j/src/main/resources/templates/graphql/handlerYml.rocker.raw
+++ b/light-graphql-4j/src/main/resources/templates/graphql/handlerYml.rocker.raw
@@ -77,7 +77,7 @@ paths:
       - default
       - options
 
-@if(healthCheck){  - path: '/health/@serviceId'
+@if(healthCheck){  - path: '/health/${server.serviceId:@serviceId}'
     method: 'get'
     exec:
       - health
diff --git a/light-rest-4j/src/main/resources/templates/rest/openapi/handlerYml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/openapi/handlerYml.rocker.raw
index 7e9dc5b75..04c7194d1 100644
--- a/light-rest-4j/src/main/resources/templates/rest/openapi/handlerYml.rocker.raw
+++ b/light-rest-4j/src/main/resources/templates/rest/openapi/handlerYml.rocker.raw
@@ -89,7 +89,7 @@ paths:
       - default
       - @with (p = handlerPackage + ".") {@p}@item.get("handlerName")
 }
-@if(healthCheck){  - path: '/health/@serviceId'
+@if(healthCheck){  - path: '/health/${server.serviceId:@serviceId}'
     method: 'get'
     exec:
       - health
diff --git a/light-rest-4j/src/main/resources/templates/rest/swagger/handlerYml.rocker.raw b/light-rest-4j/src/main/resources/templates/rest/swagger/handlerYml.rocker.raw
index c030cbbce..2e125013f 100644
--- a/light-rest-4j/src/main/resources/templates/rest/swagger/handlerYml.rocker.raw
+++ b/light-rest-4j/src/main/resources/templates/rest/swagger/handlerYml.rocker.raw
@@ -78,7 +78,7 @@ paths:
       - default
       - @with (p = handlerPackage + ".") {@p}@item.get("handlerName")
 }
-@if(healthCheck){  - path: '/health/@serviceId'
+@if(healthCheck){  - path: '/health/${server.serviceId:@serviceId}'
     method: 'get'
     exec:
       - health
diff --git a/light-rest-4j/src/main/resources/templates/restkotlin/openapi/handlerYml.rocker.raw b/light-rest-4j/src/main/resources/templates/restkotlin/openapi/handlerYml.rocker.raw
index 45b374991..b1cc73bf0 100644
--- a/light-rest-4j/src/main/resources/templates/restkotlin/openapi/handlerYml.rocker.raw
+++ b/light-rest-4j/src/main/resources/templates/restkotlin/openapi/handlerYml.rocker.raw
@@ -80,7 +80,7 @@ paths:
       - default
       - @with (p = handlerPackage + ".") {@p}@item.get("handlerName")
 }
-@if(healthCheck){  - path: '/health/@serviceId'
+@if(healthCheck){  - path: '/health/${server.serviceId:@serviceId}'
     method: 'get'
     exec:
       - health