diff --git a/install/domain-locker-install.sh b/install/domain-locker-install.sh
index faf16e034..26f202dad 100644
--- a/install/domain-locker-install.sh
+++ b/install/domain-locker-install.sh
@@ -13,7 +13,8 @@ setting_up_container
 network_check
 update_os
 
-DB_NAME="domainlocker" DB_USER="domainlocker" setup_postgresql_db
+PG_VERSION="17" setup_postgresql
+PG_DB_NAME="domainlocker" PG_DB_USER="domainlocker" setup_postgresql_db
 fetch_and_deploy_gh_release "domain-locker" "Lissy93/domain-locker"
 
 msg_info "Building Domain-Locker"
@@ -26,7 +27,7 @@ cat <<EOF >/opt/domain-locker.env
 DL_PG_HOST=localhost
 DL_PG_PORT=5432
 DL_PG_USER=$PG_DB_USER
-DL_PG_PASSWORD=$PG_DB_PASSWORD
+DL_PG_PASSWORD=$PG_DB_PASS
 DL_PG_NAME=$PG_DB_NAME
 
 # Build + Runtime
diff --git a/install/domain-monitor-install.sh b/install/domain-monitor-install.sh
index c2b788511..6e4b7c5aa 100644
--- a/install/domain-monitor-install.sh
+++ b/install/domain-monitor-install.sh
@@ -29,7 +29,7 @@ msg_ok "Installed Dependencies"
 PHP_VERSION="8.4" PHP_APACHE="YES" PHP_FPM="YES" PHP_MODULE="mysql" setup_php
 setup_composer
 setup_mariadb
-DB_NAME="domain_monitor" DB_USER="domainmonitor" setup_mariadb_db
+MARIADB_DB_NAME="domain_monitor" MARIADB_DB_USER="domainmonitor" setup_mariadb_db
 fetch_and_deploy_gh_release "domain-monitor" "Hosteroid/domain-monitor" "prebuild" "latest" "/opt/domain-monitor" "domain-monitor-v*.zip"
 
 msg_info "Setting up Domain Monitor"