diff --git a/.app.config b/.app.config
index f6bcaa7..d3f058c 100644
--- a/.app.config
+++ b/.app.config
@@ -9,6 +9,8 @@
 	},
 	"Check": {
 		"TCP": "__IP__:443",
+		"Interval": "5s",
+		"Timeout": "1s",
 		"DeregisterCriticalServiceAfter": "10s"
 	}
 }
\ No newline at end of file
diff --git a/.env.dist b/.env.dist
index a0d58bf..c78c02f 100644
--- a/.env.dist
+++ b/.env.dist
@@ -7,7 +7,7 @@ APP_PATH_PREFIX=/identity
 APP_KV_NAMESPACE=dev.egommerce/service/identity-svc
 
 LOGGER_ADDR=api-logger:24224
-REGISTRY_ADDR=api-registry:8500
+REGISTRY_ADDR=api-registry:8501
 DATABASE_URL=postgres://postgres:12345678@postgres-db:5432/egommerce
 CACHE_ADDR=api-cache:6379
 CACHE_PASSWORD=12345678
diff --git a/bin/entrypoint.sh b/bin/entrypoint.sh
index 276fa32..7201635 100755
--- a/bin/entrypoint.sh
+++ b/bin/entrypoint.sh
@@ -17,8 +17,11 @@ waitForService()
 update-resolv # provided by stack - better approach - single copy
 update-ca-certificates
 
-waitForService "postgres-db:5432"
+waitForService "api-registry:8501"
 waitForService "api-logger:24224"
+waitForService "db-postgres:5432"
+
+register-service
 
 # run migrations
 migrate.sh
diff --git a/src/cmd/health/main.go b/src/cmd/health/main.go
index c27f125..4c4420e 100644
--- a/src/cmd/health/main.go
+++ b/src/cmd/health/main.go
@@ -29,7 +29,7 @@ func main() {
 }
 
 func healthCheck() bool {
-	run, err := os.Open("/app.run")
+	run, err := os.Open("./app.run")
 	if err != nil {
 		return false
 	}
diff --git a/src/cmd/server/main.go b/src/cmd/server/main.go
index 0eca564..55fc5ac 100644
--- a/src/cmd/server/main.go
+++ b/src/cmd/server/main.go
@@ -25,7 +25,7 @@ func main() {
 	a.RegisterPlugin(app.CachePlugin(cArr))
 	a.RegisterPlugin(app.DatabasePlugin(cArr))
 	// a.RegisterPlugin(app.EventbusPlugin(cArr))
-	a.RegisterPlugin(app.RegistryPlugin(cArr))
+	// a.RegisterPlugin(app.RegistryPlugin(cArr))
 
 	while := make(chan struct{})
 	err := a.Start(while)
diff --git a/src/go.mod b/src/go.mod
index 3bb9ad4..b171829 100644
--- a/src/go.mod
+++ b/src/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	git.pbiernat.io/egommerce/api-entities v0.2.3
-	git.pbiernat.io/egommerce/go-api-pkg v0.3.18
+	git.pbiernat.io/egommerce/go-api-pkg v0.3.24
 	github.com/go-pg/migrations/v8 v8.1.0
 	github.com/go-pg/pg/v10 v10.11.1
 	github.com/go-redis/redis/v8 v8.11.5
diff --git a/src/go.sum b/src/go.sum
index a3cf771..14121b5 100644
--- a/src/go.sum
+++ b/src/go.sum
@@ -7,8 +7,8 @@ cloud.google.com/go/iam v1.1.1 h1:lW7fzj15aVIXYHREOqjRBV9PsH0Z6u8Y46a1YGvQP4Y=
 cloud.google.com/go/iam v1.1.1/go.mod h1:A5avdyVL2tCppe4unb0951eI9jreack+RJ0/d+KUZOU=
 git.pbiernat.io/egommerce/api-entities v0.2.3 h1:mR6EYfZkAzh4teydb7KXDBWoxwVW3qasnmmH5J3mnas=
 git.pbiernat.io/egommerce/api-entities v0.2.3/go.mod h1:INXAG5x4+i+vNwg1NpfPHiDW8nY1kn1K7pgLOtX+/I0=
-git.pbiernat.io/egommerce/go-api-pkg v0.3.18 h1:0+C9BMsllrNvRbh4kb7dJ5lrzP1Lc7J4pb+KV76YrXk=
-git.pbiernat.io/egommerce/go-api-pkg v0.3.18/go.mod h1:XIy2mmvRNIzQmYIUAcDZafhRPxTQFS2HDmsK7ZQ6980=
+git.pbiernat.io/egommerce/go-api-pkg v0.3.24 h1:if6xsFOStckWdGm7kcgKWOhOGOe6iIBOOr+3DjgX5tM=
+git.pbiernat.io/egommerce/go-api-pkg v0.3.24/go.mod h1:XIy2mmvRNIzQmYIUAcDZafhRPxTQFS2HDmsK7ZQ6980=
 github.com/Azure/azure-sdk-for-go v68.0.0+incompatible h1:fcYLmCpyNYRnvJbPerq7U0hS+6+I79yEDJBqVNcqUzU=
 github.com/Azure/go-autorest v14.2.0+incompatible h1:V5VMDjClD3GiElqLWO7mz2MxNAK/vTfRHdAubSIPRgs=
 github.com/Azure/go-autorest/autorest v0.11.28 h1:ndAExarwr5Y+GaHE6VCaY1kyS/HwwGGyuimVhWsHOEM=
diff --git a/src/internal/server/config.go b/src/internal/server/config.go
index 425923b..ddf453e 100644
--- a/src/internal/server/config.go
+++ b/src/internal/server/config.go
@@ -21,7 +21,7 @@ const (
 	defNetAddr          = ":443"
 	defMongoDbURL       = "mongodb://mongodb:12345678@mongo-db:27017"
 	defPathPrefix       = "/identity"
-	defRegistryAddr     = "api-registry:8500"
+	defRegistryAddr     = "api-registry:8501"
 	defEbEventsExchange = "api-events"
 	defEbEventsQueue    = "identity-svc"
 )
diff --git a/src/internal/server/middleware.go b/src/internal/server/middleware.go
index 61ad4d7..afa92ca 100644
--- a/src/internal/server/middleware.go
+++ b/src/internal/server/middleware.go
@@ -1,8 +1,6 @@
 package server
 
 import (
-	"strings"
-
 	"github.com/gofiber/fiber/v2"
 
 	"git.pbiernat.io/egommerce/go-api-pkg/fluentd"
@@ -18,10 +16,10 @@ func SetupMiddleware(s *Server) {
 
 func LoggingMiddleware(log *fluentd.Logger) func(c *fiber.Ctx) error {
 	return func(c *fiber.Ctx) error {
-		path := string(c.Request().URI().Path())
-		if strings.Contains(path, "/health") {
-			return c.Next()
-		}
+		// path := string(c.Request().URI().Path())
+		// if strings.Contains(path, "/health") {
+		// 	return c.Next()
+		// }
 
 		log.Log("Request: %s, remote: %s, via: %s",
 			c.Request().URI().String(),
diff --git a/src/internal/server/server.go b/src/internal/server/server.go
index da37813..7d6550c 100644
--- a/src/internal/server/server.go
+++ b/src/internal/server/server.go
@@ -68,7 +68,7 @@ func (s *Server) RegisterHandler(name string, fn func() any) {
 func (s *Server) OnShutdown() {
 	// s.GetLogger().Log("Server %s is going down...", s.ID)
 
-	s.GetRegistry().Unregister()
+	// s.GetRegistry().Unregister()
 	// a.clearMetadataCache()
 	// s.GetEventBus().Close()
 	s.GetDatabase().Close()