diff --git a/.github/workflows/build-and-test-on-pr.yml b/.github/workflows/build-and-test-on-pr.yml
index 00e3a4a32..78538ce9e 100644
--- a/.github/workflows/build-and-test-on-pr.yml
+++ b/.github/workflows/build-and-test-on-pr.yml
@@ -33,7 +33,7 @@ jobs:
         shard: [1, 2, 3, 4, 5]
     services:
       postgres:
-        image: postgres:15.4
+        image: postgres:16.0
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: test123
diff --git a/.github/workflows/build-test-publish-on-push.yml b/.github/workflows/build-test-publish-on-push.yml
index 4f00a4128..5f47bf1f6 100644
--- a/.github/workflows/build-test-publish-on-push.yml
+++ b/.github/workflows/build-test-publish-on-push.yml
@@ -41,7 +41,7 @@ jobs:
         shard: [1, 2, 3, 4, 5]
     services:
       postgres:
-        image: postgres:15.4
+        image: postgres:16.0
         env:
           POSTGRES_USER: postgres
           POSTGRES_PASSWORD: test123
diff --git a/packages/data-store/src/data-store-orm.ts b/packages/data-store/src/data-store-orm.ts
index 8c76fa46d..77ff45fc9 100644
--- a/packages/data-store/src/data-store-orm.ts
+++ b/packages/data-store/src/data-store-orm.ts
@@ -411,8 +411,8 @@ function decorateQB(
   tableName: string,
   input: FindArgs<any>,
 ): SelectQueryBuilder<any> {
-  if (input?.skip) qb = qb.skip(input.skip)
-  if (input?.take) qb = qb.take(input.take)
+  if (input?.skip) qb = qb.offset(input.skip)
+  if (input?.take) qb = qb.limit(input.take)
 
   if (input?.order) {
     for (const item of input.order) {