diff --git a/.github/workflows/build-package.yml b/.github/workflows/build-package.yml
index ac3460eb7..dc976ebbc 100644
--- a/.github/workflows/build-package.yml
+++ b/.github/workflows/build-package.yml
@@ -29,10 +29,10 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Clone tools branch
-        run: git clone -b v0.8.18 --depth=1  https://github.com/citusdata/tools.git tools
+        run: git clone -b v0.8.27 --depth=1  https://github.com/citusdata/tools.git tools
 
       - name: Install package dependencies
         run: sudo apt-get update && sudo apt-get install libcurl4-openssl-dev libssl-dev python3-testresources
diff --git a/hll.spec b/hll.spec
index bc95a0775..e32d9b7af 100644
--- a/hll.spec
+++ b/hll.spec
@@ -5,11 +5,11 @@
 
 Summary:	HyperLogLog extension for PostgreSQL
 Name:		%{sname}_%{pgmajorversion}
-Version:	2.17.citus
+Version:	2.18.citus
 Release:	1%{dist}
 License:	ASL 2.0
 Group:		Applications/Databases
-Source0:	https://github.com/citusdata/postgresql-hll/archive/v2.17.tar.gz
+Source0:	https://github.com/citusdata/postgresql-hll/archive/v2.18.tar.gz
 URL:		https://github.com/citusdata/postgresql-hll
 BuildRequires:	postgresql%{pgmajorversion}-devel libxml2-devel
 BuildRequires:	libxslt-devel openssl-devel pam-devel readline-devel
@@ -60,6 +60,9 @@ PATH=%{pginstdir}/bin:$PATH
 %endif
 
 %changelog
+* Fri Sep 1 2023 - Gurkan Indibay <gindibay@Microsoft.com> 2.18.citus-1
+- Support for PostgreSQL 16
+
 * Fri Aug 26 2022 - Gurkan Indibay <gindibay@Microsoft.com> 2.17.citus-1
 - Support for PostgreSQL 15
 
diff --git a/pkgvars b/pkgvars
index 6f704f814..6a3569bdc 100644
--- a/pkgvars
+++ b/pkgvars
@@ -1,4 +1,4 @@
 pkgname=hll
 hubproj=postgresql-hll
 pkgdesc=HyperLogLog
-pkglatest=2.17.citus-1
+pkglatest=2.18.citus-1
diff --git a/postgres-matrix.yml b/postgres-matrix.yml
index a8d0fdc81..a7599dad4 100644
--- a/postgres-matrix.yml
+++ b/postgres-matrix.yml
@@ -6,3 +6,5 @@ version_matrix:
       postgres_versions: [ 10, 11, 12, 13, 14 ]
   - 2.17:
       postgres_versions: [ 10, 11, 12, 13, 14, 15 ]
+  - 2.18:
+      postgres_versions: [ 11, 12, 13, 14, 15, 16 ]