diff --git a/_utils/cert-basic.sh b/_utils/cert-basic.sh
index 37af774..85e3c2c 100755
--- a/_utils/cert-basic.sh
+++ b/_utils/cert-basic.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-export LEGO_WORKING_PATH="/opt/lego/"
+LEGO_WORKING_PATH="/opt/services/.lego/"
 
 set -e
 
@@ -27,6 +27,15 @@ lego -a --email "tobias@msrg.cc" \
 
 # Copy registry.serguzim.me files to harbor data directory
 if [ "$domain" = "registry.serguzim.me" ]; then
+	echo "Deploying certificates for registry.serguzim.me"
 	sudo cp "$LEGO_WORKING_PATH/certificates/registry.serguzim.me.crt" /opt/services/harbor/data/secret/cert/server.crt
 	sudo cp "$LEGO_WORKING_PATH/certificates/registry.serguzim.me.key" /opt/services/harbor/data/secret/cert/server.key
 fi
+
+# Copy db.serguzim.me files to postgresql data directory
+if [ "$domain" = "db.serguzim.me" ]; then
+	echo "Deploying certificates for db.serguzim.me"
+	sudo cp "$LEGO_WORKING_PATH/certificates/db.serguzim.me.crt" /var/lib/postgres/data/server.crt
+	sudo cp "$LEGO_WORKING_PATH/certificates/db.serguzim.me.key" /var/lib/postgres/data/server.key
+	sudo -u postgres pg_ctl -D /var/lib/postgres/data/ reload
+fi
diff --git a/_utils/postgres-update.sh b/_utils/postgres-update.sh
index 9a4eb1a..ba8a1f9 100755
--- a/_utils/postgres-update.sh
+++ b/_utils/postgres-update.sh
@@ -26,6 +26,10 @@ pg_path="/opt/pgsql-$pg_version/bin"
 [ -d "$pg_path" ] || exit
 sudo -u postgres pg_upgrade -b "$pg_path" -B /usr/bin -d /var/lib/postgres/olddata -D /var/lib/postgres/data
 
+printf "\nStep 5.1: Copy config files - continue? "; read
+sudo -u postgres cp /var/lib/postgres/olddata/pg_hba.conf /var/lib/postgres/data/
+sudo -u postgres cp /var/lib/postgres/olddata/postgresql.conf /var/lib/postgres/data/
+
 
 printf "\nStep 6: Restart database - continue? "; read
 systemctl start postgresql.service