diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index d4442d8a52..5f939f4a0d 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -379,6 +379,7 @@ _main() {
 		fi
 	fi
 
+	unset POSTGRES_PASSWORD POSTGRES_USER POSTGRES_DB POSTGRES_INITDB_ARGS
 	exec "$@"
 }