diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 6f9f6a6..f75fe1b 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -5,12 +5,13 @@ services:
       dockerfile: ../docker/Dockerfile.backend
     container_name: bamort-backend
     ports:
-      - "8180:8180"
+      - "8182:8180"
     environment:
       - GO_ENV=production
       - CGO_ENABLED=1
       - DATABASE_TYPE=${DATABASE_TYPE:-mysql}
-      - DATABASE_URL=${DATABASE_URL:-bamort:${MARIADB_PASSWORD:-secure_user_password}@tcp(mariadb:3306)/bamort?charset=utf8mb4&parseTime=True&loc=Local}
+      - DATABASE_URL=${MARIADB_USER:-bamort}:${MARIADB_PASSWORD:-secure_user_password}@tcp(mariadb:3306)/${MARIADB_DATABASE:-bamort}?charset=utf8mb4&parseTime=True&loc=Local
+      - BASE_URL=${BASE_URL:-https://bamort.trokan.de}
       - API_PORT=${API_PORT:-8180}
     depends_on:
       mariadb:
@@ -25,9 +26,9 @@ services:
       context: ../frontend
       dockerfile: ../docker/Dockerfile.frontend
       args:
-        VITE_API_URL: ${API_URL:-https://bamort.trokan.de:8180}
+        VITE_API_URL: ${API_URL:-https://bamort-api.trokan.de}
         VITE_BASE_URL: ${BASE_URL:-https://bamort.trokan.de}
-        VITE_API_PORT: ${API_PORT:-8180}
+        VITE_API_PORT: ${API_PORT:-443}
     container_name: bamort-frontend
     ports:
       - "8181:80"
@@ -82,4 +83,4 @@ services:
   #       condition: service_healthy
 
 #volumes:
-#  db_data:
\ No newline at end of file
+#  db_data:
diff --git a/frontend/src/utils/api.js b/frontend/src/utils/api.js
index 37d32f2..d75f838 100644
--- a/frontend/src/utils/api.js
+++ b/frontend/src/utils/api.js
@@ -1,7 +1,7 @@
 import axios from 'axios'
 
 const API = axios.create({
-  baseURL: import.meta.env.VITE_API_URL || 'https://bamort.trokan.de:8180', // Use env variable with fallback
+  baseURL: import.meta.env.VITE_API_URL || 'https://bamort-api.trokan.de', // Use env variable with fallback
 })
 
 // Request interceptor to add auth token