diff --git a/generators/server/templates/src/main/resources/config/application.yml.ejs b/generators/server/templates/src/main/resources/config/application.yml.ejs
index e154e00b489..df88014e052 100644
--- a/generators/server/templates/src/main/resources/config/application.yml.ejs
+++ b/generators/server/templates/src/main/resources/config/application.yml.ejs
@@ -56,6 +56,7 @@ eureka:
       git-version: ${git.commit.id.describe:}
       git-commit: ${git.commit.id.abbrev:}
       git-branch: ${git.branch:}
+      context-path: ${server.servlet.context-path:}
 <%_ } _%>
 <%_ if (applicationType === 'gateway') { _%>
 
@@ -330,7 +331,8 @@ jhipster:
   mail:
     from: <%= baseName %>@localhost
   api-docs:
-    default-include-pattern: /api/.*
+    default-include-pattern: ${server.servlet.context-path:}/api/.*
+    management-include-pattern: ${server.servlet.context-path:}/management/.*
     title: <%= baseName %> API
     description: <%= baseName %> API documentation
     version: 0.0.1
diff --git a/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs b/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs
index d0548acda9f..d7b7c825aab 100644
--- a/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs
+++ b/generators/server/templates/src/main/resources/config/bootstrap.yml.ejs
@@ -45,6 +45,8 @@ spring:
           - git-version=${git.commit.id.describe:}
           - git-commit=${git.commit.id.abbrev:}
           - git-branch=${git.branch:}
+          - context-path=${server.servlet.context-path:}
+
       host: localhost
       port: 8500
     <%_ } _%>