diff --git a/apps/package.json b/apps/package.json
index 5b6b43534..b601fee3d 100644
--- a/apps/package.json
+++ b/apps/package.json
@@ -54,7 +54,7 @@
     "leveldown": "6.0.0",
     "lexicographic-integer-encoding": "1.0.1",
     "memdown": "6.1.1",
-    "pg": "8.9.0",
+    "pg": "8.11.3",
     "reflect-metadata": "0.1.13",
     "rimraf": "3.0.2",
     "rxjs": "7.8.0",
diff --git a/package-lock.json b/package-lock.json
index af857c418..c6fe25cf7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -77,7 +77,7 @@
         "lexicographic-integer-encoding": "1.0.1",
         "lodash": "4.17.21",
         "memdown": "6.1.1",
-        "pg": "8.9.0",
+        "pg": "8.11.3",
         "reflect-metadata": "0.1.13",
         "rimraf": "3.0.2",
         "rxjs": "7.8.0",
@@ -19694,14 +19694,14 @@
       }
     },
     "node_modules/pg": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz",
-      "integrity": "sha512-ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg==",
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.3.tgz",
+      "integrity": "sha512-+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g==",
       "dependencies": {
         "buffer-writer": "2.0.0",
         "packet-reader": "1.0.0",
-        "pg-connection-string": "^2.5.0",
-        "pg-pool": "^3.5.2",
+        "pg-connection-string": "^2.6.2",
+        "pg-pool": "^3.6.1",
         "pg-protocol": "^1.6.0",
         "pg-types": "^2.1.0",
         "pgpass": "1.x"
@@ -19709,6 +19709,9 @@
       "engines": {
         "node": ">= 8.0.0"
       },
+      "optionalDependencies": {
+        "pg-cloudflare": "^1.1.1"
+      },
       "peerDependencies": {
         "pg-native": ">=3.0.1"
       },
@@ -19718,9 +19721,16 @@
         }
       }
     },
+    "node_modules/pg-cloudflare": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz",
+      "integrity": "sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==",
+      "optional": true
+    },
     "node_modules/pg-connection-string": {
-      "version": "2.5.0",
-      "license": "MIT"
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.2.tgz",
+      "integrity": "sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA=="
     },
     "node_modules/pg-int8": {
       "version": "1.0.1",
@@ -19730,9 +19740,9 @@
       }
     },
     "node_modules/pg-pool": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz",
-      "integrity": "sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.1.tgz",
+      "integrity": "sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==",
       "peerDependencies": {
         "pg": ">=8.0"
       }
@@ -26215,8 +26225,6 @@
       "version": "0.0.0",
       "license": "MIT",
       "dependencies": {
-        "@defichain/jellyfish-transaction": "^0.0.0",
-        "@defichain/jellyfish-wallet": "^0.0.0",
         "bip32": "^2.0.6",
         "bip39": "^3.0.4",
         "create-hmac": "^1.1.7"
@@ -27989,7 +27997,7 @@
         "lexicographic-integer-encoding": "1.0.1",
         "lodash": "4.17.21",
         "memdown": "6.1.1",
-        "pg": "8.9.0",
+        "pg": "8.11.3",
         "reflect-metadata": "0.1.13",
         "rimraf": "3.0.2",
         "rxjs": "7.8.0",
@@ -28215,8 +28223,6 @@
     "@defichain/jellyfish-wallet-mnemonic": {
       "version": "file:packages/jellyfish-wallet-mnemonic",
       "requires": {
-        "@defichain/jellyfish-transaction": "^0.0.0",
-        "@defichain/jellyfish-wallet": "^0.0.0",
         "@types/create-hmac": "1.1.0",
         "bip32": "^2.0.6",
         "bip39": "^3.0.4",
@@ -36286,7 +36292,7 @@
             "lexicographic-integer-encoding": "1.0.1",
             "lodash": "4.17.21",
             "memdown": "6.1.1",
-            "pg": "8.9.0",
+            "pg": "8.11.3",
             "reflect-metadata": "0.1.13",
             "rimraf": "3.0.2",
             "rxjs": "7.8.0",
@@ -36512,8 +36518,6 @@
         "@defichain/jellyfish-wallet-mnemonic": {
           "version": "file:packages/jellyfish-wallet-mnemonic",
           "requires": {
-            "@defichain/jellyfish-transaction": "^0.0.0",
-            "@defichain/jellyfish-wallet": "^0.0.0",
             "@types/create-hmac": "1.1.0",
             "bip32": "^2.0.6",
             "bip39": "^3.0.4",
@@ -48831,29 +48835,38 @@
           }
         },
         "pg": {
-          "version": "8.9.0",
-          "resolved": "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz",
-          "integrity": "sha512-ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg==",
+          "version": "8.11.3",
+          "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.3.tgz",
+          "integrity": "sha512-+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g==",
           "requires": {
             "buffer-writer": "2.0.0",
             "packet-reader": "1.0.0",
-            "pg-connection-string": "^2.5.0",
-            "pg-pool": "^3.5.2",
+            "pg-cloudflare": "^1.1.1",
+            "pg-connection-string": "^2.6.2",
+            "pg-pool": "^3.6.1",
             "pg-protocol": "^1.6.0",
             "pg-types": "^2.1.0",
             "pgpass": "1.x"
           }
         },
+        "pg-cloudflare": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz",
+          "integrity": "sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==",
+          "optional": true
+        },
         "pg-connection-string": {
-          "version": "2.5.0"
+          "version": "2.6.2",
+          "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.2.tgz",
+          "integrity": "sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA=="
         },
         "pg-int8": {
           "version": "1.0.1"
         },
         "pg-pool": {
-          "version": "3.5.2",
-          "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz",
-          "integrity": "sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==",
+          "version": "3.6.1",
+          "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.1.tgz",
+          "integrity": "sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==",
           "requires": {}
         },
         "pg-protocol": {
@@ -58937,29 +58950,38 @@
       }
     },
     "pg": {
-      "version": "8.9.0",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.9.0.tgz",
-      "integrity": "sha512-ZJM+qkEbtOHRuXjmvBtOgNOXOtLSbxiMiUVMgE4rV6Zwocy03RicCVvDXgx8l4Biwo8/qORUnEqn2fdQzV7KCg==",
+      "version": "8.11.3",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-8.11.3.tgz",
+      "integrity": "sha512-+9iuvG8QfaaUrrph+kpF24cXkH1YOOUeArRNYIxq1viYHZagBxrTno7cecY1Fa44tJeZvaoG+Djpkc3JwehN5g==",
       "requires": {
         "buffer-writer": "2.0.0",
         "packet-reader": "1.0.0",
-        "pg-connection-string": "^2.5.0",
-        "pg-pool": "^3.5.2",
+        "pg-cloudflare": "^1.1.1",
+        "pg-connection-string": "^2.6.2",
+        "pg-pool": "^3.6.1",
         "pg-protocol": "^1.6.0",
         "pg-types": "^2.1.0",
         "pgpass": "1.x"
       }
     },
+    "pg-cloudflare": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.1.1.tgz",
+      "integrity": "sha512-xWPagP/4B6BgFO+EKz3JONXv3YDgvkbVrGw2mTo3D6tVDQRh1e7cqVGvyR3BE+eQgAvx1XhW/iEASj4/jCWl3Q==",
+      "optional": true
+    },
     "pg-connection-string": {
-      "version": "2.5.0"
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.6.2.tgz",
+      "integrity": "sha512-ch6OwaeaPYcova4kKZ15sbJ2hKb/VP48ZD2gE7i1J+L4MspCtBMAx8nMgz7bksc7IojCIIWuEhHibSMFH8m8oA=="
     },
     "pg-int8": {
       "version": "1.0.1"
     },
     "pg-pool": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz",
-      "integrity": "sha512-His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.1.tgz",
+      "integrity": "sha512-jizsIzhkIitxCGfPRzJn1ZdcosIt3pz9Sh3V01fm1vZnbnCMgmGl5wvGGdNN2EL9Rmb0EcFoCkixH4Pu+sP9Og==",
       "requires": {}
     },
     "pg-protocol": {