diff --git a/quickstart/dev/docker-compose.deps.yml b/quickstart/dev/docker-compose.deps.yml
index 5c734d841e..f7f0ee1bef 100644
--- a/quickstart/dev/docker-compose.deps.yml
+++ b/quickstart/dev/docker-compose.deps.yml
@@ -178,7 +178,7 @@ services:
     environment:
       - MONGO_INITDB_DATABASE=galoy
   lnd1:
-    image: lightninglabs/lnd:v0.18.3-beta
+    image: lightninglabs/lnd:v0.18.4-beta
     ports:
       - "10009:10009"
     volumes:
@@ -198,7 +198,7 @@ services:
         cp /root/.lnd/admin.macaroon /root/.lnd/data/chain/bitcoin/regtest/admin.macaroon
         /bin/lnd
   lnd2:
-    image: lightninglabs/lnd:v0.18.3-beta
+    image: lightninglabs/lnd:v0.18.4-beta
     ports:
       - "10010:10009"
     volumes:
@@ -218,7 +218,7 @@ services:
         cp /root/.lnd/admin.macaroon /root/.lnd/data/chain/bitcoin/regtest/admin.macaroon
         /bin/lnd
   lnd-outside-1:
-    image: lightninglabs/lnd:v0.18.3-beta
+    image: lightninglabs/lnd:v0.18.4-beta
     ports:
       - "10012:10009"
     volumes:
@@ -238,7 +238,7 @@ services:
         /bin/lnd
     depends_on: [bitcoind]
   lnd-outside-2:
-    image: lightninglabs/lnd:v0.18.3-beta
+    image: lightninglabs/lnd:v0.18.4-beta
     ports:
       - "10013:10009"
     volumes:
diff --git a/quickstart/docker-compose.tmpl.yml b/quickstart/docker-compose.tmpl.yml
index df57c9a7c9..1632fa682f 100644
--- a/quickstart/docker-compose.tmpl.yml
+++ b/quickstart/docker-compose.tmpl.yml
@@ -1,8 +1,8 @@
 #@ load("@ytt:data", "data")
 
-#@ galoy_api_image_digest = "sha256@3a56597239aa1caf5c59cca1861c812310c6b3f99020de93527590439522d63b"
-#@ galoy_trigger_image_digest = "sha256@6057867f063ff205a9297a080d2d49e105bed20a8d41358d98cc01b978fddc69"
-#@ mongodb_migrate_image_digest = "sha256@aa18803258d758b3d176460cf728d66f4c930783f8109919852a20a6a237821f"
+#@ galoy_api_image_digest = "sha256@a180c47010ae7892ec7c04207885f98ae51ae8fed248a5a5826fe22149eb6a27"
+#@ galoy_trigger_image_digest = "sha256@c57593a4915284e415a93103d3bfef1f6ab1948cbf8e95129c96967fdf620646"
+#@ mongodb_migrate_image_digest = "sha256@7360aa4dc96740cd29ee4931e651f15d3e1e90d25bb79387e943eb25b7a656b6"
 #@ galoy_notifications_image_digest = "sha256@71c53ab3d9a4282d44d0605b95f1691ebc23334e8108bd4d06021a0c627a1205"
 
 #@ core_env = [
diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml
index 945f4b4492..fb60bc9204 100644
--- a/quickstart/docker-compose.yml
+++ b/quickstart/docker-compose.yml
@@ -98,7 +98,7 @@ services:
     - POSTGRES_PASSWORD=secret
     - POSTGRES_DB=hydra
   galoy:
-    image: us.gcr.io/galoy-org/galoy-api@sha256:3a56597239aa1caf5c59cca1861c812310c6b3f99020de93527590439522d63b
+    image: us.gcr.io/galoy-org/galoy-api@sha256:a180c47010ae7892ec7c04207885f98ae51ae8fed248a5a5826fe22149eb6a27
     environment:
     - HELMREVISION=dev
     - NETWORK=regtest
@@ -157,7 +157,7 @@ services:
         aliases:
         - bats-tests
   trigger:
-    image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:6057867f063ff205a9297a080d2d49e105bed20a8d41358d98cc01b978fddc69
+    image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:c57593a4915284e415a93103d3bfef1f6ab1948cbf8e95129c96967fdf620646
     environment:
     - HELMREVISION=dev
     - NETWORK=regtest
@@ -242,7 +242,7 @@ services:
     environment:
     - MONGO_INITDB_DATABASE=galoy
   mongodb-migrate:
-    image: us.gcr.io/galoy-org/galoy-api-migrate@sha256:aa18803258d758b3d176460cf728d66f4c930783f8109919852a20a6a237821f
+    image: us.gcr.io/galoy-org/galoy-api-migrate@sha256:7360aa4dc96740cd29ee4931e651f15d3e1e90d25bb79387e943eb25b7a656b6
     depends_on:
     - mongodb
     environment:
@@ -318,7 +318,7 @@ services:
     - |
       bitcoind -connect=bitcoind:18444
   lnd1:
-    image: lightninglabs/lnd:v0.18.3-beta
+    image: lightninglabs/lnd:v0.18.4-beta
     ports:
     - 10009:10009
     volumes:
@@ -341,7 +341,7 @@ services:
       cp /root/.lnd/admin.macaroon /root/.lnd/data/chain/bitcoin/regtest/admin.macaroon
       /bin/lnd
   lnd-outside-1:
-    image: lightninglabs/lnd:v0.18.3-beta
+    image: lightninglabs/lnd:v0.18.4-beta
     ports:
     - 10012:10009
     volumes:
diff --git a/quickstart/vendir.lock.yml b/quickstart/vendir.lock.yml
index 68560ff27d..d0da7e7ddd 100644
--- a/quickstart/vendir.lock.yml
+++ b/quickstart/vendir.lock.yml
@@ -2,24 +2,24 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - git:
-      commitTitle: 'fix: update quickstart docker compose deps (#4684)'
-      sha: 888b29856385cf89ccbdcb4d7023faee2e1b066e
+      commitTitle: 'chore: update lnd version to 0.18.4 (#4691)'
+      sha: a2ab6e3912ebae6b517480c0317f576dfd13d50e
       tags:
-      - 0.21.15-1-g888b29856
+      - 0.21.16-1-ga2ab6e391
     path: .
   path: dev
 - contents:
   - git:
-      commitTitle: 'fix: update quickstart docker compose deps (#4684)'
-      sha: 888b29856385cf89ccbdcb4d7023faee2e1b066e
+      commitTitle: 'chore: update lnd version to 0.18.4 (#4691)'
+      sha: a2ab6e3912ebae6b517480c0317f576dfd13d50e
       tags:
-      - 0.21.15-1-g888b29856
+      - 0.21.16-1-ga2ab6e391
     path: schemas
   - git:
-      commitTitle: 'fix: update quickstart docker compose deps (#4684)'
-      sha: 888b29856385cf89ccbdcb4d7023faee2e1b066e
+      commitTitle: 'chore: update lnd version to 0.18.4 (#4691)'
+      sha: a2ab6e3912ebae6b517480c0317f576dfd13d50e
       tags:
-      - 0.21.15-1-g888b29856
+      - 0.21.16-1-ga2ab6e391
     path: gql
   path: graphql
 kind: LockConfig
diff --git a/quickstart/vendir.yml b/quickstart/vendir.yml
index 60dab31c66..bb4da5269f 100644
--- a/quickstart/vendir.yml
+++ b/quickstart/vendir.yml
@@ -6,7 +6,7 @@ directories:
   - path: ./
     git:
       url: https://github.com/GaloyMoney/galoy.git
-      ref: 888b29856385cf89ccbdcb4d7023faee2e1b066e
+      ref: a2ab6e3912ebae6b517480c0317f576dfd13d50e
     includePaths:
     - dev/**/*
     excludePaths:
@@ -18,7 +18,7 @@ directories:
   - path: schemas/
     git:
       url: https://github.com/GaloyMoney/galoy.git
-      ref: 888b29856385cf89ccbdcb4d7023faee2e1b066e
+      ref: a2ab6e3912ebae6b517480c0317f576dfd13d50e
     includePaths:
     - core/api/src/graphql/public/schema.graphql
     - core/api/src/graphql/admin/schema.graphql
@@ -26,7 +26,7 @@ directories:
   - path: gql/
     git:
       url: https://github.com/GaloyMoney/galoy.git
-      ref: 888b29856385cf89ccbdcb4d7023faee2e1b066e
+      ref: a2ab6e3912ebae6b517480c0317f576dfd13d50e
     includePaths:
     - bats/gql/**/*
     newRootPath: bats/gql
diff --git a/quickstart/vendir/values.yml b/quickstart/vendir/values.yml
index f6c9bc0926..f0e2b67338 100644
--- a/quickstart/vendir/values.yml
+++ b/quickstart/vendir/values.yml
@@ -1,3 +1,3 @@
 #@data/values
 ---
-galoy_git_ref: 888b29856385cf89ccbdcb4d7023faee2e1b066e
+galoy_git_ref: a2ab6e3912ebae6b517480c0317f576dfd13d50e