diff --git a/freebsd/resources/config.sh b/freebsd/resources/config.sh
index 4b71768..1e20a06 100755
--- a/freebsd/resources/config.sh
+++ b/freebsd/resources/config.sh
@@ -16,7 +16,7 @@ database_name=fusionpbx         # Database name (safe characters A-Z, a-z, 0-9)
 database_username=fusionpbx     # Database username (safe characters A-Z, a-z, 0-9)
 database_password=random        # random or a custom value (safe characters A-Z, a-z, 0-9)
 database_enabled=true           # true or false
-database_version=15             # Postgres 16, 15, 14, 13, 12
+database_version=18             # Postgres 18, 17, 16, 15, 14, 13, 12
 database_host=127.0.0.1         # hostname or IP address
 database_port=5432              # port number
 database_backup=false           # true or false
@@ -26,7 +26,7 @@ firewall_enabled=true           # true or false
 
 # General Settings
 interface_name=auto             # auto, em0, igb0, vtnet0, or other valid names
-php_version=8.1                 # PHP version 8.1, 7.4
+php_version=8.2                 # PHP version 8.3, 8.2, 8.1, 7.4
 portsnap_enabled=false          # true or false
 sngrep_enabled=true             # true or false
 fail2ban_enabled=false          # true or false
diff --git a/freebsd/resources/postgresql.sh b/freebsd/resources/postgresql.sh
index 34a5cb7..ec83e3e 100755
--- a/freebsd/resources/postgresql.sh
+++ b/freebsd/resources/postgresql.sh
@@ -24,6 +24,14 @@ password=$(cat /dev/random | env LC_CTYPE=C tr -dc a-zA-Z0-9 | head -c 20)
 echo "Install PostgreSQL and create the database and users\n"
 
 #postgres install
+if [ ."$database_version" = ."18" ]; then
+	pkg install --yes postgresql18-server
+	#cd /usr/ports/databases/postgresql18-server/ && make install clean BATCH=yes
+fi
+if [ ."$database_version" = ."17" ]; then
+	pkg install --yes postgresql17-server
+	#cd /usr/ports/databases/postgresql17-server/ && make install clean BATCH=yes
+fi
 if [ ."$database_version" = ."16" ]; then
 	echo "IGNORE_DEPENDS=postgresql15-client" >> /usr/local/etc/pkg.conf
 	pkg install --yes postgresql16-server
@@ -53,6 +61,12 @@ echo 'postgresql_enable=true' >> /etc/rc.conf
 /usr/local/etc/rc.d/postgresql initdb
 
 #start postgresql
+if [ ."$database_version" = ."18" ]; then
+	sudo -u postgres /usr/local/bin/pg_ctl -D /var/db/postgres/data18 start
+fi
+if [ ."$database_version" = ."17" ]; then
+	sudo -u postgres /usr/local/bin/pg_ctl -D /var/db/postgres/data17 start
+fi
 if [ ."$database_version" = ."16" ]; then
 	sudo -u postgres /usr/local/bin/pg_ctl -D /var/db/postgres/data16 start
 fi