diff --git a/.gitignore b/.gitignore
index 121bee8..32726a5 100755
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,7 @@
 /postgresql-16.0.tar.bz2
 /postgresql-16.0.tar.bz2.sha256
 /postgresql-setup-8.9.tar.gz
+/postgresql-16.1.tar.bz2
+/postgresql-16.1.tar.bz2.sha256
+/postgresql-15.5.tar.bz2
+/postgresql-15.5.tar.bz2.sha256
diff --git a/.postgresql.metadata b/.postgresql.metadata
new file mode 100644
index 0000000..fe8b9c3
--- /dev/null
+++ b/.postgresql.metadata
@@ -0,0 +1 @@
+ba5d21f1d9c02e2c21976e76bd3ded0f64988e01 postgresql-setup-8.9.tar.gz
diff --git a/postgresql.spec b/postgresql.spec
index ef88668..e6cd3a8 100755
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -62,7 +62,7 @@
 Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 16
-Version: %{majorversion}.0
+Version: %{majorversion}.1
 Release: 1%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
@@ -75,7 +75,7 @@ Url: http://www.postgresql.org/
 # that this be kept up with the latest minor release of the previous series;
 # but update when bugs affecting pg_dump output are fixed.
 %global prevmajorversion 15
-%global prevversion %{prevmajorversion}.3
+%global prevversion %{prevmajorversion}.5
 %global prev_prefix %{_libdir}/pgsql/postgresql-%{prevmajorversion}
 %global precise_version %{?epoch:%epoch:}%version-%release
 
@@ -1216,6 +1216,11 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Mon Jan 08 2024 Filip Janus <fjanus@redhat.com> - 16.1-1
+- Update to 16.1
+- Update upgrade server to 15.5
+- Resolves: RHEL-3635
+
 * Mon Oct 09 2023 Filip Janus <fjanus@redhat.com> - 16.0-1
 - New postgresql stream - 16
 - Remove pdf documentation
diff --git a/sources b/sources
index 3f32895..9afa423 100755
--- a/sources
+++ b/sources
@@ -1,5 +1,5 @@
-SHA512 (postgresql-16.0.tar.bz2) = c66b72d2d9bc503b9ad19c67384517ae921c494b2916f32157c2528dcbb38aefeb4a8cd5003fd40ba8a19612ea64511d534ff5d99e7a1b266024232f983bcf39
-SHA512 (postgresql-16.0.tar.bz2.sha256) = 97bc69d8c0eee567059f32cea6af2a682009402a19941847ff73f73e9b98a7bc3605be7c5cec8489a6db852148a017ea36454c1eea751b88b204a2d69bc44ae5
-SHA512 (postgresql-15.3.tar.bz2) = cac97edeb40df1e8f2162f401b465751132929d7249495ef001e950645a2db46343bd732e7bd6504a7f795e25aea66724f2f4ab0065e3d9331b36db4b3a3bec6
-SHA512 (postgresql-15.3.tar.bz2.sha256) = 1c4874650352b8c61b24271d668e09fe64d7e3a961bb7fcf46a5cafe2d4daa8d7a25e2e0ff6fc49ad889c82be8fd03709ff1c032f87f943ba5feb5b3892c7b15
 SHA512 (postgresql-setup-8.9.tar.gz) = 9c9332136ada2e6152b70ec9688355158f819201526ee21521d9e65eba1caa32085260339b0aac1dddfeef0661d4ea8375838f0e39ca381f46af27cee6692a40
+SHA512 (postgresql-16.1.tar.bz2) = 69f4635e5841452599f13b47df41ce2425ab34b4e4582fd2c635bc78d561fa36c5b03eccb4ae6569872dc74775be1b5a62dee20c9a4f12a43339250128352918
+SHA512 (postgresql-16.1.tar.bz2.sha256) = 3f573d81a7af02dea2a3eee180d4e465546fc4d283dde5b6627d25af0be4a546ffd3ae914dd3490e45264d1a43cf143e829e14e5cd9c6bd8f179b6eae4fd6ff1
+SHA512 (postgresql-15.5.tar.bz2) = 9ed9d160b3cef99954ccd47a970c107b7e3b0196a7d848f740bf3c52a1c626f6f457814c97f37b9f0467bb07734e19806a15bd9cf3c39445e1d89e75b37064cc
+SHA512 (postgresql-15.5.tar.bz2.sha256) = 896ad3a1952f54bc5186d49eb4faec40843813d3e1c200f7b27f0e099b426ef9b59e0c15cb5453ac166e8a566b24178b95836776207de0bf19f5e021fdccfbca