diff --git a/backend/config/config.go b/backend/config/config.go
index f593f7f..7d51994 100644
--- a/backend/config/config.go
+++ b/backend/config/config.go
@@ -68,7 +68,7 @@ func LoadConfig() *Config {
 	fmt.Printf("DEBUG LoadConfig - DATABASE_TYPE aus ENV: '%s'\n", os.Getenv("DATABASE_TYPE"))
 
 	// Server Port
-	if port := os.Getenv("PORT"); port != "" {
+	if port := os.Getenv("API_PORT"); port != "" {
 		config.ServerPort = port
 	}
 	if port := os.Getenv("SERVER_PORT"); port != "" {
@@ -127,8 +127,8 @@ func LoadConfig() *Config {
 		config.ExportTempDir = exportTempDir
 	}
 
-	fmt.Printf("DEBUG LoadConfig - Finale Config: Environment='%s', DevTesting='%s', DatabaseType='%s'\n",
-		config.Environment, config.DevTesting, config.DatabaseType)
+	fmt.Printf("DEBUG LoadConfig - Finale Config: Environment='%s', DevTesting='%s', DatabaseType='%s'\n Complete: %v\n",
+		config.Environment, config.DevTesting, config.DatabaseType, config)
 
 	return config
 }
diff --git a/docker/.env.dev b/docker/.env.dev
index fc14e2b..9b170fc 100644
--- a/docker/.env.dev
+++ b/docker/.env.dev
@@ -1,14 +1,21 @@
 # Environment variables for Bamort development environment
 
 # API Configuration
-VITE_API_URL=http://localhost:8180
+# API_URL=http://localhost:8180
 
 # Database Configuration (for development)
 DATABASE_TYPE=mysql
-DATABASE_URL=bamort:bG4)efozrc@tcp(mariadb:3306)/bamort?charset=utf8mb4&parseTime=True&loc=Local
+DATABASE_URL=bamort:bG4)efozrc@tcp(mariadb-dev:3306)/bamort?charset=utf8mb4&parseTime=True&loc=Local
 
 # MariaDB Configuration (development)
 MARIADB_ROOT_PASSWORD=root_password_dev
 MARIADB_PASSWORD=bG4)efozrc
+MARIADB_DATABASE=bamort
+MARIADB_USER=bamort
 
-VITE_API_URL=http://192.168.0.48:8180
\ No newline at end of file
+# Frontend Configuration
+API_URL=http://192.168.0.48:8180
+API_PORT=8180
+BASE_URL=http://localhost:5173
+TEMPLATES_DIR=./templates
+EXPORT_TEMP_DIR=./export_temp
\ No newline at end of file
diff --git a/docker/docker-compose.dev.yml b/docker/docker-compose.dev.yml
index f14ed57..f13867b 100644
--- a/docker/docker-compose.dev.yml
+++ b/docker/docker-compose.dev.yml
@@ -9,8 +9,11 @@ services:
     environment:
       - GO_ENV=development
       - CGO_ENABLED=1
-      - DATABASE_TYPE=mysql
-      - DATABASE_URL=bamort:bG4)efozrc@tcp(mariadb-dev:3306)/bamort?charset=utf8mb4&parseTime=True&loc=Local
+      - DATABASE_TYPE=${DATABASE_TYPE:-mysql}
+      - DATABASE_URL=${DATABASE_URL:-${MARIADB_USER:-bamort}:${MARIADB_PASSWORD:-secure_user_password}@tcp(mariadb-dev:3306)/${MARIADB_DATABASE:-bamort}?charset=utf8mb4&parseTime=True&loc=Local}
+      - API_PORT=${API_PORT:-8180}
+      - TEMPLATES_DIR=${TEMPLATES_DIR:-./templatesx}
+      - EXPORT_TEMP_DIR=${EXPORT_TEMP_DIR:-./export_tempx}
     depends_on:
       mariadb-dev:
         condition: service_healthy
@@ -30,7 +33,9 @@ services:
       - "5173:5173"  # Vite dev server port
     environment:
       - NODE_ENV=development
-      - VITE_API_URL=${VITE_API_URL:-http://192.168.0.48:8180}
+      - VITE_API_URL=${API_URL:-http://192.168.0.1:8180}
+      - VITE_BASE_URL=${BASE_URL:-http://bamort.trokan.de}
+      - VITE_API_PORT=${API_PORT:-8180}
     depends_on:
       - backend-dev
     restart: unless-stopped
@@ -45,10 +50,10 @@ services:
     #ports:
     #  - "3306:3306"
     environment:
-      MARIADB_ROOT_PASSWORD: root_password_dev
-      MARIADB_DATABASE: bamort
-      MARIADB_USER: bamort
-      MARIADB_PASSWORD: bG4)efozrc
+      MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD:-secure_root_password}
+      MARIADB_DATABASE: ${MARIADB_DATABASE:-bamort}
+      MARIADB_USER: ${MARIADB_USER:-bamort}
+      MARIADB_PASSWORD: ${MARIADB_PASSWORD:-secure_user_password}
       MARIADB_CHARSET: utf8mb4
       MARIADB_COLLATION: utf8mb4_unicode_ci
     volumes:
@@ -70,8 +75,8 @@ services:
       PMA_HOST: mariadb-dev
       PMA_PORT: 3306
       PMA_USER: root
-      PMA_PASSWORD: root_password_dev
-      MYSQL_ROOT_PASSWORD: root_password_dev
+      PMA_PASSWORD: ${MARIADB_ROOT_PASSWORD:-secure_root_password}
+      MYSQL_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD:-secure_root_password}
       PMA_ARBITRARY: 1
     depends_on:
       mariadb-dev:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index d5e4653..8054d22 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -9,8 +9,9 @@ services:
     environment:
       - GO_ENV=production
       - CGO_ENABLED=1
-      - DATABASE_TYPE=mysql
-      - DATABASE_URL=bamort:${MARIADB_PASSWORD:-secure_user_password}@tcp(mariadb:3306)/bamort?charset=utf8mb4&parseTime=True&loc=Local
+      - 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}
+      - API_PORT=${API_PORT:-8180}
     depends_on:
       mariadb:
         condition: service_healthy
@@ -27,10 +28,10 @@ services:
     ports:
       - "8181:80"
     environment:
-      - ENVIRONMENT=production
-      - VITE_API_URL=${VITE_API_URL:-http://bamort.trokan.de:8180}
-      - BASE_URL=http://bamort.trokan.de
-      - PORT=8180      
+      - NODE_ENV=production
+      - VITE_API_URL=${API_URL:-http://bamort.trokan.de:8180}
+      - VITE_BASE_URL=${BASE_URL:-http://bamort.trokan.de}
+      - VITE_API_PORT=${API_PORT:-8180}
     depends_on:
       - backend
     restart: unless-stopped
@@ -43,8 +44,8 @@ services:
     #  - "3306:3306"
     environment:
       MARIADB_ROOT_PASSWORD: ${MARIADB_ROOT_PASSWORD:-secure_root_password}
-      MARIADB_DATABASE: bamort
-      MARIADB_USER: bamort
+      MARIADB_DATABASE: ${MARIADB_DATABASE:-bamort}
+      MARIADB_USER: ${MARIADB_USER:-bamort}
       MARIADB_PASSWORD: ${MARIADB_PASSWORD:-secure_user_password}
       MARIADB_CHARSET: utf8mb4
       MARIADB_COLLATION: utf8mb4_unicode_ci
diff --git a/docker/start-prd.sh b/docker/start-prd.sh
index e577c6a..a82841d 100755
--- a/docker/start-prd.sh
+++ b/docker/start-prd.sh
@@ -17,6 +17,6 @@ echo "📦 Building and starting development containers..."
 docker-compose -f docker-compose.yml down
 
 # Baue und starte die Container
-docker-compose -d -f docker-compose.yml up --build
+docker-compose -f docker-compose.yml up --build -d
 
-echo "✅ Development environment stopped."
+echo "✅ Development environment started."
diff --git a/frontend/src/utils/api.js b/frontend/src/utils/api.js
index 2b2cdf5..6d9cf4d 100644
--- a/frontend/src/utils/api.js
+++ b/frontend/src/utils/api.js
@@ -2,8 +2,6 @@ import axios from 'axios'
 
 const API = axios.create({
   baseURL: import.meta.env.VITE_API_URL || 'http://localhost:8180', // Use env variable with fallback
-  //baseURL: 'http://192.168.0.48:8180', // Replace with your backend URL
-  //baseURL: 'http://localhost:8180', // Replace with your backend URL
 })
 
 // Request interceptor to add auth token