diff --git a/postgres/lib/PostgresService.js b/postgres/lib/PostgresService.js
index 0832dd35b..424d32a08 100644
--- a/postgres/lib/PostgresService.js
+++ b/postgres/lib/PostgresService.js
@@ -457,6 +457,7 @@ GROUP BY k
         DROP USER IF EXISTS "${creds.user}";
         CREATE GROUP "${creds.usergroup}";
         CREATE USER "${creds.user}" WITH CREATEROLE IN GROUP "${creds.usergroup}" PASSWORD '${creds.user}';
+        GRANT "${creds.usergroup}" TO "${creds.user}" WITH ADMIN OPTION;
       `)
       await this.exec(`CREATE DATABASE "${creds.database}" OWNER="${creds.user}" TEMPLATE=template0`)
     } catch (e) {
diff --git a/postgres/pg-stack.yml b/postgres/pg-stack.yml
index 27117f3e2..c88c308b9 100644
--- a/postgres/pg-stack.yml
+++ b/postgres/pg-stack.yml
@@ -3,7 +3,7 @@ version: '3.1'
 
 services:
   db:
-    image: postgres:15-alpine
+    image: postgres:16-alpine
     restart: always
     environment:
       POSTGRES_PASSWORD: postgres