diff --git a/env/development/.env.backend b/env/development/.env.backend
index a22da33..8f1d6cb 100644
--- a/env/development/.env.backend
+++ b/env/development/.env.backend
@@ -6,6 +6,7 @@
 REDIS_PASSWORD=laravel-redis-passwort
 REDIS_PORT=6379
 SERVER_IP=${SERVER_IP:-localhost}
+
 # ----------------------------------
 # Laravel Backend
 # ----------------------------------
@@ -14,7 +15,7 @@ APP_NAME="mindboost backend - Compose Deployment"
 APP_URL=https://backend.local
 LARAVEL_PORT=8000
 LARAVEL_VITE_PORT=5173
-DB_HOST=${MARIADB_HOST:-mariadb}
+DB_HOST=${MARIADB_HOST:-database}
 DB_PORT=${MARIADB_PORT:-3306}
 DB_PASSWORD=${MARIADB_PASSWORD:-default}
 DB_USERNAME=${MARIADB_USER:-default}
@@ -22,7 +23,4 @@ DB_DATABASE=${MARIADB_DATABASE:-default}
 
 JWT_SECRET=zMtO8sgsnc4UixWSsYWE1pK9EdpNLzxNSoIPlUpTe6dDlarM3bu4cwM80tH3jA0F
 
-# ----------------------------------
-# Adminer
-# ----------------------------------
-ADMINER_PORT=8080
+
diff --git a/env/development/.env.database b/env/development/.env.database
index b141c9a..ca4d94b 100644
--- a/env/development/.env.database
+++ b/env/development/.env.database
@@ -4,7 +4,11 @@
 MARIADB_USER=${INFRASTRUCTURE_LABEL:-default}_${ENVIRONMENT:-development}
 MARIADB_DATABASE=${INFRASTRUCTURE_LABEL:-default}_${ENVIRONMENT:-development}
 MARIADB_PASSWORD=1stronges-mindboostdb-passwort
-MARIADB_ROOT_PASSWORD=1stronges-passwort-fuer-diedb
-
+MARIADB_RANDOM_ROOT_PASSWORD=1
 MARIADB_PORT=3306
-MARIADB_HOST=${INFRASTRUCTURE_LABEL:-default}_database_${ENVIRONMENT:-development}
+MARIADB_HOST=database
+
+# ----------------------------------
+# Adminer
+# ----------------------------------
+ADMINER_PORT=8082
diff --git a/env/development/.env.proxy b/env/development/.env.proxy
index 7e6c32c..3b1fdb6 100644
--- a/env/development/.env.proxy
+++ b/env/development/.env.proxy
@@ -19,6 +19,7 @@ LIMESURVEY_DOMAIN=survey.local
 LINKSTACK_DOMAIN=linkstack.local
 TRAEFIK_DOMAIN=traefik.local
 CLOUD_DOMAIN=cloud.local
+KILLBILL_DOMAIN=killbill.local
 
 ###              TLS for Domains
 
@@ -32,6 +33,7 @@ LIMESURVEY_TLS_DOMAIN_MAIN=${LIMESURVEY_DOMAIN}
 LINKSTACK_TLS_DOMAIN_MAIN=${LINKSTACK_DOMAIN}
 TRAEFIK_TLS_DOMAIN_MAIN=${TRAEFIK_DOMAIN}
 CLOUD_TLS_DOMAIN_MAIN=${CLOUD_DOMAIN}
+KILLBILL_TLS_DOMAIN_MAIN=${KILLBILL_DOMAIN}
 
 
 ##                      MIDDLEWARES
diff --git a/env/development/.env.tools b/env/development/.env.tools
index cb0a5b7..f260d4d 100644
--- a/env/development/.env.tools
+++ b/env/development/.env.tools
@@ -19,3 +19,11 @@ OVERWRITECLIURL=https://${CLOUD_DOMAIN:-cloud}
 OVERWRITEHOST=${CLOUD_DOMAIN:-cloud}
 REDIS_HOST=nextcloud-redis
 REDIS_HOST_PASSWORD=redis-mindboost-passwort
+
+# ----------------------------------
+#  KILLBILL PAYMENT
+# ----------------------------------
+
+KILLBILL_DAO_URL=jdbc:mysql://db:3306/killbill
+KILLBILL_DAO_USER=${ADMIN_USER:-root}
+KILLBILL_DAO_PASSWORD=${ADMIN_PASSWORD_HASH}