diff --git a/quickstart/dev/apollo-federation/supergraph.graphql b/quickstart/dev/apollo-federation/supergraph.graphql
index 7a459a2bf8..2309908466 100644
--- a/quickstart/dev/apollo-federation/supergraph.graphql
+++ b/quickstart/dev/apollo-federation/supergraph.graphql
@@ -160,11 +160,11 @@ type ApiKey
 {
   id: ID!
   name: String!
-  createdAt: DateTime!
+  createdAt: Timestamp!
   revoked: Boolean!
   expired: Boolean!
-  lastUsedAt: DateTime
-  expiresAt: DateTime!
+  lastUsedAt: Timestamp
+  expiresAt: Timestamp!
 }
 
 input ApiKeyCreateInput
@@ -398,14 +398,6 @@ type Currency
   symbol: String!
 }
 
-"""
-Implement the DateTime<Utc> scalar
-
-The input/output is a string in RFC3339 format.
-"""
-scalar DateTime
-  @join__type(graph: API_KEYS)
-
 type DepositFeesInformation
   @join__type(graph: PUBLIC)
 {
@@ -1537,6 +1529,7 @@ type SuccessPayload
 Timestamp field, serialized as Unix time (the number of seconds since the Unix epoch)
 """
 scalar Timestamp
+  @join__type(graph: API_KEYS)
   @join__type(graph: PUBLIC)
 
 """A time-based one-time password"""
diff --git a/quickstart/docker-compose.tmpl.yml b/quickstart/docker-compose.tmpl.yml
index 7c16404b17..65d3835288 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@6bc9a9882585c7273e421a3e5f7eedc1ca784369b3a3d68ec79068e7d500eee5"
-#@ galoy_trigger_image_digest = "sha256@ddc1d5f25d281b09709001b67d6b57c716dd584b2d1cefaf495953822fca788b"
-#@ mongodb_migrate_image_digest = "sha256@56bb9ec42cce38d37bb1f0d6b9ee108cb78aeb5bec6c6be7ed100318eeb079bc"
+#@ galoy_api_image_digest = "sha256@81b55f264725ca5a6274b0ba0fe3536c5006a99aaafafb04d22420f099294d88"
+#@ galoy_trigger_image_digest = "sha256@aaa63dab3abd8bf22f7e3ad56031b238bcd00800a270370f89a019d2e90c7469"
+#@ mongodb_migrate_image_digest = "sha256@dd4a2ad7d031704acca1eb705aa01529695ddcc533f4e275442b0c4e9b37babf"
 
 version: #@ data.values.version
 services:
diff --git a/quickstart/docker-compose.yml b/quickstart/docker-compose.yml
index 645f107cb5..317be1167b 100644
--- a/quickstart/docker-compose.yml
+++ b/quickstart/docker-compose.yml
@@ -97,7 +97,7 @@ services:
     ports:
     - 5434:5432
   galoy:
-    image: us.gcr.io/galoy-org/galoy-api@sha256:6bc9a9882585c7273e421a3e5f7eedc1ca784369b3a3d68ec79068e7d500eee5
+    image: us.gcr.io/galoy-org/galoy-api@sha256:81b55f264725ca5a6274b0ba0fe3536c5006a99aaafafb04d22420f099294d88
     env_file: ${HOST_PROJECT_PATH:-.}/${GALOY_QUICKSTART_PATH:-vendor/galoy-quickstart}/.env.galoy
     depends_on:
     - trigger
@@ -115,7 +115,7 @@ services:
         aliases:
         - bats-tests
   trigger:
-    image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:ddc1d5f25d281b09709001b67d6b57c716dd584b2d1cefaf495953822fca788b
+    image: us.gcr.io/galoy-org/galoy-api-trigger@sha256:aaa63dab3abd8bf22f7e3ad56031b238bcd00800a270370f89a019d2e90c7469
     env_file: ${HOST_PROJECT_PATH:-.}/${GALOY_QUICKSTART_PATH:-vendor/galoy-quickstart}/.env.galoy
     depends_on:
     - lnd1
@@ -136,7 +136,7 @@ services:
     - MONGODB_ADVERTISED_HOSTNAME=127.0.0.1
     - MONGO_INITDB_DATABASE=galoy
   mongodb-migrate:
-    image: us.gcr.io/galoy-org/galoy-app-migrate@sha256:56bb9ec42cce38d37bb1f0d6b9ee108cb78aeb5bec6c6be7ed100318eeb079bc
+    image: us.gcr.io/galoy-org/galoy-app-migrate@sha256:dd4a2ad7d031704acca1eb705aa01529695ddcc533f4e275442b0c4e9b37babf
     depends_on:
     - mongodb
     environment:
diff --git a/quickstart/galoy/dev/apollo-federation/supergraph.graphql b/quickstart/galoy/dev/apollo-federation/supergraph.graphql
index 7a459a2bf8..2309908466 100644
--- a/quickstart/galoy/dev/apollo-federation/supergraph.graphql
+++ b/quickstart/galoy/dev/apollo-federation/supergraph.graphql
@@ -160,11 +160,11 @@ type ApiKey
 {
   id: ID!
   name: String!
-  createdAt: DateTime!
+  createdAt: Timestamp!
   revoked: Boolean!
   expired: Boolean!
-  lastUsedAt: DateTime
-  expiresAt: DateTime!
+  lastUsedAt: Timestamp
+  expiresAt: Timestamp!
 }
 
 input ApiKeyCreateInput
@@ -398,14 +398,6 @@ type Currency
   symbol: String!
 }
 
-"""
-Implement the DateTime<Utc> scalar
-
-The input/output is a string in RFC3339 format.
-"""
-scalar DateTime
-  @join__type(graph: API_KEYS)
-
 type DepositFeesInformation
   @join__type(graph: PUBLIC)
 {
@@ -1537,6 +1529,7 @@ type SuccessPayload
 Timestamp field, serialized as Unix time (the number of seconds since the Unix epoch)
 """
 scalar Timestamp
+  @join__type(graph: API_KEYS)
   @join__type(graph: PUBLIC)
 
 """A time-based one-time password"""
diff --git a/quickstart/vendir.lock.yml b/quickstart/vendir.lock.yml
index 5cfb646e00..95c5c95262 100644
--- a/quickstart/vendir.lock.yml
+++ b/quickstart/vendir.lock.yml
@@ -2,26 +2,26 @@ apiVersion: vendir.k14s.io/v1alpha1
 directories:
 - contents:
   - git:
-      commitTitle: 'chore(dashboard): create api key expires in ui (#3502)...'
-      sha: 808444d1926ae373e562f4303c7793dea489bb88
+      commitTitle: 'refactor: change DateTime types to Timestamp in schema (#3501)...'
+      sha: a41b6dcf67cc12b9b308bc1ea3729237f852a125
       tags:
-      - 0.15.92-1-g808444d19
+      - 0.15.93-2-ga41b6dcf6
     path: ./
   path: dev
 - contents:
   - git:
-      commitTitle: 'chore(dashboard): create api key expires in ui (#3502)...'
-      sha: 808444d1926ae373e562f4303c7793dea489bb88
+      commitTitle: 'refactor: change DateTime types to Timestamp in schema (#3501)...'
+      sha: a41b6dcf67cc12b9b308bc1ea3729237f852a125
       tags:
-      - 0.15.92-1-g808444d19
+      - 0.15.93-2-ga41b6dcf6
     path: ./
   path: ./galoy
 - contents:
   - git:
-      commitTitle: 'chore(dashboard): create api key expires in ui (#3502)...'
-      sha: 808444d1926ae373e562f4303c7793dea489bb88
+      commitTitle: 'refactor: change DateTime types to Timestamp in schema (#3501)...'
+      sha: a41b6dcf67cc12b9b308bc1ea3729237f852a125
       tags:
-      - 0.15.92-1-g808444d19
+      - 0.15.93-2-ga41b6dcf6
     path: ./
   path: ./graphql
 kind: LockConfig
diff --git a/quickstart/vendir.yml b/quickstart/vendir.yml
index 1bf379ba88..dc40faf5bc 100644
--- a/quickstart/vendir.yml
+++ b/quickstart/vendir.yml
@@ -6,7 +6,7 @@ directories:
   - path: ./
     git:
       url: https://github.com/GaloyMoney/galoy.git
-      ref: 808444d1926ae373e562f4303c7793dea489bb88
+      ref: a41b6dcf67cc12b9b308bc1ea3729237f852a125
     includePaths:
     - core/api/dev/**/*
     excludePaths:
@@ -18,7 +18,7 @@ directories:
   - path: ./
     git:
       url: https://github.com/GaloyMoney/galoy.git
-      ref: 808444d1926ae373e562f4303c7793dea489bb88
+      ref: a41b6dcf67cc12b9b308bc1ea3729237f852a125
     includePaths:
     - core/api/dev/**/*
     - core/api/test/bats/bitcoind_signer_descriptors.json
@@ -36,7 +36,7 @@ directories:
   - path: ./
     git:
       url: https://github.com/GaloyMoney/galoy.git
-      ref: 808444d1926ae373e562f4303c7793dea489bb88
+      ref: a41b6dcf67cc12b9b308bc1ea3729237f852a125
     includePaths:
     - core/api/src/graphql/public/schema.graphql
     - core/api/src/graphql/admin/schema.graphql
diff --git a/quickstart/vendir/values.yml b/quickstart/vendir/values.yml
index d7152db77b..50fd2f4f10 100644
--- a/quickstart/vendir/values.yml
+++ b/quickstart/vendir/values.yml
@@ -1,3 +1,3 @@
 #@data/values
 ---
-galoy_git_ref: 808444d1926ae373e562f4303c7793dea489bb88
+galoy_git_ref: a41b6dcf67cc12b9b308bc1ea3729237f852a125