diff --git a/clients/quadraticserver/bridges.nix b/clients/quadraticserver/bridges.nix
index 8777f14..b344fb3 100644
--- a/clients/quadraticserver/bridges.nix
+++ b/clients/quadraticserver/bridges.nix
@@ -40,13 +40,19 @@ in {
       // {
         inherit settings;
         format = "mautrix-go";
+        port = 8000;
         package = value.package.override {withGoolm = true;};
       }) {
       whatsapp = {
-        port = 29318;
+        host = "127.0.0.4";
         serviceConfig.EnvironmentFile = config.age.secrets."whatsapp.age".path;
         package = pkgs.mautrix-whatsapp;
       };
+      gmessages = {
+        host = "127.0.0.5";
+        serviceConfig.EnvironmentFile = config.age.secrets."gmessages.age".path;
+        package = inputs.nixpkgs-goolm.legacyPackages.${pkgs.system}.mautrix-gmessages;
+      };
     };
 
     matrix-ooye = {
diff --git a/flake.lock b/flake.lock
index 7e27992..bb186f7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2132,6 +2132,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-goolm": {
+      "locked": {
+        "lastModified": 1752617119,
+        "narHash": "sha256-MhkyyznD3+aSpttLMttWICMWKCtZPUN1eZD95yNOISE=",
+        "owner": "Henry-Hiles",
+        "repo": "nixpkgs",
+        "rev": "b99b5e51b67239b147b697bec0626d67cc98092a",
+        "type": "github"
+      },
+      "original": {
+        "owner": "Henry-Hiles",
+        "ref": "mautrix-gmessages-goolm",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-latest": {
       "locked": {
         "lastModified": 1752250779,
@@ -2549,6 +2565,7 @@
         "matrixoidc": "matrixoidc",
         "nix-matrix-appservices": "nix-matrix-appservices",
         "nixpkgs": "nixpkgs_2",
+        "nixpkgs-goolm": "nixpkgs-goolm",
         "ooye": "ooye",
         "programsdb": "programsdb",
         "run0-sudo-shim": "run0-sudo-shim",
diff --git a/flake.nix b/flake.nix
index 7981fff..c68f0c1 100755
--- a/flake.nix
+++ b/flake.nix
@@ -2,6 +2,7 @@
   inputs = {
     gnome-mobile.url = "github:chuangzhu/nixpkgs-gnome-mobile";
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs-goolm.url = "github:Henry-Hiles/nixpkgs?ref=mautrix-gmessages-goolm";
     wrapper-manager.url = "github:viperML/wrapper-manager";
     flake-parts.url = "github:hercules-ci/flake-parts";
     disko = {
diff --git a/secrets/gmessages.age b/secrets/gmessages.age
new file mode 100644
index 0000000..c2b7491
--- /dev/null
+++ b/secrets/gmessages.age
@@ -0,0 +1,13 @@
+-----BEGIN AGE ENCRYPTED FILE-----
+YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IFZLUVVkUSBpbk4z
+WUFTRGZhTUtuZFJaNWx4Qy9mRzV4NVltbXoxcktpOTA5L2xZRUdZCldvZWR2dmV1
+d0gvM0w0dGxyQk1pMWh2S2JVM2FqaDZXYStHN1JZTll0elUKLT4gKDsmLV5zei1n
+cmVhc2UgdTMjIDsKamtaWVZFZlZtalJoNitHMDZLeUZlMlNKRDNpSGdtS1JvOFBJ
+SlE5bFE5VDJQSDkvSWtKaXF0OEtaTDZlSHBwUwp0aWFqODhJeUh2OEoyaXY0aGhn
+ZWdwbEZGNnNhUTFNd2YxT3hxeUtMTURocnRBCi0tLSBqU0x5ZXY1eDh4MmpieFlu
+cDlPNFc2enpldnQxS3AxUG5qaGNrZmZrV3B3CtDR6XsjAlysHc5OGXulbqovS9yC
+PR3V/ERy0R+ZmVptllRxwYn2aAUinSeQ1BmTksmgHtC5dGPLC9+/n22a+GBQ4vMP
+FcBtaxAZG1IS5MTHZUytHgsXeB5Src7R4YpaDTgLGKuNAgrzzYD/zWempY5XdhrJ
+Iy/euTEeoyIZP+aJ1QtJlnECuz37YZ8QZFT5uSNu4Yyn2FwIQpU5yoYEeprENl3Z
+Ex01KfUuJVKFRpl0w0a0teLX0EO2MAm+qd90lU94
+-----END AGE ENCRYPTED FILE-----