diff --git a/deploy/certs/postgres-svc/client.cert b/deploy/certs/postgres-db/client.cert
similarity index 100%
rename from deploy/certs/postgres-svc/client.cert
rename to deploy/certs/postgres-db/client.cert
diff --git a/deploy/certs/postgres-svc/client.key b/deploy/certs/postgres-db/client.key
similarity index 100%
rename from deploy/certs/postgres-svc/client.key
rename to deploy/certs/postgres-db/client.key
diff --git a/deploy/certs/postgres-svc/server.cert b/deploy/certs/postgres-db/server.cert
similarity index 100%
rename from deploy/certs/postgres-svc/server.cert
rename to deploy/certs/postgres-db/server.cert
diff --git a/deploy/certs/postgres-svc/server.key b/deploy/certs/postgres-db/server.key
similarity index 100%
rename from deploy/certs/postgres-svc/server.key
rename to deploy/certs/postgres-db/server.key
diff --git a/deploy/egommerce-stack.dev.yml b/deploy/egommerce-stack.dev.yml
index 87fc988..9d38357 100644
--- a/deploy/egommerce-stack.dev.yml
+++ b/deploy/egommerce-stack.dev.yml
@@ -4,9 +4,9 @@ services:
   # INFRASTRUCTURE SERVICES
   api-gateway:
     image: git.pbiernat.dev/egommerce/api-gateway:dev
-    hostname: gw.egommerce.local
+    hostname: gw.egommerce.pbiernat.dev
     environment:
-      - APP_DOMAIN=gw.egommerce.local
+      - APP_DOMAIN=gw.egommerce.pbiernat.dev
     # ports:
     #   - '8443:443'
     #   - '8888:8080'
@@ -15,9 +15,9 @@ services:
 
   api-registry:
     image: git.pbiernat.dev/egommerce/api-registry:dev
-    hostname: registry.egommerce.local
+    hostname: registry.egommerce.pbiernat.dev
     environment:
-      - APP_DOMAIN=registry.egommerce.local
+      - APP_DOMAIN=registry.egommerce.pbiernat.dev
     # ports:
     #   - '8500:8500'
     #   - '8600:8600'
@@ -25,9 +25,9 @@ services:
 
   api-eventbus:
     image: git.pbiernat.dev/egommerce/api-eventbus:dev
-    hostname: eventbus.egommerce.local
+    hostname: eventbus.egommerce.pbiernat.dev
     environment:
-      - APP_DOMAIN=eventbus.egommerce.local
+      - APP_DOMAIN=eventbus.egommerce.pbiernat.dev
       - RABBITMQ_NODENAME=api-eventbus
       # - RABBITMQ_DEFAULT_USER = admin
       # - RABBITMQ_DEFAULT_PASS = passw123
@@ -37,16 +37,16 @@ services:
 
   api-logger:
     image: git.pbiernat.dev/egommerce/api-logger:dev
-    hostname: logger.egommerce.local
+    hostname: logger.egommerce.pbiernat.dev
     environment:
-      - APP_DOMAIN=logger.egommerce.local
+      - APP_DOMAIN=logger.egommerce.pbiernat.dev
     # ports:
     #   - 24224:24224
 
   postgres-db:
-    hostname: db.egommerce.local
+    hostname: db.egommerce.pbiernat.dev
     environment:
-      - APP_DOMAIN=db.egommerce.local
+      - APP_DOMAIN=db.egommerce.pbiernat.dev
       - POSTGRES_PASSWORD=12345678
     # ports:
     #   - '5432:5432'
@@ -54,9 +54,9 @@ services:
     #   - ./certs/postgres-db:/certs
 
   mongo-db:
-    hostname: mongodb.egommerce.local
+    hostname: mongodb.egommerce.pbiernat.dev
     environment:
-      - APP_DOMAIN=mongodb.egommerce.local
+      - APP_DOMAIN=mongodb.egommerce.pbiernat.dev
       - MONGO_INITDB_ROOT_PASSWORD=12345678
     # ports:
     #   - '27017:27017'
@@ -67,40 +67,40 @@ services:
   identity-svc:
     image: git.pbiernat.dev/egommerce/identity-svc:dev
     environment:
-      - APP_DOMAIN=identity.api.egommerce.local
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.local:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672
+      - APP_DOMAIN=identity.api.egommerce.pbiernat.dev
+      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
+      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
     volumes:
       - ./certs/identity-svc:/certs
 
   basket-svc:
     image: git.pbiernat.dev/egommerce/basket-svc:dev
     environment:
-      - APP_DOMAIN=basket.api.egommerce.local
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.local:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672
+      - APP_DOMAIN=basket.api.egommerce.pbiernat.dev
+      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
+      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
     volumes:
       - ./certs/basket-svc:/certs
 
   catalog-svc:
     image: git.pbiernat.dev/egommerce/catalog-svc:dev
     environment:
-      - APP_DOMAIN=catalog.api.egommerce.local
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.local:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672
+      - APP_DOMAIN=catalog.api.egommerce.pbiernat.dev
+      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
+      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
     volumes:
       - ./certs/catalog-svc:/certs
 
   order-svc:
     image: git.pbiernat.dev/egommerce/order-svc:dev
     environment:
-      - APP_DOMAIN=order.api.egommerce.local
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.local:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672
+      - APP_DOMAIN=order.api.egommerce.pbiernat.dev
+      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
+      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
     volumes:
       - ./certs/order-svc:/certs
 
@@ -110,24 +110,24 @@ services:
     deploy:
       replicas: 2
     environment:
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.local:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672
+      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
+      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
 
   catalog-worker:
     image: git.pbiernat.dev/egommerce/catalog-worker:dev
     deploy:
       replicas: 2
     environment:
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.local:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672
+      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
+      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672
 
   order-worker:
     image: git.pbiernat.dev/egommerce/order-worker:dev
     deploy:
       replicas: 2
     environment:
-      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.local:5432/egommerce
-      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.local:27017
-      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.local:5672
+      - DATABASE_URL=postgres://postgres:12345678@db.egommerce.pbiernat.dev:5432/egommerce
+      - MONGODB_URL=mongodb://mongodb:12345678@mongodb.egommerce.pbiernat.dev:27017
+      - EVENTBUS_URL=amqp://guest:guest@eventbus.egommerce.pbiernat.dev:5672