diff --git a/charts/galoy/Chart.yaml b/charts/galoy/Chart.yaml
index a56ee16acd..1c549c5854 100644
--- a/charts/galoy/Chart.yaml
+++ b/charts/galoy/Chart.yaml
@@ -16,7 +16,7 @@ version: 0.29.2-dev
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.17.12
+appVersion: 0.18.0
 dependencies:
   - name: redis
     repository: https://charts.bitnami.com/bitnami
diff --git a/charts/galoy/apollo-router/public-schema.graphql b/charts/galoy/apollo-router/public-schema.graphql
index 4cc6a86bd0..7cc1dd33c0 100644
--- a/charts/galoy/apollo-router/public-schema.graphql
+++ b/charts/galoy/apollo-router/public-schema.graphql
@@ -885,8 +885,8 @@ type Mutation {
   userPhoneDelete: UserPhoneDeletePayload!
   userPhoneRegistrationInitiate(input: UserPhoneRegistrationInitiateInput!): SuccessPayload!
   userPhoneRegistrationValidate(input: UserPhoneRegistrationValidateInput!): UserPhoneRegistrationValidatePayload!
-  userTotpDelete(input: UserTotpDeleteInput!): UserTotpDeletePayload!
-  userTotpRegistrationInitiate(input: UserTotpRegistrationInitiateInput!): UserTotpRegistrationInitiatePayload!
+  userTotpDelete: UserTotpDeletePayload!
+  userTotpRegistrationInitiate: UserTotpRegistrationInitiatePayload!
   userTotpRegistrationValidate(input: UserTotpRegistrationValidateInput!): UserTotpRegistrationValidatePayload!
   userUpdateLanguage(input: UserUpdateLanguageInput!): UserUpdateLanguagePayload!
   userUpdateUsername(input: UserUpdateUsernameInput!): UserUpdateUsernamePayload! @deprecated(reason: "Username will be moved to @Handle in Accounts. Also SetUsername naming should be used instead of UpdateUsername to reflect the idempotency of Handles")
@@ -1545,19 +1545,11 @@ type UserQuizQuestion {
   question: QuizQuestion!
 }
 
-input UserTotpDeleteInput {
-  authToken: AuthToken!
-}
-
 type UserTotpDeletePayload {
   errors: [Error!]!
   me: User
 }
 
-input UserTotpRegistrationInitiateInput {
-  authToken: AuthToken!
-}
-
 type UserTotpRegistrationInitiatePayload {
   errors: [Error!]!
   totpRegistrationId: TotpRegistrationId
@@ -1565,7 +1557,7 @@ type UserTotpRegistrationInitiatePayload {
 }
 
 input UserTotpRegistrationValidateInput {
-  authToken: AuthToken!
+  authToken: AuthToken
   totpCode: TotpCode!
   totpRegistrationId: TotpRegistrationId!
 }
diff --git a/charts/galoy/apollo-router/supergraph.graphql b/charts/galoy/apollo-router/supergraph.graphql
index 1e8aeaedf0..ae9158778c 100644
--- a/charts/galoy/apollo-router/supergraph.graphql
+++ b/charts/galoy/apollo-router/supergraph.graphql
@@ -1145,8 +1145,8 @@ type Mutation
   userPhoneDelete: UserPhoneDeletePayload! @join__field(graph: PUBLIC)
   userPhoneRegistrationInitiate(input: UserPhoneRegistrationInitiateInput!): SuccessPayload! @join__field(graph: PUBLIC)
   userPhoneRegistrationValidate(input: UserPhoneRegistrationValidateInput!): UserPhoneRegistrationValidatePayload! @join__field(graph: PUBLIC)
-  userTotpDelete(input: UserTotpDeleteInput!): UserTotpDeletePayload! @join__field(graph: PUBLIC)
-  userTotpRegistrationInitiate(input: UserTotpRegistrationInitiateInput!): UserTotpRegistrationInitiatePayload! @join__field(graph: PUBLIC)
+  userTotpDelete: UserTotpDeletePayload! @join__field(graph: PUBLIC)
+  userTotpRegistrationInitiate: UserTotpRegistrationInitiatePayload! @join__field(graph: PUBLIC)
   userTotpRegistrationValidate(input: UserTotpRegistrationValidateInput!): UserTotpRegistrationValidatePayload! @join__field(graph: PUBLIC)
   userUpdateLanguage(input: UserUpdateLanguageInput!): UserUpdateLanguagePayload! @join__field(graph: PUBLIC)
   userUpdateUsername(input: UserUpdateUsernameInput!): UserUpdateUsernamePayload! @join__field(graph: PUBLIC) @deprecated(reason: "Username will be moved to @Handle in Accounts. Also SetUsername naming should be used instead of UpdateUsername to reflect the idempotency of Handles")
@@ -1979,12 +1979,6 @@ type UserQuizQuestion
   question: QuizQuestion!
 }
 
-input UserTotpDeleteInput
-  @join__type(graph: PUBLIC)
-{
-  authToken: AuthToken!
-}
-
 type UserTotpDeletePayload
   @join__type(graph: PUBLIC)
 {
@@ -1992,12 +1986,6 @@ type UserTotpDeletePayload
   me: User
 }
 
-input UserTotpRegistrationInitiateInput
-  @join__type(graph: PUBLIC)
-{
-  authToken: AuthToken!
-}
-
 type UserTotpRegistrationInitiatePayload
   @join__type(graph: PUBLIC)
 {
@@ -2009,7 +1997,7 @@ type UserTotpRegistrationInitiatePayload
 input UserTotpRegistrationValidateInput
   @join__type(graph: PUBLIC)
 {
-  authToken: AuthToken!
+  authToken: AuthToken
   totpCode: TotpCode!
   totpRegistrationId: TotpRegistrationId!
 }
diff --git a/charts/galoy/values.yaml b/charts/galoy/values.yaml
index 035098aacf..7b724995aa 100644
--- a/charts/galoy/values.yaml
+++ b/charts/galoy/values.yaml
@@ -36,31 +36,31 @@ galoy:
       repository: us.gcr.io/galoy-org/galoy-api
       ## Digest of the image
       ##
-      digest: "sha256:d206d4abcb70ac2da625be1313b34383c1fec4280839b2d19333649777afd2ed"
+      digest: "sha256:507b418e684d8b8d6e528d18f64a97878b7bcf1cd51d7ff0e002f8222ed1d45d"
       ## Not used by Helm, just used to ref to the source https://github.com/GaloyMoney/galoy.git
       ## Reference for timestamping the corresponding docker image and used by internal CI.
       ##
-      git_ref: "fc8c308"
+      git_ref: "cc990bc"
     websocket:
       repository: us.gcr.io/galoy-org/galoy-api-ws-server
       ## Digest of the image
       ##
-      digest: "sha256:35c54630190aaa4b9a3c2f11f0b08dcfed104bdeb39dd2d984e7f997a6baeb8e"
+      digest: "sha256:b3c4bf4e37e4f7c0bf4a8264fae9fb049b7a10c5aa2402e8d5bd5d74f5530249"
     trigger:
       repository: us.gcr.io/galoy-org/galoy-api-trigger
       ## Digest of the image
       ##
-      digest: "sha256:8fbc39f1d57a3101bd7abd05612e00e5e084952eecc8647fe099036d2e738ca9"
+      digest: "sha256:70e1cdd52fc5eb7cc3aae0b1f282b05c6a0e97501497d8f1c25e9154930ff5a0"
     cron:
       repository: us.gcr.io/galoy-org/galoy-api-cron
       ## Digest of the image
       ##
-      digest: "sha256:ef97b08c0b28502be9fd0d082f8250c8bdf19db02f4e35a86f0657f670e6f2a5"
+      digest: "sha256:e094fd9ca0c1a327e7c5ea2aae160b7cb0f1dd9b22d91245baf418e3a5be7578"
     exporter:
       repository: us.gcr.io/galoy-org/galoy-api-exporter
       ## Digest of the image
       ##
-      digest: "sha256:3700fa99b6abb9851f5b56dd33ae62e9174926843fca843878bce528f6c26135"
+      digest: "sha256:1b59a605bd71d3e9294ff318968ee2cc3f02f8041c117eb39681db47d9168402"
     consent:
       repository: us.gcr.io/galoy-org/galoy-consent
       ## Digest of the image
@@ -70,7 +70,7 @@ galoy:
       repository: us.gcr.io/galoy-org/galoy-api-keys
       ## Digest of the image
       ##
-      digest: "sha256:c6ea9b4df988137d35dcb37af82bfae02351f24d80528baa5f12af6d59555c0b" # METADATA:: repository=https://github.com/GaloyMoney/galoy;commit_ref=4242d78;app=api-keys;
+      digest: "sha256:5f2f81a40115fb403ea737858d8839f469ba5341dfb42bc43326d06c7ea34303" # METADATA:: repository=https://github.com/GaloyMoney/galoy;commit_ref=4242d78;app=api-keys;
     ## Galoy Application MongoDB Migration Image details
     ##
     mongodbMigrate:
@@ -79,7 +79,7 @@ galoy:
       repository: us.gcr.io/galoy-org/galoy-app-migrate
       ## Digest of the image
       ##
-      digest: "sha256:eeb3c7c158e198197bed89e9a75b7753cabec7a8439cdee3d3585d0e886d7c2d"
+      digest: "sha256:7f9fb0a83657ef3b2d87f975125ec230e37a5dd27cf44da55882beab7f020f44"
     ## Galoy Application MongoDB Backup Image details
     ##
     mongoBackup: