diff --git a/application-engine/src/main/resources/application-old-dev.properties b/application-engine/src/main/resources/application-old-dev.properties
index 7f749349c7..cb334ce57d 100644
--- a/application-engine/src/main/resources/application-old-dev.properties
+++ b/application-engine/src/main/resources/application-old-dev.properties
@@ -25,7 +25,7 @@ nae.storage.clean=true
 
 nae.admin.password=password
 springdoc.swagger-ui.enabled=true
-nae.security.server-patterns=/api/auth/signup,/api/auth/token/verify,/api/auth/reset,/api/auth/recover,/v3/api-docs,/v3/api-docs/**,/swagger-ui.html,/swagger-ui/**,/api/public/**,/manage/**
+nae.security.server-patterns=/api/auth/signup,/api/auth/token/verify,/api/auth/reset,/api/auth/recover,/v3/api-docs,/v3/api-docs/**,/swagger-ui.html,/swagger-ui/**,/api/public/**,/manage/health
 
 logging.level.org.springframework.data.elasticsearch.core=info
 logging.level.com.netgrif.application.engine.elastic.service=info
@@ -43,6 +43,7 @@ nae.cache.petriNetCache=petriNetCache
 # Actuator
 management.health.ldap.enabled=false
 management.health.mail.enabled=false
+management.endpoint.shutdown.enabled=false
 
 #logging.level.root=debug
 
@@ -50,4 +51,4 @@ management.health.mail.enabled=false
 netgrif.engine.storage.minio.enabled=true
 nae.storage.minio.hosts.host_1.host=http://127.0.0.1:9000
 nae.storage.minio.hosts.host_1.user=root
-nae.storage.minio.hosts.host_1.password=password
\ No newline at end of file
+nae.storage.minio.hosts.host_1.password=password
diff --git a/application-engine/src/main/resources/application-old.properties b/application-engine/src/main/resources/application-old.properties
index d7b4f6662c..63efcfc252 100644
--- a/application-engine/src/main/resources/application-old.properties
+++ b/application-engine/src/main/resources/application-old.properties
@@ -88,8 +88,8 @@ nae.security.limits.email-block-time-type=DAYS
 nae.security.jwt.expiration=900000
 nae.security.jwt.algorithm=RSA
 nae.security.jwt.private-key=file:src/main/resources/certificates/private.der
-nae.security.server-patterns=/api/auth/signup,/api/auth/token/verify,/api/auth/reset,/api/auth/recover,/api/public/**,/v3/api-docs/public,/manage/**
-nae.security.anonymous-exceptions=/api/auth/signup,/api/auth/token/verify,/api/auth/reset,/api/auth/recover,/manage/**
+nae.security.server-patterns=/api/auth/signup,/api/auth/token/verify,/api/auth/reset,/api/auth/recover,/api/public/**,/v3/api-docs/public,/manage/health
+nae.security.anonymous-exceptions=/api/auth/signup,/api/auth/token/verify,/api/auth/reset,/api/auth/recover,/manage/health
 springdoc.swagger-ui.enabled=false
 
 # Quartz (this config overwrites quartz.properties resource file)
@@ -180,8 +180,8 @@ netgrif.engine.storage.minio.enabled=false
 # Actuator
 management.endpoints.web.base-path=/manage
 management.endpoints.web.path-mapping.prometheus=metric
-management.endpoints.web.exposure.exclude=shutdown
-management.endpoints.web.exposure.include=*
+management.endpoints.web.exposure.include=health,info,metrics,prometheus,beans,env,threaddump,loggers,logfile,logfiles,caches,conditions,configprops,mappings,scheduledtasks,httpexchanges,startup,nodeinfo,elasticnodes,netgriftracing
+management.endpoint.shutdown.enabled=false
 management.endpoint.status.up-statuses=paused,maintenance,running
 management.endpoint.loggers.enabled=true
 management.endpoint.health.show-details=when_authorized
diff --git a/application-engine/src/main/resources/application.yaml b/application-engine/src/main/resources/application.yaml
index 30df7a68c5..545d60b497 100644
--- a/application-engine/src/main/resources/application.yaml
+++ b/application-engine/src/main/resources/application.yaml
@@ -121,8 +121,12 @@ netgrif:
         web:
           base-path: /manage
           exposure:
-            include: "health,info,metrics,loggers,env,beans,threaddump,heapdump,mappings,conditions,configprops,scheduledtasks,caches,flyway,liquibase,prometheus"
+            include: "health,info,metrics,prometheus,beans,env,threaddump,heapdump,loggers,logfile,logfiles,caches,conditions,configprops,mappings,scheduledtasks,httpexchanges,startup,nodeinfo,elasticnodes,netgriftracing"
       endpoint:
+        shutdown:
+          enabled: false
+        heapdump:
+          access: unrestricted
         health:
           show-details: when_authorized
           show-components: when_authorized
diff --git a/application-engine/src/test/resources/application-test.yaml b/application-engine/src/test/resources/application-test.yaml
index 7bca9e86cb..a67af46bdc 100644
--- a/application-engine/src/test/resources/application-test.yaml
+++ b/application-engine/src/test/resources/application-test.yaml
@@ -32,7 +32,7 @@ netgrif:
     server:
       port: 0
     security:
-      server-patterns: /api/auth/signup,/api/auth/token/verify,/api/auth/reset,/api/auth/recover,/v3/api-docs,/v3/api-docs/**,/swagger-ui.html,/swagger-ui/**,/api/public/**,/manage/**
+      server-patterns: /api/auth/signup,/api/auth/token/verify,/api/auth/reset,/api/auth/recover,/v3/api-docs,/v3/api-docs/**,/swagger-ui.html,/swagger-ui/**,/api/public/**,/manage/health
       limits:
         login-attempts: 3
         login-timeout: 3
diff --git a/docker-compose.yml b/docker-compose.yml
index 382b9b7f06..04d9110c94 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,8 @@ services:
 #      NETGRIF_WORKER_NODE_NODE_TYPE: ENGINE_ROOT
 #      netgrif.engine.data.redis.namespace: netgrif
 #      netgrif.engine.logging.file.path: log
-#      netgrif.engine.management.endpoints.web.exposure.include: "*"
+#      netgrif.engine.management.endpoints.web.exposure.include: "health,info,metrics,prometheus,beans,env,threaddump,loggers,logfile,logfiles,caches,conditions,configprops,mappings,scheduledtasks,httpexchanges,startup,nodeinfo,elasticnodes,netgriftracing"
+#      netgrif.engine.management.endpoint.shutdown.enabled: 'false'
 #      netgrif.engine.management.health.ldap.enabled: 'false'
 #      netgrif.engine.main.allow-bean-definition-overriding: 'true'
 #      netgrif.engine.management.health.mail.enabled: 'false'
@@ -27,8 +28,8 @@ services:
 #      netgrif.engine.management.endpoint.health.show-details: always
 #      netgrif.engine.management.metrics.export.simple: enabled
 #      netgrif.engine.management.endpoints.web.base-path: /manage
-#      netgrif.engine.security.server-patterns: /api/auth/signup,/api/auth/token/verify,/api/auth/reset,/api/auth/recover,/v3/api-docs,/v3/api-docs/**,/swagger-ui.html,/swagger-ui/**,/api/public/**,/manage/**
-#      netgrif.engine.security.anonymous-exceptions: /api/auth/signup,/api/auth/token/verify,/api/auth/reset,/api/auth/recover,/manage/**
+#      netgrif.engine.security.server-patterns: /api/auth/signup,/api/auth/token/verify,/api/auth/reset,/api/auth/recover,/v3/api-docs,/v3/api-docs/**,/swagger-ui.html,/swagger-ui/**,/api/public/**,/manage/health
+#      netgrif.engine.security.anonymous-exceptions: /api/auth/signup,/api/auth/token/verify,/api/auth/reset,/api/auth/recover,/manage/health
 #    depends_on:
 #      nae-mongodb:
 #        condition: service_started