diff --git a/docker-compose.yaml b/docker-compose.yaml
index f53cde4..1a93418 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -5,12 +5,13 @@ services:
     build: .
     container_name: admin-backend
     ports:
-      - "8082:8080"
+      - "${SERVER_PORT:-8082}:${SERVER_PORT:-8082}"
     environment:
       SPRING_PROFILES_ACTIVE: prod
       POSTGRES_HOST: db
       POSTGRES_PORT: 5454
       POSTGRES_DB: admin_db
+      SERVER_PORT: ${SERVER_PORT:-8082}
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     networks:
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index e4e365d..0f00301 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -3,16 +3,20 @@ spring:
         compatibility-verifier:
             enabled: false
     datasource:
-        url: jdbc:postgresql://${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}
-        username: ${POSTGRES_USER}
-        password: ${POSTGRES_PASSWORD}
+        url: jdbc:postgresql://${POSTGRES_HOST:db}:${POSTGRES_PORT:5454}/${POSTGRES_DB:admin_db}
+        username: ${POSTGRES_USER:admin}
+        password: ${POSTGRES_PASSWORD:adminDbApp}
 
     jpa:
         hibernate:
             ddl-auto: update
+        properties:
+            hibernate:
+                dialect: org.hibernate.dialect.PostgreSQLDialect
+                format_sql: true
 
 server:
-    port: 8082
+    port: ${SERVER_PORT:8082}
 
 jwt:
     secret: Z29nb3Bvd2VycmFuZ2VydHVtYmF5YW1iZjMyNDIyMjh3aW5lcndpbmVy