diff --git a/config/software/postgresql-windows.rb b/config/software/postgresql-windows.rb
index 4c12e74..232f50c 100644
--- a/config/software/postgresql-windows.rb
+++ b/config/software/postgresql-windows.rb
@@ -15,7 +15,7 @@
 #
 
 name "postgresql-windows"
-default_version "9.6.20"
+default_version "14.5"
 
 relative_path "pgsql"
 
@@ -46,6 +46,10 @@
 
   source url: "http://get.enterprisedb.com/postgresql/postgresql-#{version}-1-windows-binaries.zip"
 else
+  version "13.6" do
+    source sha256: "44ba5f480c45afa554bf70688c025a7298a96b5541a1c302e6223988768e83a8"
+  end
+
   version "9.6.20" do
     source sha256: "a76e41e3101e09a2e772a26f0b93b405a97482b42b0695893465f3533c76d326"
   end
diff --git a/config/software/postgresql.rb b/config/software/postgresql.rb
index fdc55cb..ed7ef00 100644
--- a/config/software/postgresql.rb
+++ b/config/software/postgresql.rb
@@ -15,7 +15,7 @@
 #
 
 name "postgresql"
-default_version "9.6.20"
+default_version "14.5"
 
 license "PostgreSQL"
 license_file "COPYRIGHT"
@@ -28,6 +28,9 @@
 dependency "ncurses"
 dependency "config_guess"
 
+version("13.6")   { source sha256: "bafc7fa3d9d4da8fe71b84c63ba8bdfe8092935c30c0aa85c24b2c08508f67fc" }
+version("14.5")   { source sha256: "d4f72cb5fb857c9a9f75ec8cf091a1771272802f2178f0b2e65b7b6ff64f4a30" }
+
 version "9.6.20" do
   source sha256: "3d08cba409d45ab62d42b24431a0d55e7537bcd1db2d979f5f2eefe34d487bb6"
 end
@@ -54,6 +57,7 @@
 
 build do
   env = with_standard_compiler_flags(with_embedded_path)
+  env['MAKELEVEL'] = '0'
 
   update_config_guess(target: "config")
 
@@ -61,7 +65,7 @@
           " --prefix=#{install_dir}/embedded" \
           " --with-libedit-preferred" \
           " --with-openssl" \
-          " --with-uuid=e2fs" \
+          " --with-ossp-uuid" \
           " --with-includes=#{install_dir}/embedded/include" \
           " --with-libraries=#{install_dir}/embedded/lib", env: env