diff --git a/server/.env.sample b/server/.env.sample
index aa8f41c5..888bfd57 100644
--- a/server/.env.sample
+++ b/server/.env.sample
@@ -72,7 +72,3 @@ SECRET_KEY=notsecretkey
 # SMTP_PASSWORD=
 # SMTP_FROM="Demo Demo" <demo@demo.demo>
 # SMTP_TLS_REJECT_UNAUTHORIZED=false
-
-## Do not edit this
-
-TZ=UTC
diff --git a/server/config/datastores.js b/server/config/datastores.js
index f7d5bd8b..b05096a9 100644
--- a/server/config/datastores.js
+++ b/server/config/datastores.js
@@ -13,6 +13,10 @@
  * https://sailsjs.com/config/datastores
  */
 
+const pg = require('pg');
+
+pg.types.setTypeParser(pg.types.builtins.TIMESTAMP, (value) => new Date(`${value}Z`));
+
 module.exports.datastores = {
   /**
    *
diff --git a/server/package-lock.json b/server/package-lock.json
index 604469a4..eb3001eb 100644
--- a/server/package-lock.json
+++ b/server/package-lock.json
@@ -25,6 +25,7 @@
         "nodemailer": "^6.10.1",
         "openid-client": "^5.7.1",
         "patch-package": "^8.0.0",
+        "pg": "^8.16.3",
         "read": "^4.1.0",
         "rimraf": "^5.0.10",
         "sails": "^1.5.14",
@@ -7151,6 +7152,35 @@
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
       "license": "MIT"
     },
+    "node_modules/machinepack-postgresql/node_modules/pg": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.0.tgz",
+      "integrity": "sha512-meLUVPn2TWgJyLmy7el3fQQVwft4gU5NGyvV0XbD41iU9Jbg8lCH4zexhIkihDzVHJStlt6r088G6/fWeNjhXA==",
+      "license": "MIT",
+      "dependencies": {
+        "buffer-writer": "2.0.0",
+        "packet-reader": "1.0.0",
+        "pg-connection-string": "^2.6.0",
+        "pg-pool": "^3.6.0",
+        "pg-protocol": "^1.6.0",
+        "pg-types": "^2.1.0",
+        "pgpass": "1.x"
+      },
+      "engines": {
+        "node": ">= 8.0.0"
+      },
+      "optionalDependencies": {
+        "pg-cloudflare": "^1.1.0"
+      },
+      "peerDependencies": {
+        "pg-native": ">=3.0.1"
+      },
+      "peerDependenciesMeta": {
+        "pg-native": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/machinepack-process": {
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/machinepack-process/-/machinepack-process-4.0.1.tgz",
@@ -8173,24 +8203,22 @@
       "license": "MIT"
     },
     "node_modules/pg": {
-      "version": "8.11.0",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.0.tgz",
-      "integrity": "sha512-meLUVPn2TWgJyLmy7el3fQQVwft4gU5NGyvV0XbD41iU9Jbg8lCH4zexhIkihDzVHJStlt6r088G6/fWeNjhXA==",
+      "version": "8.16.3",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.16.3.tgz",
+      "integrity": "sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==",
       "license": "MIT",
       "dependencies": {
-        "buffer-writer": "2.0.0",
-        "packet-reader": "1.0.0",
-        "pg-connection-string": "^2.6.0",
-        "pg-pool": "^3.6.0",
-        "pg-protocol": "^1.6.0",
-        "pg-types": "^2.1.0",
-        "pgpass": "1.x"
+        "pg-connection-string": "^2.9.1",
+        "pg-pool": "^3.10.1",
+        "pg-protocol": "^1.10.3",
+        "pg-types": "2.2.0",
+        "pgpass": "1.0.5"
       },
       "engines": {
-        "node": ">= 8.0.0"
+        "node": ">= 16.0.0"
       },
       "optionalDependencies": {
-        "pg-cloudflare": "^1.1.0"
+        "pg-cloudflare": "^1.2.7"
       },
       "peerDependencies": {
         "pg-native": ">=3.0.1"
@@ -8254,6 +8282,12 @@
         "node": ">=4"
       }
     },
+    "node_modules/pg/node_modules/pg-connection-string": {
+      "version": "2.9.1",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.9.1.tgz",
+      "integrity": "sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==",
+      "license": "MIT"
+    },
     "node_modules/pgpass": {
       "version": "1.0.5",
       "resolved": "https://registry.npmjs.org/pgpass/-/pgpass-1.0.5.tgz",
diff --git a/server/package.json b/server/package.json
index 3675a382..cf213af3 100644
--- a/server/package.json
+++ b/server/package.json
@@ -60,6 +60,7 @@
     "nodemailer": "^6.10.1",
     "openid-client": "^5.7.1",
     "patch-package": "^8.0.0",
+    "pg": "^8.16.3",
     "read": "^4.1.0",
     "rimraf": "^5.0.10",
     "sails": "^1.5.14",