diff --git a/.github/ISSUE_TEMPLATE/release-a-new-version.md b/.github/ISSUE_TEMPLATE/release-a-new-version.md
index ac0a200eeb..586c5cf1bd 100644
--- a/.github/ISSUE_TEMPLATE/release-a-new-version.md
+++ b/.github/ISSUE_TEMPLATE/release-a-new-version.md
@@ -26,7 +26,5 @@ assignees: ''
 - [ ] If necessary, update the badges versions in [docs/00 - Stellar Anchor Platform.md].
 - [ ] Create the pull request `release/2.2.x -> main`: this should require two approvals. DO NOT squash merge.
 - [ ] Create another pull request `release/2.2.x -> develop`: AFTER the release branch is merged with the `main` branch. DO NOT squash merge.
-- [ ] (Optional) You'll need to manually publish a new version of the SDK to [Maven Central](https://search.maven.org/search?q=g:org.stellar.anchor-sdk).
-- [ ] (Optional) You'll need to manually upload the jar file from [Maven Central](https://search.maven.org/search?q=g:org.stellar.anchor-sdk) to the GH release.
-- [ ] (Optional) If necessary, open a PR for stellar/helm-charts and [update with the latest helm chart](https://docs.google.com/document/d/10ujUQZvBCMUyciObQPouxjtlnOdI5OpAz2Pk1LFdDDE) to publish
-- [ ] (Optional) Bump helm chart version.
+- [ ] (Optional) Generate the new Anchor Platform documentation version in the stellar-docs repository if this is a new major or minor version.
+- [ ] (Optional) You'll need to manually publish a new version of the SDK to [Maven Central](https://search.maven.org/search?q=g:org.stellar.anchor-sdk) in the `legacy/release-1.0`.
diff --git a/.github/workflows/sub_essential_tests.yml b/.github/workflows/sub_essential_tests.yml
index 6b0b1c250f..ca4cf119d9 100644
--- a/.github/workflows/sub_essential_tests.yml
+++ b/.github/workflows/sub_essential_tests.yml
@@ -50,10 +50,10 @@ jobs:
       - name: Pull Stellar Validation Tests Docker Image
         run: docker pull stellar/anchor-tests:latest &
 
-      - name: Run Kafka, Postgres, and Sep24 UI with docker-compose
+      - name: Run Kafka, Postgres, and Sep24 UI with docker compose
         env:
           TEST_PROFILE_NAME: default
-        run: docker-compose -f /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/docker-compose-test.yaml up -d --build
+        run: docker compose -f /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/docker-compose-test.yaml up -d --build
 
       - name: Run sep server, platform server, observer, and reference servers for integration tests
         env:
diff --git a/.github/workflows/sub_extended_tests.yml b/.github/workflows/sub_extended_tests.yml
index 567d935974..90aac095fb 100644
--- a/.github/workflows/sub_extended_tests.yml
+++ b/.github/workflows/sub_extended_tests.yml
@@ -46,8 +46,8 @@ jobs:
 
       #############################################
 
-      - name: Run Kafka, Postgres, and Sep24 UI with docker-compose
-        run: docker-compose -f /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/docker-compose-test.yaml up -d --build
+      - name: Run Kafka, Postgres, and Sep24 UI with docker compose
+        run: docker compose -f /home/runner/java-stellar-anchor-sdk/service-runner/src/main/resources/docker-compose-test.yaml up -d --build
 
       # `custody` Tests
       - name: Start `custody` configuration
diff --git a/.run/Custody Server_ custody.run.xml b/.run/Custody Server_ custody.run.xml
index 6d72f93a07..f522449602 100644
--- a/.run/Custody Server_ custody.run.xml	
+++ b/.run/Custody Server_ custody.run.xml	
@@ -1,8 +1,18 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Custody Server: custody" type="JetRunConfigurationType">
+  <configuration default="false" name="Custody Server: custody" type="JetRunConfigurationType" folderName="Run Single Server">
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunCustodyServer" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Docker - Run Dev Stack - Zookeeper, Kafka, Postgres, SEP24 Reference UI.run.xml b/.run/Docker - Run Dev Stack - Kafka, Postgres, SEP24 Reference UI.run.xml
similarity index 88%
rename from .run/Docker - Run Dev Stack - Zookeeper, Kafka, Postgres, SEP24 Reference UI.run.xml
rename to .run/Docker - Run Dev Stack - Kafka, Postgres, SEP24 Reference UI.run.xml
index 8a38ad2042..2ea0db794d 100644
--- a/.run/Docker - Run Dev Stack - Zookeeper, Kafka, Postgres, SEP24 Reference UI.run.xml	
+++ b/.run/Docker - Run Dev Stack - Kafka, Postgres, SEP24 Reference UI.run.xml	
@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="Docker - Run Dev Stack - Kafka, Postgres, SEP24 Reference UI" type="JetRunConfigurationType">
+    <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="true" />
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunDockerDevStack" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
diff --git a/.run/Event Processing Server_ default.run.xml b/.run/Event Processing Server_ default.run.xml
index 9ca7ce2bd0..8941e7ab73 100644
--- a/.run/Event Processing Server_ default.run.xml	
+++ b/.run/Event Processing Server_ default.run.xml	
@@ -1,8 +1,18 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Event Processing Server: default" type="JetRunConfigurationType">
+  <configuration default="false" name="Event Processing Server: default" type="JetRunConfigurationType" folderName="Run Single Server">
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunEventProcessingServer" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Platform Server_ default.run.xml b/.run/Platform Server_ default.run.xml
index 62fd8e2aa7..f070338b8a 100644
--- a/.run/Platform Server_ default.run.xml	
+++ b/.run/Platform Server_ default.run.xml	
@@ -1,8 +1,18 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Platform Server: default" type="JetRunConfigurationType">
+  <configuration default="false" name="Platform Server: default" type="JetRunConfigurationType" folderName="Run Single Server">
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunPlatformServer" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Reference Server_ default.run.xml b/.run/Reference Server_ default.run.xml
index 8a9b0b68ce..66b6680ca5 100644
--- a/.run/Reference Server_ default.run.xml	
+++ b/.run/Reference Server_ default.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Reference Server: default" type="JetRunConfigurationType">
+  <configuration default="false" name="Reference Server: default" type="JetRunConfigurationType" folderName="Run Single Server">
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="default" />
@@ -8,6 +8,16 @@
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunKotlinReferenceServer" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Sep Server_ default.run.xml b/.run/Sep Server_ default.run.xml
index f79a2712c6..e74e3532b9 100644
--- a/.run/Sep Server_ default.run.xml	
+++ b/.run/Sep Server_ default.run.xml	
@@ -1,8 +1,18 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Sep Server: default" type="JetRunConfigurationType">
+  <configuration default="false" name="Sep Server: default" type="JetRunConfigurationType" folderName="Run Single Server">
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunSepServer" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Stellar Observer_ default.run.xml b/.run/Stellar Observer_ default.run.xml
index 1e4905519f..59de80970b 100644
--- a/.run/Stellar Observer_ default.run.xml	
+++ b/.run/Stellar Observer_ default.run.xml	
@@ -1,8 +1,18 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Stellar Observer: default" type="JetRunConfigurationType">
+  <configuration default="false" name="Stellar Observer: default" type="JetRunConfigurationType" folderName="Run Single Server">
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunStellarObserver" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Test Profile_ auth-apikey-custody.run.xml b/.run/Test Profile_ auth-apikey-custody.run.xml
index 824c34855d..67a70bf685 100644
--- a/.run/Test Profile_ auth-apikey-custody.run.xml	
+++ b/.run/Test Profile_ auth-apikey-custody.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test Profile: auth-apikey-custody" type="JetRunConfigurationType">
+  <configuration default="false" name="Test Profile: auth-apikey-custody" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="auth-apikey-custody" />
@@ -8,6 +8,16 @@
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Test Profile_ auth-apikey-platform.run.xml b/.run/Test Profile_ auth-apikey-platform.run.xml
index 7fe68844cb..554a8220fb 100644
--- a/.run/Test Profile_ auth-apikey-platform.run.xml	
+++ b/.run/Test Profile_ auth-apikey-platform.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test Profile: auth-apikey-platform" type="JetRunConfigurationType">
+  <configuration default="false" name="Test Profile: auth-apikey-platform" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="auth-apikey-platform" />
@@ -8,6 +8,16 @@
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Test Profile_ auth-jwt-custody.run.xml b/.run/Test Profile_ auth-jwt-custody.run.xml
index 44eaf80a43..4ca58cc0eb 100644
--- a/.run/Test Profile_ auth-jwt-custody.run.xml	
+++ b/.run/Test Profile_ auth-jwt-custody.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test Profile: auth-jwt-custody" type="JetRunConfigurationType">
+  <configuration default="false" name="Test Profile: auth-jwt-custody" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="auth-jwt-custody" />
@@ -8,6 +8,16 @@
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Test Profile_ auth-jwt-platform.run.xml b/.run/Test Profile_ auth-jwt-platform.run.xml
index b28bcd511e..d9f113c516 100644
--- a/.run/Test Profile_ auth-jwt-platform.run.xml	
+++ b/.run/Test Profile_ auth-jwt-platform.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test Profile: auth-jwt-platform" type="JetRunConfigurationType">
+  <configuration default="false" name="Test Profile: auth-jwt-platform" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="auth-jwt-platform" />
@@ -8,6 +8,16 @@
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Test Profile_ custody.run.xml b/.run/Test Profile_ custody.run.xml
index f657d07f2b..a544e1b596 100644
--- a/.run/Test Profile_ custody.run.xml	
+++ b/.run/Test Profile_ custody.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test Profile: custody" type="JetRunConfigurationType">
+  <configuration default="false" name="Test Profile: custody" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="custody" />
@@ -8,6 +8,16 @@
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Test Profile_ default.run.xml b/.run/Test Profile_ default.run.xml
index 661d5d2c8b..d64910eab6 100644
--- a/.run/Test Profile_ default.run.xml	
+++ b/.run/Test Profile_ default.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test Profile: default" type="JetRunConfigurationType">
+  <configuration default="false" name="Test Profile: default" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yaml" />
@@ -7,6 +7,16 @@
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Test Profile_ host.docker.internal.run.xml b/.run/Test Profile_ host.docker.internal.run.xml
index 5c332ea84d..0f538844b0 100644
--- a/.run/Test Profile_ host.docker.internal.run.xml	
+++ b/.run/Test Profile_ host.docker.internal.run.xml	
@@ -1,11 +1,21 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test Profile: host.docker.internal" type="JetRunConfigurationType">
+  <configuration default="false" name="Test Profile: host.docker.internal" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
       <env name=";KT_REFERENCE_SERVER_CONFIG" value="service-runner/src/main/resources/config/reference-config.yamlTEST_PROFILE_NAME=host-docker-internal" />
     </envs>
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Test Profile_ rpc.run.xml b/.run/Test Profile_ rpc.run.xml
index 14259d3b9a..cc0646185d 100644
--- a/.run/Test Profile_ rpc.run.xml	
+++ b/.run/Test Profile_ rpc.run.xml	
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Test Profile: rpc" type="JetRunConfigurationType">
+  <configuration default="false" name="Test Profile: rpc" type="JetRunConfigurationType" folderName="Run Test Profile">
     <envs>
       <env name="app.enableTest" value="true" />
       <env name="TEST_PROFILE_NAME" value="rpc" />
@@ -8,6 +8,16 @@
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunTestProfile" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/.run/Wallet Reference Server_ default.run.xml b/.run/Wallet Reference Server_ default.run.xml
index 65abfc5869..5bee1d1c5b 100644
--- a/.run/Wallet Reference Server_ default.run.xml	
+++ b/.run/Wallet Reference Server_ default.run.xml	
@@ -1,8 +1,18 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Wallet Reference Server: default" type="JetRunConfigurationType">
+  <configuration default="false" name="Wallet Reference Server: default" type="JetRunConfigurationType" folderName="Run Single Server">
     <option name="MAIN_CLASS_NAME" value="org.stellar.anchor.platform.run_profiles.RunWalletServer" />
     <module name="java-stellar-anchor-sdk.service-runner.main" />
     <shortenClasspath name="ARGS_FILE" />
+    <extension name="net.ashald.envfile">
+      <option name="IS_ENABLED" value="false" />
+      <option name="IS_SUBST" value="false" />
+      <option name="IS_PATH_MACRO_SUPPORTED" value="false" />
+      <option name="IS_IGNORE_MISSING_FILES" value="false" />
+      <option name="IS_ENABLE_EXPERIMENTAL_INTEGRATIONS" value="false" />
+      <ENTRIES>
+        <ENTRY IS_ENABLED="true" PARSER="runconfig" IS_EXECUTABLE="false" />
+      </ENTRIES>
+    </extension>
     <method v="2">
       <option name="Make" enabled="true" />
     </method>
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/callback/GetRateRequest.java b/api-schema/src/main/java/org/stellar/anchor/api/callback/GetRateRequest.java
index ada4585ad9..cfa1df46e3 100644
--- a/api-schema/src/main/java/org/stellar/anchor/api/callback/GetRateRequest.java
+++ b/api-schema/src/main/java/org/stellar/anchor/api/callback/GetRateRequest.java
@@ -1,8 +1,10 @@
 package org.stellar.anchor.api.callback;
 
 import com.google.gson.annotations.SerializedName;
+import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 /**
  * The request body of GET /rate endpoint.
@@ -12,6 +14,8 @@
  *     API</a>
  */
 @Data
+@NoArgsConstructor
+@AllArgsConstructor
 @Builder
 public class GetRateRequest {
   Type type;
@@ -43,8 +47,6 @@ public class GetRateRequest {
   @SerializedName("client_id")
   String clientId;
 
-  String id;
-
   public enum Type {
     @SerializedName("indicative")
     INDICATIVE("indicative"),
@@ -58,6 +60,15 @@ public enum Type {
       this.name = name;
     }
 
+    public static Type from(String name) {
+      for (Type type : values()) {
+        if (type.name.equals(name)) {
+          return type;
+        }
+      }
+      throw new RuntimeException("Invalid type: " + name);
+    }
+
     @Override
     public String toString() {
       return name;
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/callback/SendEventRequestPayload.java b/api-schema/src/main/java/org/stellar/anchor/api/callback/SendEventRequestPayload.java
index 4785202b20..71cc22847e 100644
--- a/api-schema/src/main/java/org/stellar/anchor/api/callback/SendEventRequestPayload.java
+++ b/api-schema/src/main/java/org/stellar/anchor/api/callback/SendEventRequestPayload.java
@@ -26,7 +26,10 @@ public static SendEventRequestPayload from(AnchorEvent event) {
     SendEventRequestPayload payload = new SendEventRequestPayload();
     switch (event.getType()) {
       case CUSTOMER_UPDATED:
-        payload.setCustomer(event.getCustomer());
+        payload.setCustomer(
+            event.getCustomer() != null
+                ? CustomerUpdatedResponse.builder().id(event.getCustomer().getId()).build()
+                : null);
       case QUOTE_CREATED:
         payload.setQuote(event.getQuote());
       case TRANSACTION_CREATED:
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/event/AnchorEvent.java b/api-schema/src/main/java/org/stellar/anchor/api/event/AnchorEvent.java
index 096cb200eb..5dcf2fe78d 100644
--- a/api-schema/src/main/java/org/stellar/anchor/api/event/AnchorEvent.java
+++ b/api-schema/src/main/java/org/stellar/anchor/api/event/AnchorEvent.java
@@ -2,16 +2,13 @@
 
 import com.google.gson.annotations.SerializedName;
 import lombok.*;
-import org.stellar.anchor.api.platform.CustomerUpdatedResponse;
 import org.stellar.anchor.api.platform.GetQuoteResponse;
 import org.stellar.anchor.api.platform.GetTransactionResponse;
+import org.stellar.anchor.api.sep.sep12.Sep12GetCustomerResponse;
 
 /**
- * The Event object is used for event notification.
- *
- * @see <a
- *     href="https://github.com/stellar/stellar-docs/blob/main/openapi/anchor-platform/Events%20Schema.yml">Events
- *     Schema</a>
+ * The internal event object is used for event notification. They should be mapped to the
+ * appropriate schemas for the API and status callback use cases.
  */
 @Builder
 @Data
@@ -23,7 +20,7 @@ public class AnchorEvent {
   String sep;
   GetTransactionResponse transaction;
   GetQuoteResponse quote;
-  CustomerUpdatedResponse customer;
+  Sep12GetCustomerResponse customer;
 
   public enum Type {
     @SerializedName("transaction_created")
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/platform/PlatformTransactionData.java b/api-schema/src/main/java/org/stellar/anchor/api/platform/PlatformTransactionData.java
index cd127ee000..5b62317168 100644
--- a/api-schema/src/main/java/org/stellar/anchor/api/platform/PlatformTransactionData.java
+++ b/api-schema/src/main/java/org/stellar/anchor/api/platform/PlatformTransactionData.java
@@ -124,6 +124,8 @@ public class PlatformTransactionData {
   public enum Sep {
     @SerializedName("6")
     SEP_6(6),
+    @SerializedName("12")
+    SEP_12(12),
     @SuppressWarnings("unused")
     @SerializedName("24")
     SEP_24(24),
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/NotifyCustomerInfoUpdatedRequest.java b/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/NotifyCustomerInfoUpdatedRequest.java
index 4b76bef0f1..f60dd0ba5c 100644
--- a/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/NotifyCustomerInfoUpdatedRequest.java
+++ b/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/NotifyCustomerInfoUpdatedRequest.java
@@ -1,5 +1,6 @@
 package org.stellar.anchor.api.rpc.method;
 
+import com.google.gson.annotations.SerializedName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -9,4 +10,10 @@
 @SuperBuilder
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper = false)
-public class NotifyCustomerInfoUpdatedRequest extends RpcMethodParamsRequest {}
+public class NotifyCustomerInfoUpdatedRequest extends RpcMethodParamsRequest {
+  @SerializedName("customer_id")
+  String customerId;
+
+  @SerializedName("customer_type")
+  String customerType;
+}
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/RequestCustomerInfoUpdateRequest.java b/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/RequestCustomerInfoUpdateRequest.java
index f9e17cbca1..ceffc7ca01 100644
--- a/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/RequestCustomerInfoUpdateRequest.java
+++ b/api-schema/src/main/java/org/stellar/anchor/api/rpc/method/RequestCustomerInfoUpdateRequest.java
@@ -9,6 +9,7 @@
 import lombok.experimental.SuperBuilder;
 import org.stellar.anchor.api.rpc.method.features.SupportsUserActionRequiredBy;
 
+@Deprecated(since = "3.0") // ANCHOR-777
 @Data
 @SuperBuilder
 @AllArgsConstructor
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/sep/sep24/TransactionResponse.java b/api-schema/src/main/java/org/stellar/anchor/api/sep/sep24/TransactionResponse.java
index 5db4814578..6d207d57c7 100644
--- a/api-schema/src/main/java/org/stellar/anchor/api/sep/sep24/TransactionResponse.java
+++ b/api-schema/src/main/java/org/stellar/anchor/api/sep/sep24/TransactionResponse.java
@@ -43,6 +43,9 @@ public class TransactionResponse {
   @SerializedName("fee_details")
   FeeDetails feeDetails;
 
+  @SerializedName("quote_id")
+  String quoteId;
+
   @SerializedName("started_at")
   Instant startedAt;
 
diff --git a/api-schema/src/main/java/org/stellar/anchor/api/sep/sep31/Sep31GetTransactionResponse.java b/api-schema/src/main/java/org/stellar/anchor/api/sep/sep31/Sep31GetTransactionResponse.java
index e2c19b8830..4c333a5f9a 100644
--- a/api-schema/src/main/java/org/stellar/anchor/api/sep/sep31/Sep31GetTransactionResponse.java
+++ b/api-schema/src/main/java/org/stellar/anchor/api/sep/sep31/Sep31GetTransactionResponse.java
@@ -51,6 +51,9 @@ public static class TransactionResponse {
     @SerializedName("fee_details")
     FeeDetails feeDetails;
 
+    @SerializedName("quote_id")
+    String quoteId;
+
     @SerializedName("amount_fee_asset")
     String amountFeeAsset;
 
diff --git a/build.gradle.kts b/build.gradle.kts
index 31fdc3b97c..7b9e1d4b9a 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -161,7 +161,7 @@ subprojects {
 
 allprojects {
   group = "org.stellar.anchor-sdk"
-  version = "2.8.4"
+  version = "2.9.0"
 
   tasks.jar {
     manifest {
diff --git a/core/src/main/java/org/stellar/anchor/config/ClientsConfig.java b/core/src/main/java/org/stellar/anchor/config/ClientsConfig.java
index 66a55d4072..6bf2727157 100644
--- a/core/src/main/java/org/stellar/anchor/config/ClientsConfig.java
+++ b/core/src/main/java/org/stellar/anchor/config/ClientsConfig.java
@@ -2,13 +2,16 @@
 
 import java.util.Set;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.StringUtils;
 
 public interface ClientsConfig {
   @Data
   @AllArgsConstructor
   @NoArgsConstructor
+  @Builder
   class ClientConfig {
     String name;
     ClientType type;
@@ -16,9 +19,26 @@ class ClientConfig {
     Set<String> signingKeys;
     @Deprecated String domain; // ANCHOR-696
     Set<String> domains;
-    String callbackUrl;
+    @Deprecated String callbackUrl; // ANCHOR-755
+    String callbackUrlSep6;
+    String callbackUrlSep24;
+    String callbackUrlSep31;
+    String callbackUrlSep12;
     boolean allowAnyDestination = false;
     Set<String> destinationAccounts;
+
+    /**
+     * Returns true if any of the callback URLs are set.
+     *
+     * @return true if any of the callback URLs are set
+     */
+    public boolean isCallbackEnabled() {
+      return !(StringUtils.isEmpty(callbackUrl)
+          && StringUtils.isEmpty(callbackUrlSep6)
+          && StringUtils.isEmpty(callbackUrlSep24)
+          && StringUtils.isEmpty(callbackUrlSep31)
+          && StringUtils.isEmpty(callbackUrlSep12));
+    }
   }
 
   enum ClientType {
diff --git a/core/src/main/java/org/stellar/anchor/sep12/Sep12Service.java b/core/src/main/java/org/stellar/anchor/sep12/Sep12Service.java
index b2128d7d3d..502161ea29 100644
--- a/core/src/main/java/org/stellar/anchor/sep12/Sep12Service.java
+++ b/core/src/main/java/org/stellar/anchor/sep12/Sep12Service.java
@@ -1,5 +1,6 @@
 package org.stellar.anchor.sep12;
 
+import static org.stellar.anchor.api.platform.PlatformTransactionData.Sep.SEP_12;
 import static org.stellar.anchor.util.Log.infoF;
 import static org.stellar.anchor.util.MetricConstants.*;
 import static org.stellar.anchor.util.MetricConstants.SEP12_CUSTOMER;
@@ -19,7 +20,6 @@
 import org.stellar.anchor.api.callback.*;
 import org.stellar.anchor.api.event.AnchorEvent;
 import org.stellar.anchor.api.exception.*;
-import org.stellar.anchor.api.platform.CustomerUpdatedResponse;
 import org.stellar.anchor.api.platform.GetTransactionResponse;
 import org.stellar.anchor.api.sep.sep12.*;
 import org.stellar.anchor.apiclient.PlatformApiClient;
@@ -108,14 +108,16 @@ public Sep12PutCustomerResponse putCustomer(Sep10Jwt token, Sep12PutCustomerRequ
 
     PutCustomerResponse response =
         customerIntegration.putCustomer(PutCustomerRequest.from(request));
+    GetCustomerResponse updatedCustomer =
+        customerIntegration.getCustomer(GetCustomerRequest.builder().id(response.getId()).build());
 
     // Only publish event if the customer was updated.
     eventSession.publish(
         AnchorEvent.builder()
             .id(UUID.randomUUID().toString())
-            .sep("12")
+            .sep(SEP_12.getSep().toString())
             .type(AnchorEvent.Type.CUSTOMER_UPDATED)
-            .customer(CustomerUpdatedResponse.builder().id(response.getId()).build())
+            .customer(GetCustomerResponse.to(updatedCustomer))
             .build());
 
     // increment counter
diff --git a/core/src/main/java/org/stellar/anchor/sep24/Sep24Helper.java b/core/src/main/java/org/stellar/anchor/sep24/Sep24Helper.java
index 4fc821bf7f..353cf4d2d1 100644
--- a/core/src/main/java/org/stellar/anchor/sep24/Sep24Helper.java
+++ b/core/src/main/java/org/stellar/anchor/sep24/Sep24Helper.java
@@ -25,6 +25,7 @@ static void setSharedTransactionResponseFields(TransactionResponse txnR, Sep24Tr
     if (txn.getToAccount() != null) txnR.setTo(txn.getToAccount());
     if (txn.getStartedAt() != null) txnR.setStartedAt(txn.getStartedAt());
     if (txn.getCompletedAt() != null) txnR.setCompletedAt(txn.getCompletedAt());
+    if (txn.getQuoteId() != null) txnR.setQuoteId(txn.getQuoteId());
     if (txn.getUserActionRequiredBy() != null)
       txnR.setUserActionRequiredBy(txn.getUserActionRequiredBy());
   }
diff --git a/core/src/main/java/org/stellar/anchor/sep31/Sep31Transaction.java b/core/src/main/java/org/stellar/anchor/sep31/Sep31Transaction.java
index e16bd10e9a..24b9ee1e65 100644
--- a/core/src/main/java/org/stellar/anchor/sep31/Sep31Transaction.java
+++ b/core/src/main/java/org/stellar/anchor/sep31/Sep31Transaction.java
@@ -146,6 +146,7 @@ default Sep31GetTransactionResponse toSep31GetTransactionResponse() {
                 .amountFee(getAmountFee())
                 .amountFeeAsset(getAmountFeeAsset())
                 .feeDetails(getFeeDetails())
+                .quoteId(getQuoteId())
                 .stellarAccountId(getStellarAccountId())
                 .stellarMemo(getStellarMemo())
                 .stellarMemoType(getStellarMemoType())
diff --git a/core/src/main/java/org/stellar/anchor/sep38/Sep38Service.java b/core/src/main/java/org/stellar/anchor/sep38/Sep38Service.java
index 9368e7d8c7..a3c31f7083 100644
--- a/core/src/main/java/org/stellar/anchor/sep38/Sep38Service.java
+++ b/core/src/main/java/org/stellar/anchor/sep38/Sep38Service.java
@@ -9,6 +9,7 @@
 import static org.stellar.anchor.util.MathHelper.formatAmount;
 import static org.stellar.anchor.util.MetricConstants.SEP38_PRICE_QUERIED;
 import static org.stellar.anchor.util.MetricConstants.SEP38_QUOTE_CREATED;
+import static org.stellar.anchor.util.NumberHelper.DEFAULT_ROUNDING_MODE;
 import static org.stellar.anchor.util.SepHelper.validateAmount;
 import static org.stellar.anchor.util.SepHelper.validateAmountLimit;
 import static org.stellar.anchor.util.StringHelper.isNotEmpty;
@@ -16,7 +17,6 @@
 import io.micrometer.core.instrument.Counter;
 import io.micrometer.core.instrument.Metrics;
 import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.time.Instant;
 import java.util.*;
 import org.apache.commons.lang3.StringUtils;
@@ -530,7 +530,7 @@ public Sep38QuoteResponse getQuote(Sep10Jwt token, String quoteId) throws Anchor
 
   private String getTotalPrice(BigDecimal bSellAmount, BigDecimal bBuyAmount) {
     // total_price = sell_amount / buy_amount
-    BigDecimal bTotalPrice = bSellAmount.divide(bBuyAmount, pricePrecision, RoundingMode.FLOOR);
+    BigDecimal bTotalPrice = bSellAmount.divide(bBuyAmount, pricePrecision, DEFAULT_ROUNDING_MODE);
 
     return formatAmount(bTotalPrice, pricePrecision);
   }
diff --git a/core/src/main/java/org/stellar/anchor/sep6/Sep6Service.java b/core/src/main/java/org/stellar/anchor/sep6/Sep6Service.java
index 3f738cc9ec..080fb9afc6 100644
--- a/core/src/main/java/org/stellar/anchor/sep6/Sep6Service.java
+++ b/core/src/main/java/org/stellar/anchor/sep6/Sep6Service.java
@@ -199,6 +199,7 @@ public StartDepositResponse depositExchange(Sep10Jwt token, StartDepositExchange
           exchangeAmountsCalculator.calculateFromQuote(
               request.getQuoteId(), sellAsset, request.getAmount());
     } else {
+      // TODO(philip): remove this
       // If a quote is not provided, set the fee and out amounts to 0.
       // The business server should use the request_offchain_funds RPC to update the amounts.
       amounts =
@@ -372,6 +373,7 @@ public StartWithdrawResponse withdrawExchange(
           exchangeAmountsCalculator.calculateFromQuote(
               request.getQuoteId(), sellAsset, request.getAmount());
     } else {
+      // TODO(philip): remove this
       // If a quote is not provided, set the fee and out amounts to 0.
       // The business server should use the request_onchain_funds RPC to update the amounts.
       amounts =
diff --git a/core/src/main/java/org/stellar/anchor/sep6/Sep6TransactionUtils.java b/core/src/main/java/org/stellar/anchor/sep6/Sep6TransactionUtils.java
index feba9aac54..c92f1bdd8e 100644
--- a/core/src/main/java/org/stellar/anchor/sep6/Sep6TransactionUtils.java
+++ b/core/src/main/java/org/stellar/anchor/sep6/Sep6TransactionUtils.java
@@ -52,6 +52,7 @@ public static Sep6TransactionResponse fromTxn(
             .amountFee(txn.getAmountFee())
             .amountFeeAsset(txn.getAmountFeeAsset())
             .feeDetails(txn.getFeeDetails())
+            .quoteId(txn.getQuoteId())
             .startedAt(txn.getStartedAt().toString())
             .updatedAt(txn.getUpdatedAt().toString())
             .completedAt(txn.getCompletedAt() != null ? txn.getCompletedAt().toString() : null)
diff --git a/core/src/main/java/org/stellar/anchor/util/ErrorHelper.java b/core/src/main/java/org/stellar/anchor/util/ErrorHelper.java
new file mode 100644
index 0000000000..d425cfafed
--- /dev/null
+++ b/core/src/main/java/org/stellar/anchor/util/ErrorHelper.java
@@ -0,0 +1,16 @@
+package org.stellar.anchor.util;
+
+import static org.stellar.anchor.util.Log.*;
+
+public class ErrorHelper {
+  public static <T extends Exception> void logErrorAndThrow(String message, Class<T> exceptionClass)
+      throws T {
+    error(message);
+    try {
+      // Create a new instance of the exception class with the message
+      throw exceptionClass.getDeclaredConstructor(String.class).newInstance(message);
+    } catch (ReflectiveOperationException e) {
+      throw new RuntimeException("Error creating exception", e);
+    }
+  }
+}
diff --git a/core/src/test/kotlin/org/stellar/anchor/sep12/Sep12ServiceTest.kt b/core/src/test/kotlin/org/stellar/anchor/sep12/Sep12ServiceTest.kt
index 8509ebcf67..cadb090064 100644
--- a/core/src/test/kotlin/org/stellar/anchor/sep12/Sep12ServiceTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/sep12/Sep12ServiceTest.kt
@@ -6,14 +6,16 @@ import io.mockk.*
 import io.mockk.impl.annotations.MockK
 import java.time.Instant
 import kotlin.test.assertNotNull
-import org.junit.jupiter.api.*
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.Assertions.assertInstanceOf
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertDoesNotThrow
+import org.junit.jupiter.api.assertThrows
 import org.skyscreamer.jsonassert.JSONAssert
 import org.stellar.anchor.api.callback.*
 import org.stellar.anchor.api.event.AnchorEvent
 import org.stellar.anchor.api.exception.*
-import org.stellar.anchor.api.platform.CustomerUpdatedResponse
 import org.stellar.anchor.api.platform.GetTransactionResponse
 import org.stellar.anchor.api.sep.sep12.Sep12CustomerRequestBase
 import org.stellar.anchor.api.sep.sep12.Sep12GetCustomerRequest
@@ -257,11 +259,15 @@ class Sep12ServiceTest {
   fun `Test put customer request ok`() {
     // mock `PUT {callbackApi}/customer` response
     val callbackApiPutRequestSlot = slot<PutCustomerRequest>()
+    val callbackApiGetRequestSlot = slot<GetCustomerRequest>()
     val kycUpdateEventSlot = slot<AnchorEvent>()
     val mockCallbackApiPutCustomerResponse = PutCustomerResponse()
+    val mockCallbackApiGetCustomerResponse = GetCustomerResponse()
     mockCallbackApiPutCustomerResponse.id = "customer-id"
     every { customerIntegration.putCustomer(capture(callbackApiPutRequestSlot)) } returns
       mockCallbackApiPutCustomerResponse
+    every { customerIntegration.getCustomer(capture(callbackApiGetRequestSlot)) } returns
+      mockCallbackApiGetCustomerResponse
     every { eventSession.publish(capture(kycUpdateEventSlot)) } returns Unit
 
     // Execute the request
@@ -303,12 +309,15 @@ class Sep12ServiceTest {
         .build()
     assertEquals(wantCallbackApiPutRequest, callbackApiPutRequestSlot.captured)
 
+    val wantCallbackApiGetCustomerResponse = GetCustomerRequest.builder().id("customer-id").build()
+    assertEquals(wantCallbackApiGetCustomerResponse, callbackApiGetRequestSlot.captured)
+
     // validate the published event
     assertNotNull(kycUpdateEventSlot.captured.id)
     assertEquals("12", kycUpdateEventSlot.captured.sep)
     assertEquals(AnchorEvent.Type.CUSTOMER_UPDATED, kycUpdateEventSlot.captured.type)
     assertEquals(
-      CustomerUpdatedResponse(mockCallbackApiPutCustomerResponse.id),
+      GetCustomerResponse.to(mockCallbackApiGetCustomerResponse),
       kycUpdateEventSlot.captured.customer,
     )
 
diff --git a/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTest.kt b/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTest.kt
index fc38bcf263..40140ce6fd 100644
--- a/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTest.kt
@@ -25,15 +25,12 @@ import org.stellar.anchor.TestConstants.Companion.TEST_CLIENT_NAME
 import org.stellar.anchor.TestConstants.Companion.TEST_HOME_DOMAIN
 import org.stellar.anchor.TestConstants.Companion.TEST_MEMO
 import org.stellar.anchor.TestConstants.Companion.TEST_OFFCHAIN_ASSET
+import org.stellar.anchor.TestConstants.Companion.TEST_QUOTE_ID
 import org.stellar.anchor.TestConstants.Companion.TEST_TRANSACTION_ID_0
 import org.stellar.anchor.TestConstants.Companion.TEST_TRANSACTION_ID_1
 import org.stellar.anchor.TestHelper
 import org.stellar.anchor.api.callback.FeeIntegration
-import org.stellar.anchor.api.exception.BadRequestException
-import org.stellar.anchor.api.exception.SepException
-import org.stellar.anchor.api.exception.SepNotAuthorizedException
-import org.stellar.anchor.api.exception.SepNotFoundException
-import org.stellar.anchor.api.exception.SepValidationException
+import org.stellar.anchor.api.exception.*
 import org.stellar.anchor.api.sep.sep24.GetTransactionRequest
 import org.stellar.anchor.api.sep.sep24.GetTransactionsRequest
 import org.stellar.anchor.asset.AssetService
@@ -563,12 +560,14 @@ internal class Sep24ServiceTest {
     assertEquals(response.transactions[0].kind, kind)
     assertEquals(response.transactions[0].startedAt, TEST_STARTED_AT)
     assertEquals(response.transactions[0].completedAt, TEST_COMPLETED_AT)
+    assertEquals(response.transactions[0].quoteId, TEST_QUOTE_ID)
 
     assertEquals(response.transactions[1].id, TEST_TRANSACTION_ID_1)
     assertEquals(response.transactions[1].status, "completed")
     assertEquals(response.transactions[1].kind, kind)
     assertEquals(response.transactions[1].startedAt, TEST_STARTED_AT)
     assertEquals(response.transactions[1].completedAt, TEST_COMPLETED_AT)
+    assertEquals(response.transactions[1].quoteId, TEST_QUOTE_ID)
   }
 
   @ParameterizedTest
diff --git a/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTestHelper.kt b/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTestHelper.kt
index 891ae752bd..bad7f66c3d 100644
--- a/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTestHelper.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/sep24/Sep24ServiceTestHelper.kt
@@ -6,6 +6,7 @@ import org.stellar.anchor.TestConstants.Companion.TEST_AMOUNT
 import org.stellar.anchor.TestConstants.Companion.TEST_ASSET
 import org.stellar.anchor.TestConstants.Companion.TEST_ASSET_ISSUER_ACCOUNT_ID
 import org.stellar.anchor.TestConstants.Companion.TEST_OFFCHAIN_ASSET
+import org.stellar.anchor.TestConstants.Companion.TEST_QUOTE_ID
 
 fun createTestTransactionRequest(quoteID: String? = null): MutableMap<String, String> {
   val request =
@@ -67,6 +68,7 @@ fun createTestTransactions(kind: String): MutableList<Sep24Transaction> {
   txn.protocol = "sep24"
   txn.amountIn = "321.4"
   txn.amountOut = "321.4"
+  txn.quoteId = TEST_QUOTE_ID
   txns.add(txn)
 
   txn = PojoSep24Transaction()
@@ -85,6 +87,7 @@ fun createTestTransactions(kind: String): MutableList<Sep24Transaction> {
   txn.protocol = "sep24"
   txn.amountIn = "456.7"
   txn.amountOut = "456.7"
+  txn.quoteId = TEST_QUOTE_ID
   txns.add(txn)
 
   return txns
diff --git a/core/src/test/kotlin/org/stellar/anchor/sep31/Sep31ServiceTest.kt b/core/src/test/kotlin/org/stellar/anchor/sep31/Sep31ServiceTest.kt
index aaaa27f502..4e31ba3921 100644
--- a/core/src/test/kotlin/org/stellar/anchor/sep31/Sep31ServiceTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/sep31/Sep31ServiceTest.kt
@@ -36,6 +36,7 @@ import org.stellar.anchor.asset.AssetService
 import org.stellar.anchor.asset.DefaultAssetService
 import org.stellar.anchor.auth.JwtService
 import org.stellar.anchor.config.*
+import org.stellar.anchor.config.ClientsConfig.ClientConfig
 import org.stellar.anchor.config.CustodyConfig.CustodyType.NONE
 import org.stellar.anchor.config.Sep31Config.PaymentType.STRICT_RECEIVE
 import org.stellar.anchor.config.Sep31Config.PaymentType.STRICT_SEND
@@ -272,17 +273,13 @@ class Sep31ServiceTest {
       }
   """
     private val lobstrClientConfig =
-      ClientsConfig.ClientConfig(
-        "lobstr",
-        ClientsConfig.ClientType.NONCUSTODIAL,
-        null,
-        setOf("GBLGJA4TUN5XOGTV6WO2BWYUI2OZR5GYQ5PDPCRMQ5XEPJOYWB2X4CJO"),
-        null,
-        setOf("lobstr.co"),
-        "https://callback.lobstr.co/api/v2/anchor/callback",
-        false,
-        null
-      )
+      ClientConfig.builder()
+        .name("lobstr")
+        .type(ClientsConfig.ClientType.NONCUSTODIAL)
+        .signingKeys(setOf("GBLGJA4TUN5XOGTV6WO2BWYUI2OZR5GYQ5PDPCRMQ5XEPJOYWB2X4CJO"))
+        .domains(setOf("lobstr.co"))
+        .callbackUrl("https://callback.lobstr.co/api/v2/anchor/callback")
+        .build()
 
     @JvmStatic
     fun generateGetClientNameTestConfig(): Stream<Arguments> {
@@ -495,6 +492,7 @@ class Sep31ServiceTest {
           .amountFee("2")
           .amountFeeAsset("USDC")
           .feeDetails(FeeDetails("2", "USDC"))
+          .quoteId("quote_id")
           .stellarAccountId("GAYR3FVW2PCXTNHHWHEAFOCKZQV4PEY2ZKGIKB47EKPJ3GSBYA52XJBY")
           .stellarMemo("123456")
           .stellarMemoType("text")
diff --git a/core/src/test/kotlin/org/stellar/anchor/sep31/Sep31TransactionTest.kt b/core/src/test/kotlin/org/stellar/anchor/sep31/Sep31TransactionTest.kt
index d2a3dc0ccd..3c86490dac 100644
--- a/core/src/test/kotlin/org/stellar/anchor/sep31/Sep31TransactionTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/sep31/Sep31TransactionTest.kt
@@ -158,6 +158,7 @@ class Sep31TransactionTest {
             .amountFee("2.0000")
             .amountFeeAsset(fiatUSD)
             .feeDetails(FeeDetails("2.0000", fiatUSD))
+            .quoteId("quote-id")
             .stellarAccountId(TEST_ACCOUNT)
             .stellarMemo(TEST_MEMO)
             .stellarMemoType("text")
diff --git a/core/src/test/kotlin/org/stellar/anchor/sep6/Sep6TransactionUtilsTest.kt b/core/src/test/kotlin/org/stellar/anchor/sep6/Sep6TransactionUtilsTest.kt
index a8c7288081..24c7b8a772 100644
--- a/core/src/test/kotlin/org/stellar/anchor/sep6/Sep6TransactionUtilsTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/sep6/Sep6TransactionUtilsTest.kt
@@ -49,6 +49,7 @@ class Sep6TransactionUtilsTest {
             "total": "1.00",
             "asset": "USD"
           },
+          "quote_id": "quote-id",
           "from": "1234",
           "to": "$TEST_ASSET_ISSUER_ACCOUNT_ID",
           "deposit_memo_type": "text",
diff --git a/core/src/test/kotlin/org/stellar/anchor/util/ClientFinderTest.kt b/core/src/test/kotlin/org/stellar/anchor/util/ClientFinderTest.kt
index bc86c24ab1..3db0e03338 100644
--- a/core/src/test/kotlin/org/stellar/anchor/util/ClientFinderTest.kt
+++ b/core/src/test/kotlin/org/stellar/anchor/util/ClientFinderTest.kt
@@ -14,6 +14,7 @@ import org.stellar.anchor.TestHelper
 import org.stellar.anchor.api.exception.SepNotAuthorizedException
 import org.stellar.anchor.client.ClientFinder
 import org.stellar.anchor.config.ClientsConfig
+import org.stellar.anchor.config.ClientsConfig.ClientConfig
 import org.stellar.anchor.config.Sep10Config
 import org.stellar.anchor.sep6.ExchangeAmountsCalculatorTest
 
@@ -21,17 +22,13 @@ class ClientFinderTest {
   companion object {
     val token = TestHelper.createSep10Jwt(TEST_ACCOUNT, TEST_MEMO)
     val clientConfig =
-      ClientsConfig.ClientConfig(
-        "name",
-        ClientsConfig.ClientType.CUSTODIAL,
-        null,
-        setOf("signing-key"),
-        null,
-        setOf("domain"),
-        "http://localhost:8000",
-        false,
-        emptySet()
-      )
+      ClientConfig.builder()
+        .name("name")
+        .type(ClientsConfig.ClientType.CUSTODIAL)
+        .signingKeys(setOf("signing-key"))
+        .domains(setOf("domain"))
+        .callbackUrl("http://localhost:8000")
+        .build()
   }
 
   @MockK(relaxed = true) lateinit var sep10Config: Sep10Config
diff --git a/docs/01 - Contributing/A - Development Environment.md b/docs/01 - Contributing/A - Development Environment.md
index 9f063db1fc..af3f2f4573 100644
--- a/docs/01 - Contributing/A - Development Environment.md	
+++ b/docs/01 - Contributing/A - Development Environment.md	
@@ -11,7 +11,7 @@
         * [Clean](#clean)
         * [Build](#build)
         * [Running Unit Tests](#running-unit-tests)
-        * [Running `docker-compose` up for development](#running-docker-compose-up-for-development)
+        * [Running `docker compose` up for development](#running-docker-compose-up-for-development)
         * [Starting all servers](#starting-all-servers)
     * [Set up the Git Hooks](#set-up-the-git-hooks)
 * [Set up the Development Environment with IntelliJ IDEA](#set-up-the-development-environment-with-intellij-idea)
@@ -111,11 +111,11 @@ Run all tests: `./gradlew test`
 
 Run subproject tests: `./gradlew :[subproject]:test`
 
-### Running `docker-compose start` for Kafka, Postgres, and SEP24 Reference UI
+### Running `docker compose start` for Kafka, Postgres, and SEP24 Reference UI
 
 `./gradlew dockerComposeStart`
 
-### Running `docker-compose stop` to shutdown Kafka, Postgres, and SEP24 Reference UI
+### Running `docker compose stop` to shutdown Kafka, Postgres, and SEP24 Reference UI
 
 `./gradlew dockerComposeStop`
 
@@ -218,7 +218,7 @@ the `service-runner/src/main/resources/profiles` folder.
 
 If you would like to debug the Platform server, you can do so by running the
 
-- Make sure `docker` and `docker-compose` is available on your local machine.
+- Make sure `docker` is available on your local machine.
 - Check if there are previous docker containers running on your machine. If there are, please stop and delete them.
 - Run `Docker - Run Dev Stack - Kafka, Postgres, SEP24 Reference UI` to start the development stack.
 - Debug `Sep Server: default` to start the SEP server.
@@ -229,7 +229,7 @@ If you would like to debug the unit tests or the end-to-end tests, there are two
 
 #### Option 1: Run the servers from IntelliJ
 
-- Make sure `docker` and `docker-compose` is available on your local machine.
+- Make sure `docker` is available on your local machine.
 - Check if there are previous docker containers running on your machine. If there are, please stop and delete them.
 - Run `Docker - Run Dev Stack - Kafka, Postgres, SEP24 Reference UI` to start the development stack.
 - Run `Test Profile: default` to run the servers with the `default` profile.
@@ -237,7 +237,7 @@ If you would like to debug the unit tests or the end-to-end tests, there are two
 
 ### Option 2: Run the servers and tests from Gradle
 
-- Make sure `docker` and `docker-compose` is available on your local machine.
+- Make sure `docker` is available on your local machine.
 - Check if there are previous docker containers running on your machine. If there are, please stop and delete them.
 - Navigate to the directory to the project folder
 - `./gradlew dockerComposeStart` to start the development stack.
diff --git a/docs/README.md b/docs/README.md
index 0c9f9a1b2e..5706d38498 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 [![License](https://badgen.net/badge/license/Apache%202/blue?icon=github&label=License)](https://github.com/stellar/java-stellar-anchor-sdk/blob/develop/LICENSE)
 [![GitHub Version](https://badgen.net/github/release/stellar/java-stellar-anchor-sdk?icon=github&label=Latest%20release)](https://github.com/stellar/java-stellar-anchor-sdk/releases)
-[![Docker](https://badgen.net/badge/Latest%20Release/v2.8.4/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.8.4)
+[![Docker](https://badgen.net/badge/Latest%20Release/v2.9.0/blue?icon=docker)](https://hub.docker.com/r/stellar/anchor-platform/tags?page=1&name=2.9.0)
 ![Develop Branch](https://github.com/stellar/java-stellar-anchor-sdk/actions/workflows/on_push_to_develop.yml/badge.svg?branch=develop)
 
 <div style="text-align: center">
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep24End2EndTests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep24End2EndTests.kt
index 0be07dc3b3..4d0d0c2025 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep24End2EndTests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep24End2EndTests.kt
@@ -270,7 +270,12 @@ open class Sep24End2EndTests : AbstractIntegrationTests(TestConfig()) {
     var retries = 30
     var callbacks: List<Sep24GetTransactionResponse>? = null
     while (retries > 0) {
-      callbacks = walletServerClient.getCallbacks(txnId, Sep24GetTransactionResponse::class.java)
+      callbacks =
+        walletServerClient.getTransactionCallbacks(
+          "sep24",
+          txnId,
+          Sep24GetTransactionResponse::class.java
+        )
       if (callbacks.size == count) {
         return callbacks
       }
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep31End2EndTests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep31End2EndTests.kt
index 007cf0e8bf..59e89b029f 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep31End2EndTests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep31End2EndTests.kt
@@ -168,7 +168,12 @@ open class Sep31End2EndTests : AbstractIntegrationTests(TestConfig()) {
     var retries = 30
     var callbacks: List<Sep31GetTransactionResponse>? = null
     while (retries > 0) {
-      callbacks = walletServerClient.getCallbacks(txnId, Sep31GetTransactionResponse::class.java)
+      callbacks =
+        walletServerClient.getTransactionCallbacks(
+          "sep31",
+          txnId,
+          Sep31GetTransactionResponse::class.java
+        )
       if (callbacks.size == count) {
         return callbacks
       }
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep6End2EndTest.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep6End2EndTest.kt
index 6464ddfbdd..1dac1782b4 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep6End2EndTest.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/e2etest/Sep6End2EndTest.kt
@@ -2,7 +2,6 @@ package org.stellar.anchor.platform.e2etest
 
 import io.ktor.http.*
 import kotlin.test.DefaultAsserter.fail
-import kotlin.test.assertContentEquals
 import kotlin.test.assertEquals
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.delay
@@ -11,6 +10,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.TestInstance
 import org.stellar.anchor.api.sep.SepTransactionStatus
 import org.stellar.anchor.api.sep.SepTransactionStatus.*
+import org.stellar.anchor.api.sep.sep12.Sep12Status
 import org.stellar.anchor.api.sep.sep6.GetTransactionResponse
 import org.stellar.anchor.api.shared.InstructionField
 import org.stellar.anchor.client.Sep6Client
@@ -60,7 +60,8 @@ open class Sep6End2EndTest : AbstractIntegrationTests(TestConfig()) {
     val sep6Client = Sep6Client("${config.env["anchor.domain"]}/sep6", token.token)
 
     // Create a customer before starting the transaction
-    anchor.customer(token).add(basicInfoFields.associateWith { customerInfo[it]!! }, memo)
+    val customer =
+      anchor.customer(token).add(basicInfoFields.associateWith { customerInfo[it]!! }, memo)
 
     val deposit =
       sep6Client.deposit(
@@ -120,6 +121,14 @@ open class Sep6End2EndTest : AbstractIntegrationTests(TestConfig()) {
         COMPLETED,
       )
     assertWalletReceivedStatuses(deposit.id, expectedStatuses)
+
+    val expectedCustomerStatuses =
+      listOf(
+        Sep12Status.ACCEPTED, // initial customer status before SEP-6 transaction
+        Sep12Status.NEEDS_INFO, // SEP-6 transaction requires additional info
+        Sep12Status.ACCEPTED // additional info provided
+      )
+    assertWalletReceivedCustomerStatuses(customer.id, expectedCustomerStatuses)
   }
 
   @Test
@@ -129,7 +138,8 @@ open class Sep6End2EndTest : AbstractIntegrationTests(TestConfig()) {
     val sep6Client = Sep6Client("${config.env["anchor.domain"]}/sep6", token.token)
 
     // Create a customer before starting the transaction
-    anchor.customer(token).add(basicInfoFields.associateWith { customerInfo[it]!! }, memo)
+    val customer =
+      anchor.customer(token).add(basicInfoFields.associateWith { customerInfo[it]!! }, memo)
 
     val deposit =
       sep6Client.deposit(
@@ -191,6 +201,14 @@ open class Sep6End2EndTest : AbstractIntegrationTests(TestConfig()) {
         COMPLETED,
       )
     assertWalletReceivedStatuses(deposit.id, expectedStatuses)
+
+    val expectedCustomerStatuses =
+      listOf(
+        Sep12Status.ACCEPTED, // initial customer status before SEP-6 transaction
+        Sep12Status.NEEDS_INFO, // SEP-6 transaction requires additional info
+        Sep12Status.ACCEPTED // additional info provided
+      )
+    assertWalletReceivedCustomerStatuses(customer.id, expectedCustomerStatuses)
   }
 
   @Test
@@ -201,7 +219,8 @@ open class Sep6End2EndTest : AbstractIntegrationTests(TestConfig()) {
     val sep6Client = Sep6Client("${config.env["anchor.domain"]}/sep6", token.token)
 
     // Create a customer before starting the transaction
-    anchor.customer(token).add(basicInfoFields.associateWith { customerInfo[it]!! }, memo)
+    val customer =
+      anchor.customer(token).add(basicInfoFields.associateWith { customerInfo[it]!! }, memo)
 
     val withdraw =
       sep6Client.withdraw(
@@ -251,6 +270,14 @@ open class Sep6End2EndTest : AbstractIntegrationTests(TestConfig()) {
         COMPLETED,
       )
     assertWalletReceivedStatuses(withdraw.id, expectedStatuses)
+
+    val expectedCustomerStatuses =
+      listOf(
+        Sep12Status.ACCEPTED, // initial customer status before SEP-6 transaction
+        Sep12Status.NEEDS_INFO, // SEP-6 transaction requires additional info
+        Sep12Status.ACCEPTED // additional info provided
+      )
+    assertWalletReceivedCustomerStatuses(customer.id, expectedCustomerStatuses)
   }
 
   @Test
@@ -261,7 +288,8 @@ open class Sep6End2EndTest : AbstractIntegrationTests(TestConfig()) {
     val sep6Client = Sep6Client("${config.env["anchor.domain"]}/sep6", token.token)
 
     // Create a customer before starting the transaction
-    anchor.customer(token).add(basicInfoFields.associateWith { customerInfo[it]!! }, memo)
+    val customer =
+      anchor.customer(token).add(basicInfoFields.associateWith { customerInfo[it]!! }, memo)
 
     val withdraw =
       sep6Client.withdraw(
@@ -317,6 +345,14 @@ open class Sep6End2EndTest : AbstractIntegrationTests(TestConfig()) {
         COMPLETED,
       )
     assertWalletReceivedStatuses(withdraw.id, expectedStatuses)
+
+    val expectedCustomerStatuses =
+      listOf(
+        Sep12Status.ACCEPTED, // initial customer status before SEP-6 transaction
+        Sep12Status.NEEDS_INFO, // SEP-6 transaction requires additional info
+        Sep12Status.ACCEPTED // additional info provided
+      )
+    assertWalletReceivedCustomerStatuses(customer.id, expectedCustomerStatuses)
   }
 
   private suspend fun assertWalletReceivedStatuses(
@@ -324,9 +360,23 @@ open class Sep6End2EndTest : AbstractIntegrationTests(TestConfig()) {
     expected: List<SepTransactionStatus>,
   ) {
     val callbacks =
-      walletServerClient.pollCallbacks(txnId, expected.size, GetTransactionResponse::class.java)
+      walletServerClient.pollTransactionCallbacks(
+        "sep6",
+        txnId,
+        expected.size,
+        GetTransactionResponse::class.java
+      )
     val statuses = callbacks.map { it.transaction.status }
-    assertContentEquals(expected.map { it.status }, statuses)
+    assertEquals(expected.map { it.status }, statuses)
+  }
+
+  private suspend fun assertWalletReceivedCustomerStatuses(
+    id: String,
+    expected: List<Sep12Status>
+  ) {
+    val callbacks = walletServerClient.pollCustomerCallbacks(id, expected.size)
+    val statuses: List<Sep12Status> = callbacks.map { it.status }
+    assertEquals(expected, statuses)
   }
 
   private suspend fun waitStatus(
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/CallbackApiTests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/CallbackApiTests.kt
index 01789b675b..68280b568e 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/CallbackApiTests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/CallbackApiTests.kt
@@ -1,15 +1,11 @@
 package org.stellar.anchor.platform.integrationtest
 
 import com.google.gson.Gson
-import java.time.Instant
-import java.time.ZoneId
-import java.time.ZonedDateTime
-import java.time.format.DateTimeFormatter
-import java.util.*
+import io.mockk.every
+import io.mockk.mockk
 import java.util.concurrent.TimeUnit
 import okhttp3.OkHttpClient
 import org.junit.jupiter.api.*
-import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
 import org.skyscreamer.jsonassert.JSONAssert
@@ -17,7 +13,9 @@ import org.stellar.anchor.api.callback.GetCustomerRequest
 import org.stellar.anchor.api.callback.GetFeeRequest
 import org.stellar.anchor.api.callback.GetRateRequest
 import org.stellar.anchor.api.exception.NotFoundException
+import org.stellar.anchor.api.sep.AssetInfo
 import org.stellar.anchor.api.sep.sep12.Sep12PutCustomerRequest
+import org.stellar.anchor.asset.AssetService
 import org.stellar.anchor.auth.AuthHelper
 import org.stellar.anchor.auth.JwtService
 import org.stellar.anchor.client.Sep12Client
@@ -59,21 +57,50 @@ class CallbackApiTests : AbstractIntegrationTests(TestConfig()) {
       config.env["secret.sep24.more_info_url.jwt_secret"]!!,
       config.env["secret.callback_api.auth_secret"]!!,
       config.env["secret.platform_api.auth_secret"]!!,
-      null
+      null,
     )
 
   private val authHelper =
     AuthHelper.forJwtToken("Authorization", platformToAnchorJwtService, JWT_EXPIRATION_MILLISECONDS)
 
   private val gson: Gson = GsonUtils.getInstance()
+  private val mockAssetService = mockk<AssetService>()
 
   private val rci =
     RestCustomerIntegration(config.env["reference.server.url"]!!, httpClient, authHelper, gson)
   private val rriClient =
-    RestRateIntegration(config.env["reference.server.url"]!!, httpClient, authHelper, gson)
+    RestRateIntegration(
+      config.env["reference.server.url"]!!,
+      httpClient,
+      authHelper,
+      gson,
+      mockAssetService,
+    )
   private val rfiClient =
     RestFeeIntegration(config.env["reference.server.url"]!!, httpClient, authHelper, gson)
 
+  @BeforeAll
+  fun setup() {
+    val usdc = AssetInfo()
+    usdc.schema = AssetInfo.Schema.stellar
+    usdc.code = "USDC"
+    usdc.issuer = "GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+    usdc.significantDecimals = 4
+
+    val usd = AssetInfo()
+    usd.schema = AssetInfo.Schema.iso4217
+    usd.code = "USD"
+    usd.significantDecimals = 2
+
+    every {
+      mockAssetService.getAssetByName(
+        "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+      )
+    } returns usdc
+    every { mockAssetService.getAssetByName("iso4217:USD") } returns usd
+    every { mockAssetService.getAssetByName(null) } returns null
+  }
+
   @Test
   fun testCustomerIntegration() {
     assertThrows<NotFoundException> {
@@ -116,69 +143,6 @@ class CallbackApiTests : AbstractIntegrationTests(TestConfig()) {
     JSONAssert.assertEquals(wantBody, org.stellar.anchor.platform.gson.toJson(result), true)
   }
 
-  @Test
-  fun testRate_firm() {
-    val rate =
-      rriClient
-        .getRate(
-          GetRateRequest.builder()
-            .type(GetRateRequest.Type.FIRM)
-            .sellAsset(FIAT_USD)
-            .buyAsset(STELLAR_USD)
-            .buyAmount("100")
-            .build()
-        )
-        .rate
-    Assertions.assertNotNull(rate)
-
-    // check if id is a valid UUID
-    val id = rate.id
-    Assertions.assertDoesNotThrow { UUID.fromString(id) }
-    var gotExpiresAt: Instant? = null
-    val expiresAtStr = rate.expiresAt!!.toString()
-    Assertions.assertDoesNotThrow {
-      gotExpiresAt = DateTimeFormatter.ISO_INSTANT.parse(rate.expiresAt!!.toString(), Instant::from)
-    }
-
-    val wantExpiresAt =
-      ZonedDateTime.now(ZoneId.of("UTC"))
-        .plusDays(1)
-        .withHour(12)
-        .withMinute(0)
-        .withSecond(0)
-        .withNano(0)
-    assertEquals(wantExpiresAt.toInstant(), gotExpiresAt)
-
-    // check if rate was persisted by getting the rate with ID
-    val gotQuote = rriClient.getRate(GetRateRequest.builder().id(rate.id).build())
-    assertEquals(rate.id, gotQuote.rate.id)
-    assertEquals("1.02", gotQuote.rate.price)
-
-    val wantBody =
-      """{
-      "rate":{
-        "id": "$id",
-        "price":"1.02",
-        "sell_amount": "103",
-        "buy_amount": "100",
-        "expires_at": "$expiresAtStr",
-        "fee": {
-          "total": "1.00",
-          "asset": "$FIAT_USD",
-          "details": [
-            {
-              "name": "Sell fee",
-              "description": "Fee related to selling the asset.",
-              "amount": "1.00"
-            }
-          ]
-        }
-      }
-    }"""
-        .trimMargin()
-    JSONAssert.assertEquals(wantBody, org.stellar.anchor.platform.gson.toJson(gotQuote), true)
-  }
-
   @Test
   fun testGetFee() {
     // Create sender customer
@@ -212,7 +176,7 @@ class CallbackApiTests : AbstractIntegrationTests(TestConfig()) {
             "amount": "0.30"
           }
         }""",
-      true
+      true,
     )
   }
 }
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/jwt/platform/AuthJwtPlatformTests.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/jwt/platform/AuthJwtPlatformTests.kt
index 32b7c1afdd..75e7ebe237 100644
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/jwt/platform/AuthJwtPlatformTests.kt
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/auth/jwt/platform/AuthJwtPlatformTests.kt
@@ -1,5 +1,6 @@
 package org.stellar.anchor.platform.extendedtest.auth.jwt.platform
 
+import io.mockk.mockk
 import java.util.concurrent.TimeUnit
 import kotlin.test.assertEquals
 import okhttp3.OkHttpClient
@@ -13,6 +14,7 @@ import org.stellar.anchor.api.callback.GetFeeRequest
 import org.stellar.anchor.api.callback.GetRateRequest
 import org.stellar.anchor.api.exception.*
 import org.stellar.anchor.apiclient.PlatformApiClient
+import org.stellar.anchor.asset.AssetService
 import org.stellar.anchor.platform.*
 import org.stellar.anchor.platform.callback.RestCustomerIntegration
 import org.stellar.anchor.platform.callback.RestFeeIntegration
@@ -36,18 +38,8 @@ internal class AuthJwtPlatformTests : AbstractAuthIntegrationTest() {
   private val jwtExpiredTokenPlatformClient: PlatformApiClient =
     PlatformApiClient(jwtExpiredAuthHelper, "http://localhost:8085")
 
-  @ParameterizedTest
-  @CsvSource(
-    value =
-      [
-        GET_TRANSACTIONS_ENDPOINT,
-        PATCH_TRANSACTIONS_ENDPOINT,
-        GET_TRANSACTIONS_MY_ID_ENDPOINT,
-        GET_EXCHANGE_QUOTES_ENDPOINT,
-        GET_EXCHANGE_QUOTES_ID_ENDPOINT
-      ]
-  )
-  fun `test the platform endpoints with JWT auth`(method: String, endpoint: String) {
+  @Test
+  fun `test the platform endpoints with JWT auth`() {
     // Assert the request does not throw a 403.
     // As for the correctness of the request/response, it should be tested in the platform server
     // integration tests.
@@ -62,10 +54,10 @@ internal class AuthJwtPlatformTests : AbstractAuthIntegrationTest() {
         PATCH_TRANSACTIONS_ENDPOINT,
         GET_TRANSACTIONS_MY_ID_ENDPOINT,
         GET_EXCHANGE_QUOTES_ENDPOINT,
-        GET_EXCHANGE_QUOTES_ID_ENDPOINT
+        GET_EXCHANGE_QUOTES_ID_ENDPOINT,
       ]
   )
-  fun `test JWT protection of the platform server`(method: String, endpoint: String) {
+  fun `test JWT protection of the platform server`(method: String) {
     // Check if the request without JWT will cause a 403.
     val httpRequest =
       Request.Builder()
@@ -95,7 +87,7 @@ internal class AuthJwtPlatformTests : AbstractAuthIntegrationTest() {
         "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtAuthHelper,
-        gson
+        gson,
       )
     // Assert the request does not throw a 403.
     assertThrows<NotFoundException> {
@@ -110,7 +102,8 @@ internal class AuthJwtPlatformTests : AbstractAuthIntegrationTest() {
         "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtAuthHelper,
-        gson
+        gson,
+        mockk<AssetService>(),
       )
     // Assert the request does not throw a 403.
     assertThrows<BadRequestException> { rri.getRate(GetRateRequest.builder().build()) }
@@ -123,7 +116,7 @@ internal class AuthJwtPlatformTests : AbstractAuthIntegrationTest() {
         "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtAuthHelper,
-        gson
+        gson,
       )
     // Assert the request does not throw a 403.
     assertThrows<BadRequestException> { rfi.getFee(GetFeeRequest.builder().build()) }
@@ -136,7 +129,7 @@ internal class AuthJwtPlatformTests : AbstractAuthIntegrationTest() {
         "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtWrongKeyAuthHelper,
-        gson
+        gson,
       )
     assertThrows<ServerErrorException> {
       badTokenClient.getCustomer(GetCustomerRequest.builder().id("1").build())
@@ -147,7 +140,7 @@ internal class AuthJwtPlatformTests : AbstractAuthIntegrationTest() {
         "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtWrongKeyAuthHelper,
-        gson
+        gson,
       )
     assertThrows<ServerErrorException> {
       expiredTokenClient.getCustomer(GetCustomerRequest.builder().id("1").build())
@@ -161,7 +154,8 @@ internal class AuthJwtPlatformTests : AbstractAuthIntegrationTest() {
         "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtWrongKeyAuthHelper,
-        gson
+        gson,
+        mockk<AssetService>(),
       )
     assertThrows<ServerErrorException> { badTokenClient.getRate(GetRateRequest.builder().build()) }
 
@@ -170,7 +164,8 @@ internal class AuthJwtPlatformTests : AbstractAuthIntegrationTest() {
         "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtExpiredAuthHelper,
-        gson
+        gson,
+        mockk<AssetService>(),
       )
     assertThrows<ServerErrorException> {
       expiredTokenClient.getRate(GetRateRequest.builder().build())
@@ -184,7 +179,7 @@ internal class AuthJwtPlatformTests : AbstractAuthIntegrationTest() {
         "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtWrongKeyAuthHelper,
-        gson
+        gson,
       )
     assertThrows<ServerErrorException> { badTokenClient.getFee(GetFeeRequest.builder().build()) }
 
@@ -193,7 +188,7 @@ internal class AuthJwtPlatformTests : AbstractAuthIntegrationTest() {
         "http://localhost:${REFERENCE_SERVER_PORT}",
         httpClient,
         jwtExpiredAuthHelper,
-        gson
+        gson,
       )
     assertThrows<ServerErrorException> {
       expiredTokenClient.getFee(GetFeeRequest.builder().build())
diff --git a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/PlatformApiCustodyTests.kt b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/PlatformApiCustodyTests.kt
index 520e107ad8..408d41d72b 100644
--- a/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/PlatformApiCustodyTests.kt
+++ b/extended-tests/src/test/kotlin/org/stellar/anchor/platform/extendedtest/custody/PlatformApiCustodyTests.kt
@@ -74,7 +74,7 @@ class PlatformApiCustodyTests : AbstractIntegrationTests(TestConfig("custody"))
   fun `SEP-24 deposit complete full`() {
     `test deposit flow`(
       SEP_24_DEPOSIT_COMPLETE_FULL_FLOW_ACTION_REQUESTS,
-      SEP_24_DEPOSIT_COMPLETE_FULL_FLOW_ACTION_RESPONSES
+      SEP_24_DEPOSIT_COMPLETE_FULL_FLOW_ACTION_RESPONSES,
     )
   }
 
@@ -90,7 +90,7 @@ class PlatformApiCustodyTests : AbstractIntegrationTests(TestConfig("custody"))
   fun `SEP-24 withdraw full refund`() {
     `test withdraw flow`(
       SEP_24_WITHDRAW_FULL_REFUND_FLOW_ACTION_REQUESTS,
-      SEP_24_WITHDRAW_FULL_REFUND_FLOW_ACTION_RESPONSES
+      SEP_24_WITHDRAW_FULL_REFUND_FLOW_ACTION_RESPONSES,
     )
   }
 
@@ -104,10 +104,11 @@ class PlatformApiCustodyTests : AbstractIntegrationTests(TestConfig("custody"))
   fun `SEP-31 refunded do_stellar_refund`() {
     `test receive flow`(
       SEP_31_RECEIVE_REFUNDED_DO_STELLAR_REFUND_FLOW_ACTION_REQUESTS,
-      SEP_31_RECEIVE_REFUNDED_DO_STELLAR_REFUND_FLOW_ACTION_RESPONSES
+      SEP_31_RECEIVE_REFUNDED_DO_STELLAR_REFUND_FLOW_ACTION_RESPONSES,
     )
   }
 
+  @Suppress("UNCHECKED_CAST")
   private fun `test deposit flow`(actionRequests: String, actionResponse: String) {
     val depositRequest = gson.fromJson(SEP_24_DEPOSIT_FLOW_REQUEST, HashMap::class.java)
     val depositResponse = sep24Client.deposit(depositRequest as HashMap<String, String>)
@@ -140,6 +141,7 @@ class PlatformApiCustodyTests : AbstractIntegrationTests(TestConfig("custody"))
     `test flow`(receiveResponse.id, updatedActionRequests, updatedActionResponses)
   }
 
+  @Suppress("UNCHECKED_CAST")
   private fun `test withdraw flow`(actionRequests: String, actionResponse: String) {
     val withdrawRequest = gson.fromJson(SEP_24_WITHDRAW_FLOW_REQUEST, HashMap::class.java)
     val withdrawResponse = sep24Client.withdraw(withdrawRequest as HashMap<String, String>)
@@ -163,8 +165,8 @@ class PlatformApiCustodyTests : AbstractIntegrationTests(TestConfig("custody"))
         JSONCompareMode.LENIENT,
         Customization("[*].result.started_at") { _, _ -> true },
         Customization("[*].result.updated_at") { _, _ -> true },
-        Customization("[*].result.completed_at") { _, _ -> true }
-      )
+        Customization("[*].result.completed_at") { _, _ -> true },
+      ),
     )
   }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 3317bc1526..cdff4ff007 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -15,7 +15,7 @@ commons-codec = "1.15"
 commons-io = "2.11.0"
 commons-validator = "1.8.0"
 commons-text = "1.10.0"
-docker-compose-rule = "1.9.0"
+docker-compose-rule = "2.3.0"
 dotenv = "2.3.2"
 exposed = "0.49.0"
 findbugs-jsr305 = "3.0.2"
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/callbacks/rate/RateRoute.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/callbacks/rate/RateRoute.kt
index 3251cb2318..67ed1d236e 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/callbacks/rate/RateRoute.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/callbacks/rate/RateRoute.kt
@@ -30,7 +30,6 @@ fun Route.rate(rateService: RateService) {
           .countryCode(call.parameters["country_code"])
           .expireAfter(call.parameters["expire_after"])
           .clientId(call.parameters["client_id"])
-          .id(call.parameters["id"])
           .build()
       val response = GsonUtils.getInstance().toJson(rateService.getRate(request))
       call.respond(response)
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/callbacks/rate/RateService.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/callbacks/rate/RateService.kt
index fe78da5107..8d69ab5d61 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/callbacks/rate/RateService.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/callbacks/rate/RateService.kt
@@ -19,97 +19,88 @@ import org.stellar.reference.model.Quote
 class RateService(private val quoteRepository: QuoteRepository) {
   private val scale = 4
   fun getRate(request: GetRateRequest): GetRateResponse {
-    val rate =
-      when {
-        request.id != null -> getRate(request.id)
-        else -> {
-          validateRequest(request)
-          val price =
-            getPrice(request.sellAsset!!, request.buyAsset!!)?.let { getDecimal(it, scale) }
-              ?: throw RuntimeException(
-                "Price not found for ${request.sellAsset} and ${request.buyAsset}"
-              )
-          val buyAmount = request.buyAmount?.let { getDecimal(it, scale) }
-          val sellAmount = request.sellAmount?.let { getDecimal(it, scale) }
-          val fee = getFee(request.sellAsset!!, request.buyAsset!!)
-          val feeAmount = fee.total.toBigDecimal()
-
-          val finalBuyAmount =
-            sellAmount?.subtract(feeAmount)?.divide(price, RoundingMode.HALF_DOWN)?.also {
-              if (it <= BigDecimal.ZERO) {
-                throw RuntimeException("Buy amount must be greater than zero")
-              }
-            }
-              ?: buyAmount
-          val finalSellAmount =
-            buyAmount?.setScale(10, RoundingMode.HALF_DOWN)?.multiply(price)?.add(feeAmount)
-              ?: sellAmount
-          val finalPrice =
-            finalSellAmount
-              ?.setScale(10, RoundingMode.HALF_DOWN)
-              ?.subtract(feeAmount)
-              ?.divide(finalBuyAmount, RoundingMode.HALF_DOWN)
-              ?: price
-          val finalTotalPrice = finalSellAmount?.divide(finalBuyAmount, 10, RoundingMode.HALF_DOWN)
-
-          if (request.type == GetRateRequest.Type.INDICATIVE) {
-            return GetRateResponse.indicativePrice(
-              getString(finalPrice, 10),
-              getString(finalSellAmount!!, scale),
-              getString(finalBuyAmount!!, scale),
-              fee
-            )
-          }
-
-          val expiresAfter =
-            request.expireAfter?.let { ZonedDateTime.parse(it).toInstant() } ?: Instant.now()
-          val expiresAt =
-            ZonedDateTime.ofInstant(expiresAfter, ZoneId.of("UTC"))
-              .plusDays(1)
-              .withHour(12)
-              .withMinute(0)
-              .withSecond(0)
-              .withNano(0)
-              .toInstant()
-          val quote =
-            Quote(
-              id = UUID.randomUUID().toString(),
-              sellAsset = request.sellAsset,
-              sellAmount = getString(finalSellAmount!!, scale),
-              sellDeliveryMethod = request.sellDeliveryMethod,
-              buyAsset = request.buyAsset,
-              buyAmount = getString(finalBuyAmount!!, scale),
-              buyDeliveryMethod = request.buyDeliveryMethod,
-              countryCode = request.countryCode,
-              createdAt = Instant.now(),
-              expiresAt = expiresAt,
-              clientId = request.clientId,
-              price = getString(finalPrice, 10),
-              totalPrice = getString(finalTotalPrice!!, 10),
-              fee =
-                org.stellar.reference.model.FeeDetails(
-                  fee.total,
-                  fee.asset,
-                  fee.details.map {
-                    org.stellar.reference.model.FeeDescription(it.name, it.description, it.amount)
-                  }
-                )
-            )
-          quoteRepository.create(quote)
-
-          val rate =
-            GetRateResponse.Rate.builder()
-              .id(quote.id)
-              .price(quote.price)
-              .sellAmount(quote.sellAmount)
-              .buyAmount(quote.buyAmount)
-              .expiresAt(quote.expiresAt)
-              .fee(fee)
-              .build()
-          return GetRateResponse(rate)
+    validateRequest(request)
+    val price =
+      getPrice(request.sellAsset!!, request.buyAsset!!)?.let { getDecimal(it, scale) }
+        ?: throw RuntimeException(
+          "Price not found for ${request.sellAsset} and ${request.buyAsset}"
+        )
+    val buyAmount = request.buyAmount?.let { getDecimal(it, scale) }
+    val sellAmount = request.sellAmount?.let { getDecimal(it, scale) }
+    val fee = getFee(request.sellAsset!!, request.buyAsset!!)
+    val feeAmount = fee.total.toBigDecimal()
+
+    val finalBuyAmount =
+      sellAmount?.subtract(feeAmount)?.divide(price, RoundingMode.HALF_DOWN)?.also {
+        if (it <= BigDecimal.ZERO) {
+          throw RuntimeException("Buy amount must be greater than zero")
         }
       }
+        ?: buyAmount
+    val finalSellAmount =
+      buyAmount?.setScale(10, RoundingMode.HALF_DOWN)?.multiply(price)?.add(feeAmount) ?: sellAmount
+    val finalPrice =
+      finalSellAmount
+        ?.setScale(10, RoundingMode.HALF_DOWN)
+        ?.subtract(feeAmount)
+        ?.divide(finalBuyAmount, RoundingMode.HALF_DOWN)
+        ?: price
+    val finalTotalPrice = finalSellAmount?.divide(finalBuyAmount, 10, RoundingMode.HALF_DOWN)
+
+    if (request.type == GetRateRequest.Type.INDICATIVE) {
+      return GetRateResponse.indicativePrice(
+        getString(finalPrice, 10),
+        getString(finalSellAmount!!, scale),
+        getString(finalBuyAmount!!, scale),
+        fee
+      )
+    }
 
+    val expiresAfter =
+      request.expireAfter?.let { ZonedDateTime.parse(it).toInstant() } ?: Instant.now()
+    val expiresAt =
+      ZonedDateTime.ofInstant(expiresAfter, ZoneId.of("UTC"))
+        .plusDays(1)
+        .withHour(12)
+        .withMinute(0)
+        .withSecond(0)
+        .withNano(0)
+        .toInstant()
+    val quote =
+      Quote(
+        id = UUID.randomUUID().toString(),
+        sellAsset = request.sellAsset,
+        sellAmount = getString(finalSellAmount!!, scale),
+        sellDeliveryMethod = request.sellDeliveryMethod,
+        buyAsset = request.buyAsset,
+        buyAmount = getString(finalBuyAmount!!, scale),
+        buyDeliveryMethod = request.buyDeliveryMethod,
+        countryCode = request.countryCode,
+        createdAt = Instant.now(),
+        expiresAt = expiresAt,
+        clientId = request.clientId,
+        price = getString(finalPrice, 10),
+        totalPrice = getString(finalTotalPrice!!, 10),
+        fee =
+          org.stellar.reference.model.FeeDetails(
+            fee.total,
+            fee.asset,
+            fee.details.map {
+              org.stellar.reference.model.FeeDescription(it.name, it.description, it.amount)
+            }
+          )
+      )
+    quoteRepository.create(quote)
+
+    val rate =
+      GetRateResponse.Rate.builder()
+        .id(quote.id)
+        .price(quote.price)
+        .sellAmount(quote.sellAmount)
+        .buyAmount(quote.buyAmount)
+        .expiresAt(quote.expiresAt)
+        .fee(fee)
+        .build()
     return GetRateResponse(rate)
   }
 
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/data/Data.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/data/Data.kt
index 97684ab3cb..90c291662f 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/data/Data.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/data/Data.kt
@@ -96,6 +96,14 @@ data class RequestCustomerInfoUpdateHandler(
   val requiredCustomerInfoUpdates: List<String>? = null,
 ) : RpcActionParamsRequest()
 
+@Serializable
+data class NotifyCustomerInfoUpdatedRequest(
+  @SerialName("transaction_id") override val transactionId: String,
+  override val message: String? = null,
+  @SerialName("customer_id") val customerId: String? = null,
+  @SerialName("customer_type") val customerType: String? = null
+) : RpcActionParamsRequest()
+
 @Serializable
 data class NotifyOnchainFundsSentRequest(
   @SerialName("transaction_id") override val transactionId: String,
diff --git a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/event/processor/Sep6EventProcessor.kt b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/event/processor/Sep6EventProcessor.kt
index a29a289cc8..3f6caec31d 100644
--- a/kotlin-reference-server/src/main/kotlin/org/stellar/reference/event/processor/Sep6EventProcessor.kt
+++ b/kotlin-reference-server/src/main/kotlin/org/stellar/reference/event/processor/Sep6EventProcessor.kt
@@ -383,11 +383,21 @@ class Sep6EventProcessor(
           event.payload.transaction.id,
           missingFields,
         )
+        val existingCustomer =
+          customerService.getCustomer(
+            GetCustomerRequest.builder()
+              .account(customer.account)
+              .memo(customer.memo)
+              .memoType("id")
+              .build()
+          )
         sepHelper.rpcAction(
-          RpcMethod.REQUEST_CUSTOMER_INFO_UPDATE.toString(),
-          RequestCustomerInfoUpdateHandler(
+          RpcMethod.NOTIFY_CUSTOMER_INFO_UPDATED.toString(),
+          NotifyCustomerInfoUpdatedRequest(
             transactionId = event.payload.transaction.id,
             message = "Please update your info",
+            customerId = existingCustomer.id,
+            customerType = "sep6"
           ),
         )
       }
diff --git a/lib-util/src/main/java/org/stellar/anchor/util/NumberHelper.java b/lib-util/src/main/java/org/stellar/anchor/util/NumberHelper.java
new file mode 100644
index 0000000000..c32e2d752e
--- /dev/null
+++ b/lib-util/src/main/java/org/stellar/anchor/util/NumberHelper.java
@@ -0,0 +1,35 @@
+package org.stellar.anchor.util;
+
+import static java.lang.Math.*;
+import static java.math.RoundingMode.*;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+
+public class NumberHelper {
+  public static RoundingMode DEFAULT_ROUNDING_MODE = FLOOR;
+
+  public static boolean isPositiveNumber(String str) {
+    if (str == null) {
+      return false;
+    }
+
+    try {
+      return new BigDecimal(str).compareTo(BigDecimal.ZERO) > 0;
+    } catch (NumberFormatException e) {
+      return false;
+    }
+  }
+
+  public static boolean hasProperSignificantDecimals(String input, int maxDecimals) {
+    try {
+      BigDecimal decimal = new BigDecimal(input);
+      int scale = max(0, decimal.stripTrailingZeros().scale());
+
+      return scale >= 0 && scale <= maxDecimals;
+    } catch (NumberFormatException e) {
+      // If the input is not a valid number, return false
+      return false;
+    }
+  }
+}
diff --git a/lib-util/src/test/kotlin/org/stellar/anchor/util/NumberHelperTest.kt b/lib-util/src/test/kotlin/org/stellar/anchor/util/NumberHelperTest.kt
new file mode 100644
index 0000000000..f5e365ad3f
--- /dev/null
+++ b/lib-util/src/test/kotlin/org/stellar/anchor/util/NumberHelperTest.kt
@@ -0,0 +1,57 @@
+package org.stellar.anchor.util
+
+import org.junit.jupiter.api.Assertions.assertFalse
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+import org.junit.jupiter.params.provider.NullSource
+import org.junit.jupiter.params.provider.ValueSource
+
+class NumberHelperTest {
+  @ParameterizedTest
+  @ValueSource(strings = ["1", "100", "100000", "100.000"])
+  fun `test positive numbers`(value: String) {
+    assert(NumberHelper.isPositiveNumber(value))
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = ["0", "-1", "-100", "-100000", "-100.000"])
+  @NullSource
+  fun `test non positive numbers`(value: String?) {
+    assertFalse(NumberHelper.isPositiveNumber(value))
+  }
+
+  @ParameterizedTest
+  @CsvSource(
+    value =
+      [
+        "1, 2",
+        "-1, 2",
+        "1.00, 2",
+        "100.00, 2",
+        "101.00, 2",
+        "100.000000, 2",
+        "101.000000, 2",
+        "-1.00, 2",
+        "01.00, 2",
+        "1.000, 2"
+      ]
+  )
+  fun `test proper significant decimals`(value: String, maxDecimals: Int) {
+    assert(NumberHelper.hasProperSignificantDecimals(value, maxDecimals))
+  }
+
+  @ParameterizedTest
+  @CsvSource(
+    value =
+      [
+        "1.001, 2",
+        "-1.001, 2",
+        "1.0000001, 4",
+        "-1.0000001, 4",
+        "a, 1, 2",
+      ]
+  )
+  fun `test violating significant decimals`(value: String, maxDecimals: Int) {
+    assert(!NumberHelper.hasProperSignificantDecimals(value, maxDecimals))
+  }
+}
diff --git a/platform/src/main/java/org/stellar/anchor/platform/callback/RestRateIntegration.java b/platform/src/main/java/org/stellar/anchor/platform/callback/RestRateIntegration.java
index cab5ad6758..367360f94f 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/callback/RestRateIntegration.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/callback/RestRateIntegration.java
@@ -1,13 +1,22 @@
 package org.stellar.anchor.platform.callback;
 
+import static java.lang.Math.abs;
+import static java.lang.String.format;
 import static okhttp3.HttpUrl.get;
+import static org.stellar.anchor.util.ErrorHelper.logErrorAndThrow;
+import static org.stellar.anchor.util.Log.*;
+import static org.stellar.anchor.util.NumberHelper.hasProperSignificantDecimals;
+import static org.stellar.anchor.util.NumberHelper.isPositiveNumber;
 
 import com.google.common.reflect.TypeToken;
 import com.google.gson.Gson;
 import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.Map;
+import java.util.Objects;
 import okhttp3.HttpUrl;
 import okhttp3.HttpUrl.Builder;
 import okhttp3.OkHttpClient;
@@ -19,17 +28,29 @@
 import org.stellar.anchor.api.callback.RateIntegration;
 import org.stellar.anchor.api.exception.AnchorException;
 import org.stellar.anchor.api.exception.ServerErrorException;
+import org.stellar.anchor.api.sep.AssetInfo;
+import org.stellar.anchor.api.shared.FeeDescription;
+import org.stellar.anchor.api.shared.FeeDetails;
+import org.stellar.anchor.asset.AssetService;
 import org.stellar.anchor.auth.AuthHelper;
-import org.stellar.anchor.util.Log;
 
 public class RestRateIntegration implements RateIntegration {
+  private static final RoundingMode[] ALLOWED_ROUNDING_MODES_FOR_QUOTE_VALIDATION =
+      new RoundingMode[] {
+        RoundingMode.FLOOR, RoundingMode.CEILING, RoundingMode.HALF_UP, RoundingMode.HALF_DOWN
+      };
   private final String anchorEndpoint;
   private final OkHttpClient httpClient;
   private final Gson gson;
   private final AuthHelper authHelper;
+  private final AssetService assetService;
 
   public RestRateIntegration(
-      String anchorEndpoint, OkHttpClient httpClient, AuthHelper authHelper, Gson gson) {
+      String anchorEndpoint,
+      OkHttpClient httpClient,
+      AuthHelper authHelper,
+      Gson gson,
+      AssetService assetService) {
     try {
       new URI(anchorEndpoint);
     } catch (URISyntaxException e) {
@@ -40,6 +61,7 @@ public RestRateIntegration(
     this.httpClient = httpClient;
     this.authHelper = authHelper;
     this.gson = gson;
+    this.assetService = assetService;
   }
 
   @Override
@@ -68,29 +90,191 @@ public GetRateResponse getRate(GetRateRequest request) throws AnchorException {
     try {
       getRateResponse = gson.fromJson(responseContent, GetRateResponse.class);
     } catch (Exception e) { // cannot read body from response
-      Log.errorEx("Error parsing body response to GetRateResponse", e);
+      errorEx("Error parsing body response to GetRateResponse", e);
       throw new ServerErrorException("internal server error", e);
     }
 
+    validateRateResponse(request, getRateResponse);
+    return getRateResponse;
+  }
+
+  void validateRateResponse(GetRateRequest request, GetRateResponse getRateResponse)
+      throws ServerErrorException {
+    AssetInfo sellAsset = assetService.getAssetByName(request.getSellAsset());
+    AssetInfo buyAsset = assetService.getAssetByName(request.getBuyAsset());
+
     GetRateResponse.Rate rate = getRateResponse.getRate();
     if (rate == null || rate.getPrice() == null) {
-      Log.error("missing 'price' in the GET /rate response");
-      throw new ServerErrorException("internal server error");
+      logErrorAndThrow(
+          "missing 'rate.price' in the GET /rate response", ServerErrorException.class);
     }
 
-    if (request.getType() != GetRateRequest.Type.INDICATIVE) {
-      if (rate.getFee() == null) {
-        Log.error("'fee' is missing in the GET /rate response");
-        throw new ServerErrorException("internal server error");
+    if (request.getType() == GetRateRequest.Type.FIRM) {
+      if (Objects.requireNonNull(rate).getFee() == null) {
+        logErrorAndThrow(
+            "'rate.fee' is missing in the GET /rate response", ServerErrorException.class);
+      }
+      if (rate.getId() == null || rate.getExpiresAt() == null) {
+        logErrorAndThrow(
+            "'rate.id' or 'rate.expires_at' are missing in the GET /rate response. When the rate is firm, these fields are required",
+            ServerErrorException.class);
       }
     }
 
-    if (request.getType() == GetRateRequest.Type.FIRM) {
-      if (rate.getId() == null || rate.getExpiresAt() == null) {
-        Log.error("'id' and/or 'expires_at' are missing in the GET /rate response");
-        throw new ServerErrorException("internal server error");
+    // sell_amount is present and positive number
+    if (!isPositiveNumber(Objects.requireNonNull(rate).getSellAmount())) {
+      logErrorAndThrow(
+          "'rate.sell_amount' is missing or not a positive number in the GET /rate response",
+          ServerErrorException.class);
+    }
+
+    // buy_amount is present and positive number
+    if (!isPositiveNumber(rate.getBuyAmount())) {
+      logErrorAndThrow(
+          "'rate.buy_amount' is missing or not a positive number in the GET /rate response",
+          ServerErrorException.class);
+    }
+
+    // sell_amount has a proper number of significant decimals
+    if (!hasProperSignificantDecimals(
+        Objects.requireNonNull(rate).getSellAmount(), sellAsset.getSignificantDecimals())) {
+      logErrorAndThrow(
+          format(
+              "'rate.sell_amount' (%s) has incorrect number of significant decimals (expected: %d) in the GET /rate response",
+              Objects.requireNonNull(rate).getSellAmount(), sellAsset.getSignificantDecimals()),
+          ServerErrorException.class);
+    }
+
+    // buy_amount has a proper number of significant decimals
+    if (!hasProperSignificantDecimals(
+        Objects.requireNonNull(rate).getBuyAmount(), buyAsset.getSignificantDecimals())) {
+      logErrorAndThrow(
+          format(
+              "'rate.buy_amount' (%s) has incorrect number of significant decimals (expected: %d) in the GET /rate response",
+              rate.getBuyAmount(), buyAsset.getSignificantDecimals()),
+          ServerErrorException.class);
+    }
+
+    FeeDetails fee = rate.getFee();
+    // if fee is set, check the following
+    if (fee != null) {
+      // fee.total is present and is a positive number
+      if (!isPositiveNumber(fee.getTotal())) {
+        logErrorAndThrow(
+            "'rate.fee.total' is missing or not a positive number in the GET /rate response",
+            ServerErrorException.class);
+      }
+      // fee.asset is a valid asset
+      AssetInfo feeAsset = assetService.getAssetByName(fee.getAsset());
+      if (fee.getAsset() == null || feeAsset == null) {
+        logErrorAndThrow(
+            "'rate.fee.asset' is missing or not a valid asset in the GET /rate response",
+            ServerErrorException.class);
+      }
+
+      if (!isPositiveNumber(Objects.requireNonNull(feeAsset.getSignificantDecimals()).toString())) {
+        logErrorAndThrow(
+            format(
+                "The fee.asset (%s) does not have the significant_decimals defined in the assets configuration.",
+                feeAsset.getSignificantDecimals()),
+            ServerErrorException.class);
+      }
+
+      // fee.total has a proper number of significant decimals
+      if (!hasProperSignificantDecimals(fee.getTotal(), feeAsset.getSignificantDecimals())) {
+        logErrorAndThrow(
+            format(
+                "'rate.fee.total' (%s) has incorrect number of significant decimals (expected: %d) in the GET /rate response",
+                fee.getTotal(), feeAsset.getSignificantDecimals()),
+            ServerErrorException.class);
+      }
+
+      if (fee.getAsset().equals(request.getSellAsset())) {
+        // when fee is in sell_asset,
+        // check that sell_amount ~= price * buy_amount + (fee ?: 0)
+        BigDecimal expected =
+            new BigDecimal(rate.getPrice())
+                .multiply(new BigDecimal(rate.getBuyAmount()))
+                .add(new BigDecimal(fee.getTotal()));
+        if (!withinRoundingError(
+            new BigDecimal(rate.getSellAmount()), expected, sellAsset.getSignificantDecimals())) {
+          logErrorAndThrow(
+              format(
+                  "'rate.sell_amount' (%s) is not within rounding error of the expected (%s) ('price * buy_amount + fee') in the GET /rate response",
+                  rate.getSellAmount(), expected),
+              ServerErrorException.class);
+        }
+      } else {
+        // when fee is in buy_asset,
+        // check that sell_amount ~= price * (buy_amount + (fee ?: 0))
+        BigDecimal expected =
+            new BigDecimal(rate.getPrice())
+                .multiply(new BigDecimal(rate.getBuyAmount()).add(new BigDecimal(fee.getTotal())));
+        if (!withinRoundingError(
+            new BigDecimal(rate.getSellAmount()), expected, sellAsset.getSignificantDecimals())) {
+          logErrorAndThrow(
+              format(
+                  "'rate.sell_amount' (%s) is not within rounding error of the expected (%s) ('price * (buy_amount + fee)') in the GET /rate response",
+                  rate.getSellAmount(), expected),
+              ServerErrorException.class);
+        }
+      }
+
+      if (fee.getDetails() != null) {
+        BigDecimal totalFee = new BigDecimal(0);
+        for (FeeDescription feeDescription : fee.getDetails()) {
+          if (!isPositiveNumber(feeDescription.getAmount())) {
+            logErrorAndThrow(
+                "'rate.fee.details[?].description.amount' is missing or not a positive number in the GET /rate response",
+                ServerErrorException.class);
+          }
+          if (!hasProperSignificantDecimals(
+              feeDescription.getAmount(), feeAsset.getSignificantDecimals())) {
+            logErrorAndThrow(
+                "'rate.fee.details[?].description.amount' has incorrect number of significant decimals in the GET /rate response",
+                ServerErrorException.class);
+          }
+          if (feeDescription.getName() == null) {
+            logErrorAndThrow(
+                "'rate.fee.details.description[?].name' is missing in the GET /rate response",
+                ServerErrorException.class);
+          }
+          totalFee = totalFee.add(new BigDecimal(feeDescription.getAmount()));
+        }
+
+        // check that sell_amount is equal to price * buy_amount + (fee ?: 0)
+        if (totalFee.compareTo(new BigDecimal(fee.getTotal())) != 0) {
+          logErrorAndThrow(
+              format(
+                  "'rate.fee.total' (%s) is not equal to the sum of fees (%s) in the GET /rate response",
+                  fee.getTotal(), totalFee),
+              ServerErrorException.class);
+        }
+      }
+    } else {
+      // when fee is not present, check that sell_amount ~= price * buy_amount
+      BigDecimal expected =
+          new BigDecimal(rate.getPrice()).multiply(new BigDecimal(rate.getBuyAmount()));
+      if (withinRoundingError(
+          new BigDecimal(rate.getSellAmount()), expected, sellAsset.getSignificantDecimals())) {
+        logErrorAndThrow(
+            format(
+                "'rate.sell_amount' (%s) is not within the expected (%s) ('price * buy_amount') in the GET /rate response",
+                rate.getSellAmount(), expected),
+            ServerErrorException.class);
       }
     }
-    return getRateResponse;
+  }
+
+  /**
+   * Check the amount is within rounding error of the expected amount.
+   *
+   * @param amount The amount to be compared
+   * @param expected The expected amount
+   * @param precision The scale to be used for comparison
+   * @return true if the amount is within rounding error of the expected amount
+   */
+  static boolean withinRoundingError(BigDecimal amount, BigDecimal expected, int precision) {
+    return abs(amount.subtract(expected).doubleValue()) < Math.pow(10, -precision);
   }
 }
diff --git a/platform/src/main/java/org/stellar/anchor/platform/component/eventprocessor/EventProcessorBeans.java b/platform/src/main/java/org/stellar/anchor/platform/component/eventprocessor/EventProcessorBeans.java
index e7709c4486..2648831767 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/component/eventprocessor/EventProcessorBeans.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/component/eventprocessor/EventProcessorBeans.java
@@ -2,10 +2,12 @@
 
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
 import org.stellar.anchor.MoreInfoUrlConstructor;
 import org.stellar.anchor.asset.AssetService;
 import org.stellar.anchor.config.SecretConfig;
 import org.stellar.anchor.event.EventService;
+import org.stellar.anchor.platform.component.sep.ApiClientBeans;
 import org.stellar.anchor.platform.config.CallbackApiConfig;
 import org.stellar.anchor.platform.config.EventProcessorConfig;
 import org.stellar.anchor.platform.config.PropertyClientsConfig;
@@ -15,6 +17,7 @@
 import org.stellar.anchor.sep6.Sep6TransactionStore;
 
 @Configuration
+@Import(ApiClientBeans.class)
 public class EventProcessorBeans {
 
   @Bean
diff --git a/platform/src/main/java/org/stellar/anchor/platform/component/platform/RpcActionBeans.java b/platform/src/main/java/org/stellar/anchor/platform/component/platform/RpcActionBeans.java
index 2dd466326f..3b91896ae6 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/component/platform/RpcActionBeans.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/component/platform/RpcActionBeans.java
@@ -3,12 +3,15 @@
 import java.util.List;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Import;
+import org.stellar.anchor.api.callback.CustomerIntegration;
 import org.stellar.anchor.asset.AssetService;
 import org.stellar.anchor.config.CustodyConfig;
 import org.stellar.anchor.custody.CustodyService;
 import org.stellar.anchor.event.EventService;
 import org.stellar.anchor.horizon.Horizon;
 import org.stellar.anchor.metrics.MetricsService;
+import org.stellar.anchor.platform.component.sep.ApiClientBeans;
 import org.stellar.anchor.platform.config.PropertyCustodyConfig;
 import org.stellar.anchor.platform.config.RpcConfig;
 import org.stellar.anchor.platform.data.JdbcTransactionPendingTrustRepo;
@@ -22,6 +25,7 @@
 import org.stellar.anchor.sep6.Sep6TransactionStore;
 
 @Configuration
+@Import(ApiClientBeans.class)
 public class RpcActionBeans {
 
   @Bean
@@ -405,6 +409,7 @@ NotifyCustomerInfoUpdatedHandler notifyCustomerInfoUpdatedHandler(
       Sep24TransactionStore txn24Store,
       Sep31TransactionStore txn31Store,
       RequestValidator requestValidator,
+      CustomerIntegration customerIntegration,
       AssetService assetService,
       EventService eventService,
       MetricsService metricsService) {
@@ -413,6 +418,7 @@ NotifyCustomerInfoUpdatedHandler notifyCustomerInfoUpdatedHandler(
         txn24Store,
         txn31Store,
         requestValidator,
+        customerIntegration,
         assetService,
         eventService,
         metricsService);
diff --git a/platform/src/main/java/org/stellar/anchor/platform/component/sep/ApiClientBeans.java b/platform/src/main/java/org/stellar/anchor/platform/component/sep/ApiClientBeans.java
index a0b79d5c8e..aff0b7d95a 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/component/sep/ApiClientBeans.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/component/sep/ApiClientBeans.java
@@ -15,6 +15,7 @@
 import org.stellar.anchor.api.callback.FeeIntegration;
 import org.stellar.anchor.api.callback.RateIntegration;
 import org.stellar.anchor.api.callback.UniqueAddressIntegration;
+import org.stellar.anchor.asset.AssetService;
 import org.stellar.anchor.auth.AuthHelper;
 import org.stellar.anchor.platform.callback.RestCustomerIntegration;
 import org.stellar.anchor.platform.callback.RestFeeIntegration;
@@ -79,9 +80,16 @@ CustomerIntegration customerIntegration(
 
   @Bean
   RateIntegration rateIntegration(
-      CallbackApiConfig callbackApiConfig, OkHttpClient httpClient, Gson gson) {
+      CallbackApiConfig callbackApiConfig,
+      OkHttpClient httpClient,
+      Gson gson,
+      AssetService assetService) {
     return new RestRateIntegration(
-        callbackApiConfig.getBaseUrl(), httpClient, callbackApiConfig.buildAuthHelper(), gson);
+        callbackApiConfig.getBaseUrl(),
+        httpClient,
+        callbackApiConfig.buildAuthHelper(),
+        gson,
+        assetService);
   }
 
   @Bean
diff --git a/platform/src/main/java/org/stellar/anchor/platform/config/PropertyClientsConfig.java b/platform/src/main/java/org/stellar/anchor/platform/config/PropertyClientsConfig.java
index 851df76f1e..3d5799fc14 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/config/PropertyClientsConfig.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/config/PropertyClientsConfig.java
@@ -4,12 +4,14 @@
 import static org.stellar.anchor.util.Log.debugF;
 import static org.stellar.anchor.util.StringHelper.isEmpty;
 
+import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import javax.annotation.PostConstruct;
 import lombok.Data;
 import org.jetbrains.annotations.NotNull;
@@ -116,13 +118,8 @@ public void validateCustodialClient(ClientConfig clientConfig, Errors errors) {
           "client-signing-keys-conflict",
           "The client.signingKey and The client.signingKeys cannot coexist, please choose one to use");
     }
-    if (!isEmpty(clientConfig.getCallbackUrl())) {
-      try {
-        new URL(clientConfig.getCallbackUrl());
-      } catch (MalformedURLException e) {
-        errors.reject("client-invalid-callback_url", "The client.callbackUrl is invalid");
-      }
-    }
+
+    validateCallbackUrls(clientConfig, errors);
   }
 
   public void validateNonCustodialClient(ClientConfig clientConfig, Errors errors) {
@@ -139,13 +136,7 @@ public void validateNonCustodialClient(ClientConfig clientConfig, Errors errors)
           "The client.domain and the client.domains cannot coexist, please choose one to use");
     }
 
-    if (!isEmpty(clientConfig.getCallbackUrl())) {
-      try {
-        new URL(clientConfig.getCallbackUrl());
-      } catch (MalformedURLException e) {
-        errors.reject("client-invalid-callback_url", "The client.callbackUrl is invalid");
-      }
-    }
+    validateCallbackUrls(clientConfig, errors);
 
     if (clientConfig.getDestinationAccounts() != null) {
       errors.reject(
@@ -153,4 +144,28 @@ public void validateNonCustodialClient(ClientConfig clientConfig, Errors errors)
           "Destination accounts list is not a valid configuration option for a non-custodial client");
     }
   }
+
+  void validateCallbackUrls(ClientConfig client, Errors errors) {
+    ImmutableMap.of(
+            "callback_url",
+            Optional.ofNullable(client.getCallbackUrl()).orElse(""),
+            "callback_url_sep6",
+            Optional.ofNullable(client.getCallbackUrlSep6()).orElse(""),
+            "callback_url_sep24",
+            Optional.ofNullable(client.getCallbackUrlSep24()).orElse(""),
+            "callback_url_sep31",
+            Optional.ofNullable(client.getCallbackUrlSep31()).orElse(""),
+            "callback_url_sep12",
+            Optional.ofNullable(client.getCallbackUrlSep12()).orElse(""))
+        .forEach(
+            (key, value) -> {
+              if (!isEmpty(value)) {
+                try {
+                  new URL(value);
+                } catch (MalformedURLException e) {
+                  errors.reject("client-invalid-" + key, "The client." + key + " is invalid");
+                }
+              }
+            });
+  }
 }
diff --git a/platform/src/main/java/org/stellar/anchor/platform/controller/AbstractControllerExceptionHandler.java b/platform/src/main/java/org/stellar/anchor/platform/controller/AbstractControllerExceptionHandler.java
index ae94cdf55f..7bb79bc560 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/controller/AbstractControllerExceptionHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/controller/AbstractControllerExceptionHandler.java
@@ -97,6 +97,15 @@ public CustodyExceptionResponse handleCustodyServiceUnavailableError(AnchorExcep
     return new CustodyExceptionResponse(ex.getMessage());
   }
 
+  // HTTP code: 502
+  // Received an invalid response from the upstream server.
+  @ResponseStatus(HttpStatus.BAD_GATEWAY)
+  @ExceptionHandler({ServerErrorException.class})
+  public SepExceptionResponse handleServerErrorException(Exception ex) {
+    infoF("An upstream server returns a invalid response: {}", ex);
+    return new SepExceptionResponse(ex.getMessage());
+  }
+
   @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR)
   @ExceptionHandler({Exception.class})
   public SepExceptionResponse handleInternalError(Exception ex) {
diff --git a/platform/src/main/java/org/stellar/anchor/platform/event/ClientStatusCallbackHandler.java b/platform/src/main/java/org/stellar/anchor/platform/event/ClientStatusCallbackHandler.java
index aa5418f410..0524c751ce 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/event/ClientStatusCallbackHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/event/ClientStatusCallbackHandler.java
@@ -17,9 +17,12 @@
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import org.apache.commons.lang3.StringUtils;
 import org.stellar.anchor.MoreInfoUrlConstructor;
 import org.stellar.anchor.api.event.AnchorEvent;
 import org.stellar.anchor.api.exception.AnchorException;
+import org.stellar.anchor.api.exception.InternalServerErrorException;
+import org.stellar.anchor.api.exception.InvalidConfigException;
 import org.stellar.anchor.api.exception.SepException;
 import org.stellar.anchor.api.platform.GetTransactionResponse;
 import org.stellar.anchor.api.sep.sep24.Sep24GetTransactionResponse;
@@ -35,6 +38,7 @@
 import org.stellar.anchor.sep6.Sep6Transaction;
 import org.stellar.anchor.sep6.Sep6TransactionStore;
 import org.stellar.anchor.sep6.Sep6TransactionUtils;
+import org.stellar.anchor.util.Log;
 import org.stellar.sdk.KeyPair;
 
 public class ClientStatusCallbackHandler extends EventHandler {
@@ -70,15 +74,17 @@ public ClientStatusCallbackHandler(
 
   @Override
   boolean handleEvent(AnchorEvent event) throws IOException {
-    if (event.getTransaction() != null) {
+    if (event.getTransaction() != null || event.getCustomer() != null) {
       KeyPair signer = KeyPair.fromSecretSeed(secretConfig.getSep10SigningSeed());
       Request request = buildHttpRequest(signer, event);
-      Response response = httpClient.newCall(request).execute();
-      debugF(
-          "Sending event: {} to client status api: {}", json(event), clientConfig.getCallbackUrl());
-      if (response.code() < 200 || response.code() >= 400) {
-        errorF("Failed to send event to client status API. Error code: {}", response.code());
-        return false;
+
+      if (request != null) {
+        Response response = httpClient.newCall(request).execute();
+        debugF("Sending event: {} to client status api: {}", json(event), request.url());
+        if (response.code() < 200 || response.code() >= 400) {
+          errorF("Failed to send event to client status API. Error code: {}", response.code());
+          return false;
+        }
       }
     }
     return true;
@@ -86,8 +92,45 @@ boolean handleEvent(AnchorEvent event) throws IOException {
 
   @SneakyThrows
   Request buildHttpRequest(KeyPair signer, AnchorEvent event) {
+    String callbackUrl = getCallbackUrl(event);
+    if (callbackUrl == null) {
+      Log.debugF("No callback URL found for event: {}", json(event));
+      return null;
+    }
+
     String payload = getPayload(event);
-    return buildHttpRequest(signer, payload, clientConfig.getCallbackUrl());
+    return buildHttpRequest(signer, payload, callbackUrl);
+  }
+
+  String getCallbackUrl(AnchorEvent event) throws InvalidConfigException {
+    String callbackUrl = clientConfig.getCallbackUrl();
+    if (event.getTransaction() != null) {
+      switch (event.getTransaction().getSep()) {
+        case SEP_6:
+          if (!StringUtils.isEmpty(clientConfig.getCallbackUrlSep6())) {
+            callbackUrl = clientConfig.getCallbackUrlSep6();
+          }
+          break;
+        case SEP_24:
+          if (!StringUtils.isEmpty(clientConfig.getCallbackUrlSep24())) {
+            callbackUrl = clientConfig.getCallbackUrlSep24();
+          }
+          break;
+        case SEP_31:
+          if (!StringUtils.isEmpty(clientConfig.getCallbackUrlSep31())) {
+            callbackUrl = clientConfig.getCallbackUrlSep31();
+          }
+          break;
+        default:
+          throw new InvalidConfigException(
+              String.format("Unsupported SEP: %s", event.getTransaction().getSep()));
+      }
+    } else if (event.getCustomer() != null) {
+      if (!StringUtils.isEmpty(clientConfig.getCallbackUrlSep12())) {
+        callbackUrl = clientConfig.getCallbackUrlSep12();
+      }
+    }
+    return callbackUrl;
   }
 
   @SneakyThrows
@@ -110,27 +153,33 @@ public static Request buildHttpRequest(KeyPair signer, String payload, String ur
   }
 
   private String getPayload(AnchorEvent event) throws AnchorException {
-    switch (event.getTransaction().getSep()) {
-      case SEP_6:
-        // TODO: remove dependence on the transaction store
-        Sep6Transaction sep6Txn =
-            sep6TransactionStore.findByTransactionId(event.getTransaction().getId());
-        org.stellar.anchor.api.sep.sep6.GetTransactionResponse sep6TxnRes =
-            new org.stellar.anchor.api.sep.sep6.GetTransactionResponse(
-                Sep6TransactionUtils.fromTxn(sep6Txn, sep6MoreInfoUrlConstructor, null));
-        return json(sep6TxnRes);
-      case SEP_24:
-        Sep24Transaction sep24Txn = fromSep24Txn(event.getTransaction());
-        Sep24GetTransactionResponse txn24Response =
-            Sep24GetTransactionResponse.of(
-                fromTxn(assetService, sep24MoreInfoUrlConstructor, sep24Txn, null));
-        return json(txn24Response);
-      case SEP_31:
-        Sep31Transaction sep31Txn = fromSep31Txn(event.getTransaction());
-        return json(sep31Txn.toSep31GetTransactionResponse());
-      default:
-        throw new SepException(
-            String.format("Unsupported SEP: %s", event.getTransaction().getSep()));
+    if (event.getTransaction() != null) {
+      switch (event.getTransaction().getSep()) {
+        case SEP_6:
+          // TODO: remove dependence on the transaction store
+          Sep6Transaction sep6Txn =
+              sep6TransactionStore.findByTransactionId(event.getTransaction().getId());
+          org.stellar.anchor.api.sep.sep6.GetTransactionResponse sep6TxnRes =
+              new org.stellar.anchor.api.sep.sep6.GetTransactionResponse(
+                  Sep6TransactionUtils.fromTxn(sep6Txn, sep6MoreInfoUrlConstructor, null));
+          return json(sep6TxnRes);
+        case SEP_24:
+          Sep24Transaction sep24Txn = fromSep24Txn(event.getTransaction());
+          Sep24GetTransactionResponse txn24Response =
+              Sep24GetTransactionResponse.of(
+                  fromTxn(assetService, sep24MoreInfoUrlConstructor, sep24Txn, null));
+          return json(txn24Response);
+        case SEP_31:
+          Sep31Transaction sep31Txn = fromSep31Txn(event.getTransaction());
+          return json(sep31Txn.toSep31GetTransactionResponse());
+        default:
+          throw new SepException(
+              String.format("Unsupported SEP: %s", event.getTransaction().getSep()));
+      }
+    } else if (event.getCustomer() != null) {
+      return json(event.getCustomer());
+    } else {
+      throw new InternalServerErrorException("Event must have either a transaction or a customer");
     }
   }
 
diff --git a/platform/src/main/java/org/stellar/anchor/platform/event/EventProcessorManager.java b/platform/src/main/java/org/stellar/anchor/platform/event/EventProcessorManager.java
index c2ec99bf75..ba68fcb4d0 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/event/EventProcessorManager.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/event/EventProcessorManager.java
@@ -10,7 +10,6 @@
 import javax.annotation.PostConstruct;
 import javax.annotation.PreDestroy;
 import lombok.SneakyThrows;
-import org.apache.commons.lang3.StringUtils;
 import org.stellar.anchor.MoreInfoUrlConstructor;
 import org.stellar.anchor.api.exception.AnchorException;
 import org.stellar.anchor.api.exception.InternalServerErrorException;
@@ -84,7 +83,7 @@ public void start() {
     // clientsConfig
     if (eventProcessorConfig.getClientStatusCallback().isEnabled()) {
       for (PropertyClientsConfig.ClientConfig clientConfig : clientsConfig.getClients()) {
-        if (StringUtils.isEmpty(clientConfig.getCallbackUrl())) {
+        if (!clientConfig.isCallbackEnabled()) {
           Log.info(String.format("Client status callback skipped: %s", json(clientConfig)));
           continue;
         }
diff --git a/platform/src/main/java/org/stellar/anchor/platform/rpc/DoStellarRefundHandler.java b/platform/src/main/java/org/stellar/anchor/platform/rpc/DoStellarRefundHandler.java
index 6b019b6020..8ddaed6494 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/rpc/DoStellarRefundHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/rpc/DoStellarRefundHandler.java
@@ -81,14 +81,14 @@ protected void validate(JdbcSepTransaction txn, DoStellarRefundRequest request)
           String.format("RPC method[%s] requires enabled custody integration", getRpcMethod()));
     }
 
-    AssetValidationUtils.validateAsset(
+    AssetValidationUtils.validateAssetAmount(
         "refund.amount",
         AmountAssetRequest.builder()
             .amount(request.getRefund().getAmount().getAmount())
             .asset(txn.getAmountInAsset())
             .build(),
         assetService);
-    AssetValidationUtils.validateAsset(
+    AssetValidationUtils.validateAssetAmount(
         "refund.amountFee",
         AmountAssetRequest.builder()
             .amount(request.getRefund().getAmountFee().getAmount())
diff --git a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyAmountsUpdatedHandler.java b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyAmountsUpdatedHandler.java
index da38d28df1..44fd24d329 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyAmountsUpdatedHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyAmountsUpdatedHandler.java
@@ -60,7 +60,7 @@ protected void validate(JdbcSepTransaction txn, NotifyAmountsUpdatedRequest requ
       throw new InvalidParamsException("Either amount_fee or fee_details must be set");
     }
 
-    AssetValidationUtils.validateAsset(
+    AssetValidationUtils.validateAssetAmount(
         "amount_out",
         AmountAssetRequest.builder()
             .amount(request.getAmountOut().getAmount())
@@ -69,7 +69,7 @@ protected void validate(JdbcSepTransaction txn, NotifyAmountsUpdatedRequest requ
         true,
         assetService);
     if (request.getAmountFee() != null) {
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "amount_fee",
           AmountAssetRequest.builder()
               .amount(request.getAmountFee().getAmount())
diff --git a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyCustomerInfoUpdatedHandler.java b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyCustomerInfoUpdatedHandler.java
index 1b206d6018..6bfa21fc7b 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyCustomerInfoUpdatedHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyCustomerInfoUpdatedHandler.java
@@ -1,12 +1,17 @@
 package org.stellar.anchor.platform.rpc;
 
 import static java.util.Collections.emptySet;
-import static org.stellar.anchor.api.platform.PlatformTransactionData.Sep.SEP_31;
+import static org.stellar.anchor.api.platform.PlatformTransactionData.Sep.*;
 import static org.stellar.anchor.api.rpc.method.RpcMethod.NOTIFY_CUSTOMER_INFO_UPDATED;
-import static org.stellar.anchor.api.sep.SepTransactionStatus.PENDING_CUSTOMER_INFO_UPDATE;
-import static org.stellar.anchor.api.sep.SepTransactionStatus.PENDING_RECEIVER;
+import static org.stellar.anchor.api.sep.SepTransactionStatus.*;
 
 import java.util.Set;
+import java.util.UUID;
+import org.stellar.anchor.api.callback.CustomerIntegration;
+import org.stellar.anchor.api.callback.GetCustomerRequest;
+import org.stellar.anchor.api.callback.GetCustomerResponse;
+import org.stellar.anchor.api.event.AnchorEvent;
+import org.stellar.anchor.api.exception.AnchorException;
 import org.stellar.anchor.api.exception.BadRequestException;
 import org.stellar.anchor.api.exception.rpc.InvalidParamsException;
 import org.stellar.anchor.api.exception.rpc.InvalidRequestException;
@@ -14,6 +19,7 @@
 import org.stellar.anchor.api.rpc.method.NotifyCustomerInfoUpdatedRequest;
 import org.stellar.anchor.api.rpc.method.RpcMethod;
 import org.stellar.anchor.api.sep.SepTransactionStatus;
+import org.stellar.anchor.api.sep.sep12.Sep12Status;
 import org.stellar.anchor.asset.AssetService;
 import org.stellar.anchor.event.EventService;
 import org.stellar.anchor.metrics.MetricsService;
@@ -25,12 +31,15 @@
 
 public class NotifyCustomerInfoUpdatedHandler
     extends RpcMethodHandler<NotifyCustomerInfoUpdatedRequest> {
+  private final CustomerIntegration customerIntegration;
+  private final EventService.Session eventSession;
 
   public NotifyCustomerInfoUpdatedHandler(
       Sep6TransactionStore txn6Store,
       Sep24TransactionStore txn24Store,
       Sep31TransactionStore txn31Store,
       RequestValidator requestValidator,
+      CustomerIntegration customerIntegration,
       AssetService assetService,
       EventService eventService,
       MetricsService metricsService) {
@@ -43,6 +52,9 @@ public NotifyCustomerInfoUpdatedHandler(
         eventService,
         metricsService,
         NotifyCustomerInfoUpdatedRequest.class);
+    this.customerIntegration = customerIntegration;
+    this.eventSession =
+        eventService.createSession(this.getClass().getName(), EventService.EventQueue.TRANSACTION);
   }
 
   @Override
@@ -58,16 +70,67 @@ public RpcMethod getRpcMethod() {
 
   @Override
   protected SepTransactionStatus getNextStatus(
-      JdbcSepTransaction txn, NotifyCustomerInfoUpdatedRequest request) {
-    return PENDING_RECEIVER;
+      JdbcSepTransaction txn, NotifyCustomerInfoUpdatedRequest request) throws AnchorException {
+    String status = null;
+    if (request.getCustomerId() != null) {
+      GetCustomerResponse customer =
+          customerIntegration.getCustomer(
+              GetCustomerRequest.builder()
+                  .transactionId(txn.getId())
+                  .id(request.getCustomerId())
+                  .type(request.getCustomerType())
+                  .build());
+      status = customer.getStatus();
+      eventSession.publish(
+          AnchorEvent.builder()
+              .id(UUID.randomUUID().toString())
+              .sep(SEP_12.getSep().toString())
+              .type(AnchorEvent.Type.CUSTOMER_UPDATED)
+              .customer(GetCustomerResponse.to(customer))
+              .build());
+    }
+
+    if (SEP_6 == Sep.from(txn.getProtocol())) {
+      if (status == null) {
+        return PENDING_ANCHOR;
+      }
+      switch (Sep12Status.valueOf(status)) {
+        case ACCEPTED, PROCESSING:
+          return PENDING_ANCHOR;
+        case NEEDS_INFO:
+          return PENDING_CUSTOMER_INFO_UPDATE;
+        case REJECTED:
+          return ERROR;
+      }
+    }
+    if (SEP_31 == Sep.from(txn.getProtocol())) {
+      if (status == null) {
+        return PENDING_RECEIVER;
+      }
+      switch (Sep12Status.valueOf(status)) {
+        case ACCEPTED, PROCESSING:
+          return PENDING_RECEIVER;
+        case NEEDS_INFO:
+          return PENDING_CUSTOMER_INFO_UPDATE;
+        case REJECTED:
+          return ERROR;
+      }
+    }
+    throw new InvalidRequestException(
+        String.format(
+            "RPC method[%s] is not supported for protocol[%s]", getRpcMethod(), txn.getProtocol()));
   }
 
   @Override
   protected Set<SepTransactionStatus> getSupportedStatuses(JdbcSepTransaction txn) {
-    if (SEP_31 == Sep.from(txn.getProtocol())) {
-      return Set.of(PENDING_CUSTOMER_INFO_UPDATE);
+    switch (Sep.from(txn.getProtocol())) {
+      case SEP_6:
+        return Set.of(INCOMPLETE, PENDING_ANCHOR, PENDING_CUSTOMER_INFO_UPDATE);
+      case SEP_31:
+        return Set.of(PENDING_RECEIVER, PENDING_CUSTOMER_INFO_UPDATE);
+      default:
+        return emptySet();
     }
-    return emptySet();
   }
 
   @Override
diff --git a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyInteractiveFlowCompletedHandler.java b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyInteractiveFlowCompletedHandler.java
index e258055949..47f5a2aa7f 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyInteractiveFlowCompletedHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyInteractiveFlowCompletedHandler.java
@@ -56,7 +56,7 @@ protected void validate(JdbcSepTransaction txn, NotifyInteractiveFlowCompletedRe
 
     JdbcSep24Transaction txn24 = (JdbcSep24Transaction) txn;
 
-    AssetValidationUtils.validateAsset("amount_in", request.getAmountIn(), assetService);
+    AssetValidationUtils.validateAssetAmount("amount_in", request.getAmountIn(), assetService);
     switch (Kind.from(txn24.getKind())) {
       case DEPOSIT:
         if (AssetValidationUtils.isStellarAsset(request.getAmountIn().getAsset())) {
@@ -70,7 +70,7 @@ protected void validate(JdbcSepTransaction txn, NotifyInteractiveFlowCompletedRe
         break;
     }
 
-    AssetValidationUtils.validateAsset("amount_out", request.getAmountOut(), assetService);
+    AssetValidationUtils.validateAssetAmount("amount_out", request.getAmountOut(), assetService);
     switch (Kind.from(txn24.getKind())) {
       case DEPOSIT:
         if (!AssetValidationUtils.isStellarAsset(request.getAmountOut().getAsset())) {
@@ -90,7 +90,8 @@ protected void validate(JdbcSepTransaction txn, NotifyInteractiveFlowCompletedRe
     }
 
     if (request.getAmountFee() != null) {
-      AssetValidationUtils.validateAsset("amount_fee", request.getAmountFee(), true, assetService);
+      AssetValidationUtils.validateAssetAmount(
+          "amount_fee", request.getAmountFee(), true, assetService);
     }
     if (request.getFeeDetails() != null) {
       AssetValidationUtils.validateFeeDetails(request.getFeeDetails(), txn, assetService);
@@ -113,7 +114,7 @@ protected void validate(JdbcSepTransaction txn, NotifyInteractiveFlowCompletedRe
     }
 
     if (request.getAmountExpected() != null) {
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "amount_expected",
           AmountAssetRequest.builder()
               .amount(request.getAmountExpected().getAmount())
diff --git a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyOffchainFundsReceivedHandler.java b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyOffchainFundsReceivedHandler.java
index 5a7fe88e6b..9643b58b54 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyOffchainFundsReceivedHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyOffchainFundsReceivedHandler.java
@@ -95,7 +95,7 @@ protected void validate(JdbcSepTransaction txn, NotifyOffchainFundsReceivedReque
     }
 
     if (request.getAmountIn() != null) {
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "amount_in",
           AmountAssetRequest.builder()
               .amount(request.getAmountIn().getAmount())
@@ -104,7 +104,7 @@ protected void validate(JdbcSepTransaction txn, NotifyOffchainFundsReceivedReque
           assetService);
     }
     if (request.getAmountOut() != null) {
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "amount_out",
           AmountAssetRequest.builder()
               .amount(request.getAmountOut().getAmount())
@@ -113,7 +113,7 @@ protected void validate(JdbcSepTransaction txn, NotifyOffchainFundsReceivedReque
           assetService);
     }
     if (request.getAmountFee() != null) {
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "amount_fee",
           AmountAssetRequest.builder()
               .amount(request.getAmountFee().getAmount())
diff --git a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyOnchainFundsReceivedHandler.java b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyOnchainFundsReceivedHandler.java
index 61e3c39815..f014054ae0 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyOnchainFundsReceivedHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyOnchainFundsReceivedHandler.java
@@ -84,7 +84,7 @@ protected void validate(JdbcSepTransaction txn, NotifyOnchainFundsReceivedReques
     }
 
     if (request.getAmountIn() != null) {
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "amount_in",
           AmountAssetRequest.builder()
               .amount(request.getAmountIn().getAmount())
@@ -93,7 +93,7 @@ protected void validate(JdbcSepTransaction txn, NotifyOnchainFundsReceivedReques
           assetService);
     }
     if (request.getAmountOut() != null) {
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "amount_out",
           AmountAssetRequest.builder()
               .amount(request.getAmountOut().getAmount())
@@ -102,7 +102,7 @@ protected void validate(JdbcSepTransaction txn, NotifyOnchainFundsReceivedReques
           assetService);
     }
     if (request.getAmountFee() != null) {
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "amount_fee",
           AmountAssetRequest.builder()
               .amount(request.getAmountFee().getAmount())
diff --git a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyRefundPendingHandler.java b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyRefundPendingHandler.java
index 8b8f521979..d8b88c4762 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyRefundPendingHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyRefundPendingHandler.java
@@ -89,14 +89,14 @@ protected void validate(JdbcSepTransaction txn, NotifyRefundPendingRequest reque
         throw new InvalidParamsException("refund must not be null");
       }
 
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "refund.amount",
           AmountAssetRequest.builder()
               .amount(request.getRefund().getAmount().getAmount())
               .asset(txn.getAmountInAsset())
               .build(),
           assetService);
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "refund.amountFee",
           AmountAssetRequest.builder()
               .amount(request.getRefund().getAmountFee().getAmount())
diff --git a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyRefundSentHandler.java b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyRefundSentHandler.java
index 4165a605bc..0c14f89ed4 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyRefundSentHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/rpc/NotifyRefundSentHandler.java
@@ -95,14 +95,14 @@ protected void validate(JdbcSepTransaction txn, NotifyRefundSentRequest request)
     }
 
     if (request.getRefund() != null) {
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "refund.amount",
           AmountAssetRequest.builder()
               .amount(request.getRefund().getAmount().getAmount())
               .asset(txn.getAmountInAsset())
               .build(),
           assetService);
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "refund.amountFee",
           AmountAssetRequest.builder()
               .amount(request.getRefund().getAmountFee().getAmount())
diff --git a/platform/src/main/java/org/stellar/anchor/platform/rpc/RequestOffchainFundsHandler.java b/platform/src/main/java/org/stellar/anchor/platform/rpc/RequestOffchainFundsHandler.java
index 8633c75e3e..90f16fd4c5 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/rpc/RequestOffchainFundsHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/rpc/RequestOffchainFundsHandler.java
@@ -2,12 +2,15 @@
 
 import static org.stellar.anchor.api.platform.PlatformTransactionData.Kind.DEPOSIT;
 import static org.stellar.anchor.api.platform.PlatformTransactionData.Kind.DEPOSIT_EXCHANGE;
+import static org.stellar.anchor.api.platform.PlatformTransactionData.Sep.SEP_24;
+import static org.stellar.anchor.api.platform.PlatformTransactionData.Sep.SEP_6;
 import static org.stellar.anchor.api.rpc.method.RpcMethod.REQUEST_OFFCHAIN_FUNDS;
 import static org.stellar.anchor.api.sep.SepTransactionStatus.*;
 
 import com.google.common.collect.ImmutableSet;
 import java.util.HashSet;
 import java.util.Set;
+import org.apache.commons.codec.binary.StringUtils;
 import org.stellar.anchor.api.exception.BadRequestException;
 import org.stellar.anchor.api.exception.rpc.InvalidParamsException;
 import org.stellar.anchor.api.exception.rpc.InvalidRequestException;
@@ -59,17 +62,15 @@ protected void validate(JdbcSepTransaction txn, RequestOffchainFundsRequest requ
     if (!
     // None of the amounts are provided
     ((request.getAmountIn() == null
-            && request.getAmountOut() == null
             && request.getAmountFee() == null
             && request.getFeeDetails() == null
             && request.getAmountExpected() == null)
         ||
         // All the amounts are provided (allow either amount_fee or fee_details)
         (request.getAmountIn() != null
-            && request.getAmountOut() != null
             && (request.getAmountFee() != null || request.getFeeDetails() != null)))) {
       throw new InvalidParamsException(
-          "All or none of the amount_in, amount_out, and (fee_details or amount_fee) should be set");
+          "All (amount_out is optional) or none of the amount_in, amount_out, and (fee_details or amount_fee) should be set");
     }
 
     // In case 2nd predicate in previous IF statement was TRUE
@@ -81,19 +82,22 @@ protected void validate(JdbcSepTransaction txn, RequestOffchainFundsRequest requ
       if (AssetValidationUtils.isStellarAsset(request.getAmountIn().getAsset())) {
         throw new InvalidParamsException("amount_in.asset should be non-stellar asset");
       }
-      AssetValidationUtils.validateAsset("amount_in", request.getAmountIn(), true, assetService);
+      AssetValidationUtils.validateAssetAmount(
+          "amount_in", request.getAmountIn(), true, assetService);
     }
     if (request.getAmountOut() != null) {
       if (!AssetValidationUtils.isStellarAsset(request.getAmountOut().getAsset())) {
         throw new InvalidParamsException("amount_out.asset should be stellar asset");
       }
-      AssetValidationUtils.validateAsset("amount_out", request.getAmountOut(), true, assetService);
+      AssetValidationUtils.validateAssetAmount(
+          "amount_out", request.getAmountOut(), true, assetService);
     }
     if (request.getAmountFee() != null) {
       if (AssetValidationUtils.isStellarAsset(request.getAmountFee().getAsset())) {
         throw new InvalidParamsException("amount_fee.asset should be non-stellar asset");
       }
-      AssetValidationUtils.validateAsset("amount_fee", request.getAmountFee(), true, assetService);
+      AssetValidationUtils.validateAssetAmount(
+          "amount_fee", request.getAmountFee(), true, assetService);
     }
     if (request.getFeeDetails() != null) {
       if (AssetValidationUtils.isStellarAsset(request.getFeeDetails().getAsset())) {
@@ -102,7 +106,7 @@ protected void validate(JdbcSepTransaction txn, RequestOffchainFundsRequest requ
       AssetValidationUtils.validateFeeDetails(request.getFeeDetails(), txn, assetService);
     }
     if (request.getAmountExpected() != null) {
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "amount_expected",
           AmountAssetRequest.builder()
               .amount(request.getAmountExpected().getAmount())
@@ -115,7 +119,26 @@ protected void validate(JdbcSepTransaction txn, RequestOffchainFundsRequest requ
       throw new InvalidParamsException("amount_in is required");
     }
     if (request.getAmountOut() == null && txn.getAmountOut() == null) {
-      throw new InvalidParamsException("amount_out is required");
+      if (SEP_6 == Sep.from(txn.getProtocol())) {
+        JdbcSep6Transaction txn6 = (JdbcSep6Transaction) txn;
+        if (txn6.getQuoteId() != null) {
+          throw new InvalidParamsException(
+              "amount_out is required for transactions with firm quotes");
+        }
+        if (StringUtils.equals(txn6.getAmountInAsset(), txn6.getAmountOutAsset())) {
+          throw new InvalidParamsException("amount_out is required for non-exchange transactions");
+        }
+      }
+      if (SEP_24 == Sep.from(txn.getProtocol())) {
+        JdbcSep24Transaction txn24 = (JdbcSep24Transaction) txn;
+        if (txn24.getQuoteId() != null) {
+          throw new InvalidParamsException(
+              "amount_out is required for transactions with firm quotes");
+        }
+        if (StringUtils.equals(txn24.getAmountInAsset(), txn24.getAmountOutAsset())) {
+          throw new InvalidParamsException("amount_out is required for non-exchange transactions");
+        }
+      }
     }
     if (request.getAmountFee() == null
         && request.getFeeDetails() == null
diff --git a/platform/src/main/java/org/stellar/anchor/platform/rpc/RequestOnchainFundsHandler.java b/platform/src/main/java/org/stellar/anchor/platform/rpc/RequestOnchainFundsHandler.java
index f014279c9c..dcfdd08c39 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/rpc/RequestOnchainFundsHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/rpc/RequestOnchainFundsHandler.java
@@ -14,6 +14,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import org.apache.commons.lang3.StringUtils;
 import org.stellar.anchor.api.exception.AnchorException;
 import org.stellar.anchor.api.exception.BadRequestException;
 import org.stellar.anchor.api.exception.SepException;
@@ -87,15 +88,13 @@ protected void validate(JdbcSepTransaction txn, RequestOnchainFundsRequest reque
 
     // If none of the accepted combinations of input parameters satisfies -> throw an exception
     if (!((request.getAmountIn() == null
-            && request.getAmountOut() == null
             && request.getAmountFee() == null
             && request.getFeeDetails() == null
             && request.getAmountExpected() == null)
         || (request.getAmountIn() != null
-            && request.getAmountOut() != null
             && (request.getAmountFee() != null || request.getFeeDetails() != null)))) {
       throw new InvalidParamsException(
-          "All or none of the amount_in, amount_out, and (fee_details or amount_fee) should be set");
+          "All (amount_out is optional) or none of the amount_in, amount_out, and (fee_details or amount_fee) should be set");
     }
 
     // In case 2nd predicate in previous IF statement was TRUE
@@ -107,19 +106,22 @@ protected void validate(JdbcSepTransaction txn, RequestOnchainFundsRequest reque
       if (!AssetValidationUtils.isStellarAsset(request.getAmountIn().getAsset())) {
         throw new InvalidParamsException("amount_in.asset should be stellar asset");
       }
-      AssetValidationUtils.validateAsset("amount_in", request.getAmountIn(), true, assetService);
+      AssetValidationUtils.validateAssetAmount(
+          "amount_in", request.getAmountIn(), true, assetService);
     }
     if (request.getAmountOut() != null) {
       if (AssetValidationUtils.isStellarAsset(request.getAmountOut().getAsset())) {
         throw new InvalidParamsException("amount_out.asset should be non-stellar asset");
       }
-      AssetValidationUtils.validateAsset("amount_out", request.getAmountOut(), true, assetService);
+      AssetValidationUtils.validateAssetAmount(
+          "amount_out", request.getAmountOut(), true, assetService);
     }
     if (request.getAmountFee() != null) {
       if (!AssetValidationUtils.isStellarAsset(request.getAmountFee().getAsset())) {
         throw new InvalidParamsException("amount_fee.asset should be stellar asset");
       }
-      AssetValidationUtils.validateAsset("amount_fee", request.getAmountFee(), true, assetService);
+      AssetValidationUtils.validateAssetAmount(
+          "amount_fee", request.getAmountFee(), true, assetService);
     }
     if (request.getFeeDetails() != null) {
       if (!AssetValidationUtils.isStellarAsset(request.getFeeDetails().getAsset())) {
@@ -128,7 +130,7 @@ protected void validate(JdbcSepTransaction txn, RequestOnchainFundsRequest reque
       AssetValidationUtils.validateFeeDetails(request.getFeeDetails(), txn, assetService);
     }
     if (request.getAmountExpected() != null) {
-      AssetValidationUtils.validateAsset(
+      AssetValidationUtils.validateAssetAmount(
           "amount_expected",
           AmountAssetRequest.builder()
               .amount(request.getAmountExpected().getAmount())
@@ -141,7 +143,26 @@ protected void validate(JdbcSepTransaction txn, RequestOnchainFundsRequest reque
       throw new InvalidParamsException("amount_in is required");
     }
     if (request.getAmountOut() == null && txn.getAmountOut() == null) {
-      throw new InvalidParamsException("amount_out is required");
+      if (SEP_6 == Sep.from(txn.getProtocol())) {
+        JdbcSep6Transaction txn6 = (JdbcSep6Transaction) txn;
+        if (txn6.getQuoteId() != null) {
+          throw new InvalidParamsException(
+              "amount_out is required for transactions with firm quotes");
+        }
+        if (StringUtils.equals(txn6.getAmountInAsset(), txn6.getAmountOutAsset())) {
+          throw new InvalidParamsException("amount_out is required for non-exchange transactions");
+        }
+      }
+      if (SEP_24 == Sep.from(txn.getProtocol())) {
+        JdbcSep24Transaction txn24 = (JdbcSep24Transaction) txn;
+        if (txn24.getQuoteId() != null) {
+          throw new InvalidParamsException(
+              "amount_out is required for transactions with firm quotes");
+        }
+        if (StringUtils.equals(txn24.getAmountInAsset(), txn24.getAmountOutAsset())) {
+          throw new InvalidParamsException("amount_out is required for non-exchange transactions");
+        }
+      }
     }
     if (request.getAmountFee() == null
         && request.getFeeDetails() == null
@@ -252,7 +273,7 @@ protected void updateTransactionWithRpcRequest(
         if (sep6DepositInfoGenerator instanceof Sep6DepositInfoNoneGenerator) {
           Memo memo = makeMemo(request.getMemo(), request.getMemoType());
           if (memo != null) {
-            txn6.setMemo(memo.toString());
+            txn6.setMemo(request.getMemo());
             txn6.setMemoType(memoTypeString(memoType(memo)));
           }
           txn6.setWithdrawAnchorAccount(request.getDestinationAccount());
@@ -286,7 +307,7 @@ protected void updateTransactionWithRpcRequest(
         if (sep24DepositInfoGenerator instanceof Sep24DepositInfoNoneGenerator) {
           Memo memo = makeMemo(request.getMemo(), request.getMemoType());
           if (memo != null) {
-            txn24.setMemo(memo.toString());
+            txn24.setMemo(request.getMemo());
             txn24.setMemoType(memoTypeString(memoType(memo)));
           }
           txn24.setWithdrawAnchorAccount(request.getDestinationAccount());
diff --git a/platform/src/main/java/org/stellar/anchor/platform/rpc/RpcMethodHandler.java b/platform/src/main/java/org/stellar/anchor/platform/rpc/RpcMethodHandler.java
index 190145507d..8ade4bc157 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/rpc/RpcMethodHandler.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/rpc/RpcMethodHandler.java
@@ -128,7 +128,7 @@ public GetTransactionResponse handle(Object requestParams) throws AnchorExceptio
   public abstract RpcMethod getRpcMethod();
 
   protected abstract SepTransactionStatus getNextStatus(JdbcSepTransaction txn, T request)
-      throws InvalidRequestException, InvalidParamsException;
+      throws AnchorException;
 
   protected abstract Set<SepTransactionStatus> getSupportedStatuses(JdbcSepTransaction txn);
 
diff --git a/platform/src/main/java/org/stellar/anchor/platform/service/TransactionService.java b/platform/src/main/java/org/stellar/anchor/platform/service/TransactionService.java
index 80dc8a02f0..2ffb798ba9 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/service/TransactionService.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/service/TransactionService.java
@@ -52,6 +52,7 @@
 import org.stellar.anchor.platform.data.JdbcSep31Transaction;
 import org.stellar.anchor.platform.data.JdbcSep6Transaction;
 import org.stellar.anchor.platform.data.JdbcSepTransaction;
+import org.stellar.anchor.platform.utils.AssetValidationUtils;
 import org.stellar.anchor.platform.utils.PlatformTransactionHelper;
 import org.stellar.anchor.sep24.Sep24DepositInfoGenerator;
 import org.stellar.anchor.sep24.Sep24Refunds;
@@ -553,19 +554,7 @@ void validateAsset(String fieldName, Amount amount, boolean allowZero)
             .filter(assetInfo -> assetInfo.getSep38AssetName().equals(amount.getAsset()))
             .collect(Collectors.toList());
 
-    if (allAssets.size() == 1) {
-      AssetInfo targetAsset = allAssets.get(0);
-
-      if (targetAsset.getSignificantDecimals() != null) {
-        // Check that significant decimal is correct
-        if (decimal(amount.getAmount(), targetAsset).compareTo(decimal(amount.getAmount())) != 0) {
-          throw new BadRequestException(
-              String.format(
-                  "'%s' has invalid significant decimals. Expected: '%s'",
-                  amount.getAmount(), targetAsset.getSignificantDecimals()));
-        }
-      }
-    }
+    AssetValidationUtils.valiateAssetDecimals(allAssets, amount.getAmount());
   }
 
   void validateQuoteAndAmounts(Sep31Transaction txn) throws AnchorException {
diff --git a/platform/src/main/java/org/stellar/anchor/platform/utils/AssetValidationUtils.java b/platform/src/main/java/org/stellar/anchor/platform/utils/AssetValidationUtils.java
index 8ed7a8865a..ddfe74df8a 100644
--- a/platform/src/main/java/org/stellar/anchor/platform/utils/AssetValidationUtils.java
+++ b/platform/src/main/java/org/stellar/anchor/platform/utils/AssetValidationUtils.java
@@ -27,24 +27,12 @@ public static boolean isStellarAsset(String asset) {
     return asset.startsWith(STELLAR_ASSET_PREFIX);
   }
 
-  /**
-   * validateAsset will validate if the provided amount has valid values and if its asset is
-   * supported.
-   *
-   * @param amount is the object containing the asset full name and the amount.
-   */
-  public static void validateAsset(
-      String fieldName, AmountAssetRequest amount, AssetService assetService)
-      throws BadRequestException {
-    validateAsset(fieldName, amount, false, assetService);
-  }
-
   public static void validateFeeDetails(
       @NotNull FeeDetails fee,
       @Nullable JdbcSepTransaction jdbcTransaction,
       AssetService assetService)
       throws BadRequestException {
-    validateAsset(
+    validateAssetAmount(
         "fee_details", new AmountAssetRequest(fee.getTotal(), fee.getAsset()), true, assetService);
 
     if (jdbcTransaction != null
@@ -70,7 +58,29 @@ public static void validateFeeDetails(
     }
   }
 
-  public static void validateAsset(
+  /**
+   * validateAsset will validate if the provided amount has valid values and if its asset is
+   * supported.
+   *
+   * @see #validateAssetAmount(String, AmountAssetRequest, boolean, AssetService)
+   */
+  public static void validateAssetAmount(
+      String fieldName, AmountAssetRequest amount, AssetService assetService)
+      throws BadRequestException {
+    validateAssetAmount(fieldName, amount, false, assetService);
+  }
+
+  /**
+   * validateAssetAmount will validate if the provided amount has valid values and if its asset is
+   * supported.
+   *
+   * @param fieldName is the name of the field that is being validated.
+   * @param amount is the object containing the asset full name and the amount.
+   * @param allowZero is a flag that indicates if the amount can be zero.
+   * @param assetService is the service that will be used to check if the asset is supported.
+   * @throws BadRequestException if the amount is invalid or the asset is not supported.
+   */
+  public static void validateAssetAmount(
       String fieldName, AmountAssetRequest amount, boolean allowZero, AssetService assetService)
       throws BadRequestException {
     if (amount == null) {
@@ -96,16 +106,21 @@ public static void validateAsset(
           String.format("'%s' is not a supported asset.", amount.getAsset()));
     }
 
+    valiateAssetDecimals(allAssets, amount.getAmount());
+  }
+
+  public static void valiateAssetDecimals(List<AssetInfo> allAssets, String amount)
+      throws BadRequestException {
     if (allAssets.size() == 1) {
       AssetInfo targetAsset = allAssets.get(0);
 
       if (targetAsset.getSignificantDecimals() != null) {
         // Check that significant decimal is correct
-        if (decimal(amount.getAmount(), targetAsset).compareTo(decimal(amount.getAmount())) != 0) {
+        if (decimal(amount, targetAsset).compareTo(decimal(amount)) != 0) {
           throw new BadRequestException(
               String.format(
                   "'%s' has invalid significant decimals. Expected: '%s'",
-                  amount.getAmount(), targetAsset.getSignificantDecimals()));
+                  amount, targetAsset.getSignificantDecimals()));
         }
       }
     }
diff --git a/platform/src/main/resources/config/anchor-config-default-values.yaml b/platform/src/main/resources/config/anchor-config-default-values.yaml
index 267a9ce404..973de0af85 100644
--- a/platform/src/main/resources/config/anchor-config-default-values.yaml
+++ b/platform/src/main/resources/config/anchor-config-default-values.yaml
@@ -182,7 +182,18 @@ event_processor:
 #   If the type is `custodial`,
 #   - signing_keys: (required) the custodial SEP-10 signing keys of the client.
 #   - callback_url: (optional) the URL of the client's callback API endpoint. Optional due to some wallets may opt to
-#                  poll instead, or may use polling first before implementing callbacks at a later stage.
+#                  poll instead, or may use polling first before implementing callbacks at a later stage. If one of
+#                  SEP-specific URLs is also provided, then this URL will be used as a fallback. For example, if
+#                  `callback_url_sep6` is not provided, but `callback_url_sep24` is, SEP-6 transactions will use the
+#                  `callback_url` as the callback URL. This field is deprecated and will be removed in 3.0.
+#   - callback_url_sep6: (optional) the URL of the client's SEP-6 callback API endpoint. If set, it will be used as
+#                  the callback URL for SEP-6 transactions.
+#   - callback_url_sep24: (optional) the URL of the client's SEP-24 callback API endpoint. If set, it will be used as
+#                  the callback URL for SEP-24 transactions.
+#   - callback_url_sep31: (optional) the URL of the client's SEP-31 callback API endpoint. If set, it will be used as
+#                  the callback URL for SEP-31 transactions.
+#   - callback_url_sep12: (optional) the URL of the client's SEP-12 callback API endpoint. If set, it will be used as
+#                  the callback URL for SEP-12 transactions.
 #   - allow_any_destination: (optional) default to false. If set to true, allows any destination for deposits.
 #   - destination_accounts: (optional) list of accounts allowed to be used for the deposit. By default, only SEP-10
 #                  authenticated account can be used to deposit funds into. If allows_any_destinations set to true,
@@ -190,6 +201,10 @@ event_processor:
 #   If the type is `noncustodial`,
 #   - domains: (required) the domain of the client.
 #   - callback_url: (optional) the URL of the client's callback API endpoint
+#   - callback_url_sep6: (optional) the URL of the client's SEP-6 callback API endpoint.
+#   - callback_url_sep24: (optional) the URL of the client's SEP-24 callback API endpoint.
+#   - callback_url_sep31: (optional) the URL of the client's SEP-31 callback API endpoint.
+#   - callback_url_sep12: (optional) the URL of the client's SEP-12 callback API endpoint.
 #
 # Examples:
 #     - name: circle
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/callback/RestRateIntegrationTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/callback/RestRateIntegrationTest.kt
new file mode 100644
index 0000000000..9993888001
--- /dev/null
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/callback/RestRateIntegrationTest.kt
@@ -0,0 +1,337 @@
+package org.stellar.anchor.platform.callback
+
+import com.google.gson.Gson
+import io.mockk.every
+import io.mockk.mockk
+import java.math.BigDecimal
+import java.time.Instant
+import org.junit.jupiter.api.Assertions.assertEquals
+import org.junit.jupiter.api.Assertions.assertTrue
+import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Test
+import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+import org.junit.jupiter.params.provider.ValueSource
+import org.stellar.anchor.api.callback.GetRateRequest
+import org.stellar.anchor.api.callback.GetRateRequest.Type.from
+import org.stellar.anchor.api.callback.GetRateResponse
+import org.stellar.anchor.api.exception.ServerErrorException
+import org.stellar.anchor.api.sep.AssetInfo
+import org.stellar.anchor.api.sep.AssetInfo.Schema.iso4217
+import org.stellar.anchor.api.sep.AssetInfo.Schema.stellar
+import org.stellar.anchor.asset.AssetService
+import org.stellar.anchor.platform.callback.RestRateIntegration.withinRoundingError
+import org.stellar.anchor.util.GsonUtils
+
+class RestRateIntegrationTest {
+  private val assetService = mockk<AssetService>()
+  private val gson: Gson = GsonUtils.getInstance()
+  private var usdAssetInfo = AssetInfo()
+  private var usdcAssetInfo = AssetInfo()
+  private val rateIntegration = RestRateIntegration("/", null, null, gson, assetService)
+  private var request: GetRateRequest = GetRateRequest()
+  private var rateResponse: GetRateResponse = GetRateResponse()
+
+  @BeforeEach
+  fun setUp() {
+    // Set up USDC asset info
+    usdAssetInfo.code = "USD"
+    usdAssetInfo.schema = iso4217
+    usdAssetInfo.significantDecimals = 2
+
+    // Set up USD asset info
+    usdcAssetInfo.schema = stellar
+    usdcAssetInfo.code = "USDC"
+    usdcAssetInfo.issuer = "GABCD"
+    usdcAssetInfo.significantDecimals = 7
+
+    // Set up asset service
+    every { assetService.getAssetByName("iso4217:USD") } returns usdAssetInfo
+    every { assetService.getAssetByName("stellar:USDC:GABCD") } returns usdcAssetInfo
+    every { assetService.getAssetByName("unknown") } returns null
+
+    // Set up request and response
+    request =
+      gson.fromJson(
+        """
+        {
+          "type": "indicative",
+          "sell_asset": "iso4217:USD",
+          "sell_amount": "106",
+          "buy_asset": "stellar:USDC:GABCD"
+        }
+        """,
+        GetRateRequest::class.java,
+      )
+
+    rateResponse =
+      gson.fromJson(
+        """
+        {
+          "rate": {
+            "id": 1,
+            "price": "1.05",
+            "sell_amount": "100",
+            "buy_amount": "94.29",
+            "fee": {
+              "total": "1.00",
+              "asset": "iso4217:USD",
+              "details": [
+                {
+                  "name": "Sell fee #1",
+                  "description": "Fee related to selling the asset #1.",
+                  "amount": "0.70"
+                },
+                {
+                  "name": "Sell fee #2",
+                  "description": "Fee related to selling the asset #2.",
+                  "amount": "0.30"
+                }
+              ]
+            }
+          }
+        }
+        """,
+        GetRateResponse::class.java,
+      )
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = ["indicative", "firm"])
+  fun `test INDICATIVE and FIRM validateRateResponse`(type: String) {
+    request.type = from(type)
+    rateResponse.rate.id = "1234"
+    rateResponse.rate.expiresAt = Instant.now()
+
+    // The fee is in sell_asset
+    rateResponse.rate.fee.asset = usdAssetInfo.sep38AssetName
+    rateResponse.rate.sellAmount = "100.00"
+    rateResponse.rate.buyAmount = "94.29"
+    rateIntegration.validateRateResponse(request, rateResponse)
+
+    // The fee is in buy_asset
+    rateResponse.rate.fee.asset = usdcAssetInfo.sep38AssetName
+    rateResponse.rate.sellAmount = "100.00"
+    rateResponse.rate.buyAmount = "94.24"
+    rateIntegration.validateRateResponse(request, rateResponse)
+  }
+
+  @ParameterizedTest
+  @CsvSource(
+    value =
+      [
+        "-1.0,is missing or not a positive number in the GET /rate response",
+        "-1.00000001,is missing or not a positive number in the GET /rate response",
+        "-2000,is missing or not a positive number in the GET /rate response",
+        "null,is missing or not a positive number in the GET /rate response",
+        "1.00000001,has incorrect number of significant decimals",
+      ]
+  )
+  fun `test bad sell and buy amounts`(badAmount: String?, errorMessage: String) {
+    // Bad sell amount
+    rateResponse.rate.sellAmount = badAmount
+    rateResponse.rate.buyAmount = "94.29"
+    var ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    //    assertEquals("'rate.sell_amount' ${errorMessage.trim()}", ex.message)
+    assertTrue(ex.message!!.contains(errorMessage))
+
+    // Bad buy amount
+    rateResponse.rate.sellAmount = "100"
+    rateResponse.rate.buyAmount = badAmount
+    ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    assertTrue(ex.message!!.contains(errorMessage))
+  }
+
+  @Test
+  fun `test mis-matched sell_amount and buy_amount`() {
+    // Bad sell amount
+    rateResponse.rate.sellAmount = "100.02" // expect 100.00
+    rateResponse.rate.buyAmount = "94.29"
+    var ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    assertEquals(
+      "'rate.sell_amount' (100.02) is not within rounding error of the expected (100.0045) ('price * buy_amount + fee') in the GET /rate response",
+      ex.message,
+    )
+
+    rateResponse.rate.sellAmount = "100.00"
+    rateResponse.rate.buyAmount = "94.00"
+
+    ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    assertEquals(
+      "'rate.sell_amount' (100.00) is not within rounding error of the expected (99.7000) ('price * buy_amount + fee') in the GET /rate response",
+      ex.message,
+    )
+  }
+
+  @Test
+  fun `test bad fee total and asset`() {
+    rateResponse.rate.fee.total = null
+    var ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    assertEquals(
+      "'rate.fee.total' is missing or not a positive number in the GET /rate response",
+      ex.message,
+    )
+
+    rateResponse.rate.fee.total = "1.00"
+    rateResponse.rate.fee.asset = "unknown"
+    ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    assertEquals(
+      "'rate.fee.asset' is missing or not a valid asset in the GET /rate response",
+      ex.message,
+    )
+
+    rateResponse.rate.fee.total = "1.00000001"
+    rateResponse.rate.fee.asset = "iso4217:USD"
+    ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    assertEquals(
+      "'rate.fee.total' (1.00000001) has incorrect number of significant decimals (expected: 2) in the GET /rate response",
+      ex.message,
+    )
+  }
+
+  @ParameterizedTest
+  @ValueSource(ints = [0, 1])
+  fun `test bad fee details without name or amount`(feeIndex: Int) {
+    rateResponse.rate.fee.details[feeIndex].name = null
+    var ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    assertEquals(
+      "'rate.fee.details.description[?].name' is missing in the GET /rate response",
+      ex.message,
+    )
+
+    rateResponse.rate.fee.details[feeIndex].name = "Sell fee"
+    rateResponse.rate.fee.details[feeIndex].amount = null
+    ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    assertEquals(
+      "'rate.fee.details[?].description.amount' is missing or not a positive number in the GET /rate response",
+      ex.message,
+    )
+
+    rateResponse.rate.fee.details[feeIndex].name = "Sell fee"
+    rateResponse.rate.fee.details[feeIndex].amount = "0.71" // Expect 0.70
+    ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    assertTrue(ex.message!!.contains("is not equal to the sum of fees "))
+  }
+
+  @Test
+  fun `test bad decimals from the response`() {
+    // Bad sell amount
+    rateResponse.rate.sellAmount = "100.00001234"
+    rateResponse.rate.buyAmount = "94.29"
+    rateResponse.rate.fee.details[0].amount = "0.7"
+    var ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    assertEquals(
+      "'rate.sell_amount' (100.00001234) has incorrect number of significant decimals (expected: 2) in the GET /rate response",
+      ex.message,
+    )
+
+    // Bad buy amount
+    rateResponse.rate.sellAmount = "100"
+    rateResponse.rate.buyAmount = "94.000000029"
+    rateResponse.rate.fee.details[0].amount = "0.7"
+    ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    assertEquals(
+      "'rate.buy_amount' (94.000000029) has incorrect number of significant decimals (expected: 7) in the GET /rate response",
+      ex.message,
+    )
+
+    // Bad fee amount
+    rateResponse.rate.sellAmount = "100"
+    rateResponse.rate.buyAmount = "94.29"
+    rateResponse.rate.fee.details[0].amount = "0.00007"
+    ex =
+      assertThrows<ServerErrorException> {
+        rateIntegration.validateRateResponse(request, rateResponse)
+      }
+    assertEquals(
+      "'rate.fee.details[?].description.amount' has incorrect number of significant decimals in the GET /rate response",
+      ex.message,
+    )
+  }
+
+  @ParameterizedTest
+  @CsvSource(
+    value =
+      [
+        // Round down
+        "1.014,1.01,2,true",
+        "1.014, 1.01,3,false",
+        "1.0104, 1.01,3,true",
+        // Round up
+        "1.014,1.02,2,true",
+        // Ceil
+        "1.001, 1.01,2,true",
+        "1.001,1.01, 3, false",
+        // Floor
+        "1.019, 1.01, 2, true",
+        "1.019, 1.01, 3, false",
+
+        // sell has 2, buy has 5. calculated sell amount is 4.99999. returned sell amount is
+        // 5.00
+        "4.99999,5.00,2,true",
+        "4.99999,5.00,5,false",
+
+        // sell has 2, buy has 5. calculated sell amount is 4.99999. returned sell amount is
+        // 5.00
+        "4.99999,5.00,2,true",
+        "4.99999,5.00,5,false",
+
+        // Test cases
+        "4.99999999984375,5,2,true",
+        "4.99999999984375,5,3,true",
+        "4.99999999984375,5,4,true",
+        "4.99999999984375,5,5,true",
+        "4.99999999984375,5,8,true",
+        "4.99999999984375,5,9,true",
+        "4.99999999984375,5,10,false",
+      ]
+  )
+  fun `test equals in scale withing rounding errors`(
+    amount: String,
+    expected: String,
+    scale: String,
+    shouldAllow: String,
+  ) {
+    assertEquals(
+      shouldAllow.toBoolean(),
+      withinRoundingError(BigDecimal(amount), BigDecimal(expected), scale.toInt()),
+    )
+  }
+}
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/config/PropertyClientsConfigTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/config/PropertyClientsConfigTest.kt
index 8506e70b6b..d2890f1755 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/config/PropertyClientsConfigTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/config/PropertyClientsConfigTest.kt
@@ -111,6 +111,82 @@ class PropertyClientsConfigTest {
     Assertions.assertEquals(config, getConfigResult2)
   }
 
+  @Test
+  fun `test valid non-custodial client with all callback URLs set`() {
+    val config = ClientConfig()
+    config.name = "circle"
+    config.type = NONCUSTODIAL
+    config.domains = setOf("circle.com")
+    config.callbackUrl = "https://callback.circle.com/api/v1/anchor/callback"
+    config.callbackUrlSep6 = "https://callback.circle.com/api/v1/anchor/callback/sep6"
+    config.callbackUrlSep24 = "https://callback.circle.com/api/v1/anchor/callback/sep24"
+    config.callbackUrlSep31 = "https://callback.circle.com/api/v1/anchor/callback/sep31"
+    config.callbackUrlSep12 = "https://callback.circle.com/api/v1/anchor/callback/sep12"
+    configs.clients.add(config)
+
+    configs.validate(configs, errors)
+    Assertions.assertFalse(errors.hasErrors())
+  }
+
+  @Test
+  fun `test valid custodial client with all callback URLs set`() {
+    val config = ClientConfig()
+    config.name = "circle"
+    config.type = CUSTODIAL
+    config.signingKeys =
+      setOf(
+        "GBI2IWJGR4UQPBIKPP6WG76X5PHSD2QTEBGIP6AZ3ZXWV46ZUSGNEGN2",
+        "GACYKME36AI6UYAV7A5ZUA6MG4C4K2VAPNYMW5YLOM6E7GS6FSHDPV4F"
+      )
+    config.callbackUrl = "https://callback.circle.com/api/v1/anchor/callback"
+    config.callbackUrlSep6 = "https://callback.circle.com/api/v1/anchor/callback/sep6"
+    config.callbackUrlSep24 = "https://callback.circle.com/api/v1/anchor/callback/sep24"
+    config.callbackUrlSep31 = "https://callback.circle.com/api/v1/anchor/callback/sep31"
+    config.callbackUrlSep12 = "https://callback.circle.com/api/v1/anchor/callback/sep12"
+    configs.clients.add(config)
+
+    configs.validate(configs, errors)
+    Assertions.assertFalse(errors.hasErrors())
+  }
+
+  @Test
+  fun `test invalid non-custodial client with invalid callback URLs`() {
+    val config = ClientConfig()
+    config.name = "lobstr"
+    config.type = NONCUSTODIAL
+    config.domains = setOf("lobstr.co")
+    config.callbackUrl = "bad-url"
+    config.callbackUrlSep6 = "bad-url"
+    config.callbackUrlSep24 = "bad-url"
+    config.callbackUrlSep31 = "bad-url"
+    config.callbackUrlSep12 = "bad-url"
+    configs.clients.add(config)
+
+    configs.validate(configs, errors)
+    Assertions.assertEquals(5, errors.errorCount)
+  }
+
+  @Test
+  fun `test invalid custodial client with invalid callback URLs`() {
+    val config = ClientConfig()
+    config.name = "circle"
+    config.type = CUSTODIAL
+    config.signingKeys =
+      setOf(
+        "GBI2IWJGR4UQPBIKPP6WG76X5PHSD2QTEBGIP6AZ3ZXWV46ZUSGNEGN2",
+        "GACYKME36AI6UYAV7A5ZUA6MG4C4K2VAPNYMW5YLOM6E7GS6FSHDPV4F"
+      )
+    config.callbackUrl = "bad-url"
+    config.callbackUrlSep6 = "bad-url"
+    config.callbackUrlSep24 = "bad-url"
+    config.callbackUrlSep31 = "bad-url"
+    config.callbackUrlSep12 = "bad-url"
+    configs.clients.add(config)
+
+    configs.validate(configs, errors)
+    Assertions.assertEquals(5, errors.errorCount)
+  }
+
   @Test
   fun `test invalid non-custodial client with empty domain and callback url`() {
     val config = ClientConfig()
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/config/Sep10ConfigTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/config/Sep10ConfigTest.kt
index ff483931b9..065c857e11 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/config/Sep10ConfigTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/config/Sep10ConfigTest.kt
@@ -29,45 +29,31 @@ class Sep10ConfigTest {
     appConfig = mockk()
 
     clientsConfig.clients.add(
-      ClientConfig(
-        "unknown",
-        CUSTODIAL,
-        null,
-        setOf("GBI2IWJGR4UQPBIKPP6WG76X5PHSD2QTEBGIP6AZ3ZXWV46ZUSGNEGN2"),
-        null,
-        null,
-        null,
-        false,
-        null
-      )
+      ClientConfig.builder()
+        .name("unknown")
+        .type(CUSTODIAL)
+        .signingKeys(setOf("GBI2IWJGR4UQPBIKPP6WG76X5PHSD2QTEBGIP6AZ3ZXWV46ZUSGNEGN2"))
+        .build()
     )
 
     clientsConfig.clients.add(
-      ClientConfig(
-        "lobstr",
-        NONCUSTODIAL,
-        null,
-        setOf("GC4HAYCFQYQLJV5SE6FB3LGC37D6XGIXGMAXCXWNBLH7NWW2JH4OZLHQ"),
-        null,
-        setOf("lobstr.co"),
-        "https://callback.lobstr.co/api/v2/anchor/callback",
-        false,
-        null
-      )
+      ClientConfig.builder()
+        .name("lobstr")
+        .type(NONCUSTODIAL)
+        .signingKeys(setOf("GC4HAYCFQYQLJV5SE6FB3LGC37D6XGIXGMAXCXWNBLH7NWW2JH4OZLHQ"))
+        .domains(setOf("lobstr.co"))
+        .callbackUrl("https://callback.lobstr.co/api/v2/anchor/callback")
+        .build()
     )
 
     clientsConfig.clients.add(
-      ClientConfig(
-        "circle",
-        NONCUSTODIAL,
-        null,
-        setOf("GCSGSR6KQQ5BP2FXVPWRL6SWPUSFWLVONLIBJZUKTVQB5FYJFVL6XOXE"),
-        null,
-        setOf("circle.com"),
-        "https://callback.circle.com/api/v2/anchor/callback",
-        false,
-        null
-      )
+      ClientConfig.builder()
+        .name("circle")
+        .type(NONCUSTODIAL)
+        .signingKeys(setOf("GCSGSR6KQQ5BP2FXVPWRL6SWPUSFWLVONLIBJZUKTVQB5FYJFVL6XOXE"))
+        .domains(setOf("circle.com"))
+        .callbackUrl("https://callback.circle.com/api/v2/anchor/callback")
+        .build()
     )
 
     config = PropertySep10Config(appConfig, clientsConfig, secretConfig)
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/event/ClientStatusCallbackHandlerTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/event/ClientStatusCallbackHandlerTest.kt
index e33353ca84..329c235c87 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/event/ClientStatusCallbackHandlerTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/event/ClientStatusCallbackHandlerTest.kt
@@ -14,6 +14,8 @@ import org.stellar.anchor.LockAndMockTest
 import org.stellar.anchor.api.event.AnchorEvent
 import org.stellar.anchor.api.platform.GetTransactionResponse
 import org.stellar.anchor.api.platform.PlatformTransactionData
+import org.stellar.anchor.api.sep.SepTransactionStatus
+import org.stellar.anchor.api.sep.sep12.Sep12GetCustomerResponse
 import org.stellar.anchor.api.sep.sep24.TransactionResponse
 import org.stellar.anchor.api.sep.sep6.Sep6TransactionResponse
 import org.stellar.anchor.asset.AssetService
@@ -62,9 +64,14 @@ class ClientStatusCallbackHandlerTest {
     sep31TransactionStore = mockk<Sep31TransactionStore>()
     every { sep24TransactionStore.findByTransactionId(any()) } returns null
 
+    assetService = mockk<AssetService>()
+    every { assetService.getAsset(null, null) } returns null
+
     assetService = mockk<AssetService>()
     sep6MoreInfoUrlConstructor = mockk<Sep6MoreInfoUrlConstructor>()
     sep24MoreInfoUrlConstructor = mockk<Sep24MoreInfoUrlConstructor>()
+    every { sep6MoreInfoUrlConstructor.construct(any(), any()) } returns "https://example.com"
+    every { sep24MoreInfoUrlConstructor.construct(any(), any()) } returns "https://example.com"
 
     secretConfig = mockk()
     secretConfig.setupMock()
@@ -74,6 +81,8 @@ class ClientStatusCallbackHandlerTest {
     event = AnchorEvent()
     event.transaction = GetTransactionResponse()
     event.transaction.sep = PlatformTransactionData.Sep.SEP_24
+    event.transaction.kind = PlatformTransactionData.Kind.DEPOSIT
+    event.transaction.status = SepTransactionStatus.COMPLETED
 
     handler =
       ClientStatusCallbackHandler(
@@ -110,4 +119,61 @@ class ClientStatusCallbackHandlerTest {
 
     Assertions.assertArrayEquals(decodedSignature, signatureToVerify)
   }
+
+  @Test
+  fun `test getCallbackUrl fallback`() {
+    clientConfig.callbackUrlSep24 = null
+    val url = handler.getCallbackUrl(event)
+
+    Assertions.assertEquals(clientConfig.callbackUrl, url)
+  }
+
+  @Test
+  fun `test getCallbackUrl with SEP-6 event`() {
+    event.transaction.sep = PlatformTransactionData.Sep.SEP_6
+    clientConfig.callbackUrlSep6 = "https://callback.circle.com/api/v1/anchor/callback/sep6"
+    val url = handler.getCallbackUrl(event)
+
+    Assertions.assertEquals(clientConfig.callbackUrlSep6, url)
+  }
+
+  @Test
+  fun `test getCallbackUrl with SEP-24 event`() {
+    event.transaction.sep = PlatformTransactionData.Sep.SEP_24
+    clientConfig.callbackUrlSep24 = "https://callback.circle.com/api/v1/anchor/callback/sep24"
+    val url = handler.getCallbackUrl(event)
+
+    Assertions.assertEquals(clientConfig.callbackUrlSep24, url)
+  }
+
+  @Test
+  fun `test getCallbackUrl with SEP-31 event`() {
+    event.transaction.sep = PlatformTransactionData.Sep.SEP_31
+    clientConfig.callbackUrlSep31 = "https://callback.circle.com/api/v1/anchor/callback/sep31"
+    val url = handler.getCallbackUrl(event)
+
+    Assertions.assertEquals(clientConfig.callbackUrlSep31, url)
+  }
+
+  @Test
+  fun `test getCallbackUrl with SEP-12 event`() {
+    event.transaction = null
+    event.customer = Sep12GetCustomerResponse.builder().build()
+    clientConfig.callbackUrlSep12 = "https://callback.circle.com/api/v1/anchor/callback/sep12"
+    val url = handler.getCallbackUrl(event)
+
+    Assertions.assertEquals(clientConfig.callbackUrlSep12, url)
+  }
+
+  @Test
+  fun `test buildHttpRequest with no callback URLs defined`() {
+    clientConfig.callbackUrl = null
+    clientConfig.callbackUrlSep6 = null
+    clientConfig.callbackUrlSep24 = null
+    clientConfig.callbackUrlSep31 = null
+    clientConfig.callbackUrlSep12 = null
+
+    val request = handler.buildHttpRequest(signer, event)
+    Assertions.assertNull(request)
+  }
 }
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/NotifyCustomerInfoUpdatedHandlerTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/NotifyCustomerInfoUpdatedHandlerTest.kt
index 19e3ab5e4d..71d4373d73 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/NotifyCustomerInfoUpdatedHandlerTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/NotifyCustomerInfoUpdatedHandlerTest.kt
@@ -9,16 +9,23 @@ import kotlin.test.assertTrue
 import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.CsvSource
+import org.junit.jupiter.params.provider.ValueSource
 import org.skyscreamer.jsonassert.JSONAssert
 import org.skyscreamer.jsonassert.JSONCompareMode
+import org.stellar.anchor.api.callback.CustomerIntegration
+import org.stellar.anchor.api.callback.GetCustomerRequest
+import org.stellar.anchor.api.callback.GetCustomerResponse
 import org.stellar.anchor.api.event.AnchorEvent
 import org.stellar.anchor.api.exception.rpc.InvalidParamsException
 import org.stellar.anchor.api.exception.rpc.InvalidRequestException
 import org.stellar.anchor.api.platform.GetTransactionResponse
+import org.stellar.anchor.api.platform.PlatformTransactionData
 import org.stellar.anchor.api.platform.PlatformTransactionData.Kind.RECEIVE
-import org.stellar.anchor.api.platform.PlatformTransactionData.Sep.SEP_31
-import org.stellar.anchor.api.platform.PlatformTransactionData.Sep.SEP_38
+import org.stellar.anchor.api.platform.PlatformTransactionData.Sep.*
 import org.stellar.anchor.api.rpc.method.NotifyCustomerInfoUpdatedRequest
+import org.stellar.anchor.api.sep.SepTransactionStatus
 import org.stellar.anchor.api.sep.SepTransactionStatus.*
 import org.stellar.anchor.api.shared.Amount
 import org.stellar.anchor.api.shared.Customers
@@ -28,6 +35,7 @@ import org.stellar.anchor.event.EventService
 import org.stellar.anchor.event.EventService.Session
 import org.stellar.anchor.metrics.MetricsService
 import org.stellar.anchor.platform.data.JdbcSep31Transaction
+import org.stellar.anchor.platform.data.JdbcSep6Transaction
 import org.stellar.anchor.platform.service.AnchorMetrics.PLATFORM_RPC_TRANSACTION
 import org.stellar.anchor.platform.validator.RequestValidator
 import org.stellar.anchor.sep24.Sep24TransactionStore
@@ -40,6 +48,9 @@ class NotifyCustomerInfoUpdatedHandlerTest {
   companion object {
     private val gson = GsonUtils.getInstance()
     private const val TX_ID = "testId"
+    private const val TEST_CUSTOMER_ID = "testCustomerId"
+    private const val TEST_CUSTOMER_TYPE = "type"
+    private const val TEST_MESSAGE = "customer updated"
     private const val VALIDATION_ERROR_MESSAGE = "Invalid request"
   }
 
@@ -51,6 +62,8 @@ class NotifyCustomerInfoUpdatedHandlerTest {
 
   @MockK(relaxed = true) private lateinit var requestValidator: RequestValidator
 
+  @MockK(relaxed = true) private lateinit var customerIntegration: CustomerIntegration
+
   @MockK(relaxed = true) private lateinit var assetService: AssetService
 
   @MockK(relaxed = true) private lateinit var eventService: EventService
@@ -74,6 +87,7 @@ class NotifyCustomerInfoUpdatedHandlerTest {
         txn24Store,
         txn31Store,
         requestValidator,
+        customerIntegration,
         assetService,
         eventService,
         metricsService
@@ -98,6 +112,7 @@ class NotifyCustomerInfoUpdatedHandlerTest {
       ex.message
     )
 
+    verify(exactly = 0) { customerIntegration.getCustomer(any()) }
     verify(exactly = 0) { txn6Store.save(any()) }
     verify(exactly = 0) { txn24Store.save(any()) }
     verify(exactly = 0) { txn31Store.save(any()) }
@@ -105,7 +120,7 @@ class NotifyCustomerInfoUpdatedHandlerTest {
   }
 
   @Test
-  fun test_handle_unsupportedStatus() {
+  fun test_handle_sep31_unsupportedStatus() {
     val request = NotifyCustomerInfoUpdatedRequest.builder().transactionId(TX_ID).build()
     val txn31 = JdbcSep31Transaction()
     txn31.status = INCOMPLETE.toString()
@@ -120,6 +135,7 @@ class NotifyCustomerInfoUpdatedHandlerTest {
       ex.message
     )
 
+    verify(exactly = 0) { customerIntegration.getCustomer(any()) }
     verify(exactly = 0) { txn6Store.save(any()) }
     verify(exactly = 0) { txn24Store.save(any()) }
     verify(exactly = 0) { txn31Store.save(any()) }
@@ -127,7 +143,7 @@ class NotifyCustomerInfoUpdatedHandlerTest {
   }
 
   @Test
-  fun test_handle_invalidRequest() {
+  fun test_handle_sep31_invalidRequest() {
     val request = NotifyCustomerInfoUpdatedRequest.builder().transactionId(TX_ID).build()
     val txn31 = JdbcSep31Transaction()
     txn31.status = PENDING_CUSTOMER_INFO_UPDATE.toString()
@@ -141,6 +157,7 @@ class NotifyCustomerInfoUpdatedHandlerTest {
     val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
     assertEquals(VALIDATION_ERROR_MESSAGE, ex.message?.trimIndent())
 
+    verify(exactly = 0) { customerIntegration.getCustomer(any()) }
     verify(exactly = 0) { txn6Store.save(any()) }
     verify(exactly = 0) { txn24Store.save(any()) }
     verify(exactly = 0) { txn31Store.save(any()) }
@@ -148,7 +165,7 @@ class NotifyCustomerInfoUpdatedHandlerTest {
   }
 
   @Test
-  fun test_handle_ok() {
+  fun test_handle_sep31_ok_without_id() {
     val request = NotifyCustomerInfoUpdatedRequest.builder().transactionId(TX_ID).build()
     val txn31 = JdbcSep31Transaction()
     txn31.status = PENDING_CUSTOMER_INFO_UPDATE.toString()
@@ -168,6 +185,7 @@ class NotifyCustomerInfoUpdatedHandlerTest {
     val response = handler.handle(request)
     val endDate = Instant.now()
 
+    verify(exactly = 0) { customerIntegration.getCustomer(any()) }
     verify(exactly = 0) { txn6Store.save(any()) }
     verify(exactly = 0) { txn24Store.save(any()) }
     verify(exactly = 1) { sepTransactionCounter.increment() }
@@ -216,4 +234,339 @@ class NotifyCustomerInfoUpdatedHandlerTest {
     assertTrue(sep31TxnCapture.captured.updatedAt >= startDate)
     assertTrue(sep31TxnCapture.captured.updatedAt <= endDate)
   }
+
+  @ParameterizedTest
+  @CsvSource(
+    "ACCEPTED, pending_receiver, pending_receiver",
+    "ACCEPTED, pending_customer_info_update, pending_receiver",
+    "PROCESSING, pending_receiver, pending_receiver",
+    "PROCESSING, pending_customer_info_update, pending_receiver",
+    "NEEDS_INFO, pending_receiver, pending_customer_info_update",
+    "NEEDS_INFO, pending_customer_info_update, pending_customer_info_update",
+    "REJECTED, pending_receiver, error",
+    "REJECTED, pending_customer_info_update, error",
+  )
+  fun test_handle_sep31_ok_with_id(customerStatus: String, oldStatus: String, newStatus: String) {
+    val request =
+      NotifyCustomerInfoUpdatedRequest.builder()
+        .transactionId(TX_ID)
+        .customerId(TEST_CUSTOMER_ID)
+        .customerType(TEST_CUSTOMER_TYPE)
+        .message(TEST_MESSAGE)
+        .build()
+    val txn31 = JdbcSep31Transaction()
+    txn31.id = TX_ID
+    txn31.status = oldStatus
+    txn31.userActionRequiredBy = Instant.now()
+    val sep31TxnCapture = slot<JdbcSep31Transaction>()
+    val anchorEventCapture = mutableListOf<AnchorEvent>()
+
+    val customer = GetCustomerResponse.builder().status(customerStatus).build()
+    every {
+      customerIntegration.getCustomer(
+        GetCustomerRequest.builder()
+          .transactionId(TX_ID)
+          .id(TEST_CUSTOMER_ID)
+          .type(TEST_CUSTOMER_TYPE)
+          .build()
+      )
+    } returns customer
+    every { txn6Store.findByTransactionId(any()) } returns null
+    every { txn24Store.findByTransactionId(any()) } returns null
+    every { txn31Store.findByTransactionId(TX_ID) } returns txn31
+    every { txn31Store.save(capture(sep31TxnCapture)) } returns null
+    every { eventSession.publish(capture(anchorEventCapture)) } just Runs
+    every { metricsService.counter(PLATFORM_RPC_TRANSACTION, "SEP", "sep31") } returns
+      sepTransactionCounter
+
+    val startDate = Instant.now()
+    val response = handler.handle(request)
+    val endDate = Instant.now()
+
+    verify(exactly = 0) { txn6Store.save(any()) }
+    verify(exactly = 0) { txn24Store.save(any()) }
+    verify(exactly = 1) { sepTransactionCounter.increment() }
+
+    val expectedSep31Txn = JdbcSep31Transaction()
+    expectedSep31Txn.id = TX_ID
+    expectedSep31Txn.status = newStatus
+    expectedSep31Txn.updatedAt = sep31TxnCapture.captured.updatedAt
+    expectedSep31Txn.requiredInfoMessage = TEST_MESSAGE
+
+    JSONAssert.assertEquals(
+      gson.toJson(expectedSep31Txn),
+      gson.toJson(sep31TxnCapture.captured),
+      JSONCompareMode.STRICT
+    )
+
+    val expectedResponse = GetTransactionResponse()
+    expectedResponse.id = TX_ID
+    expectedResponse.sep = SEP_31
+    expectedResponse.kind = RECEIVE
+    expectedResponse.status = SepTransactionStatus.from(newStatus)
+    expectedResponse.amountIn = Amount()
+    expectedResponse.amountOut = Amount()
+    expectedResponse.amountFee = Amount()
+    expectedResponse.amountExpected = Amount()
+    expectedResponse.updatedAt = sep31TxnCapture.captured.updatedAt
+    expectedResponse.message = TEST_MESSAGE
+    expectedResponse.customers = Customers(StellarId(), StellarId())
+
+    JSONAssert.assertEquals(
+      gson.toJson(expectedResponse),
+      gson.toJson(response),
+      JSONCompareMode.STRICT
+    )
+
+    val expectedCustomerEvent =
+      AnchorEvent.builder()
+        .id(anchorEventCapture[0].id)
+        .sep(SEP_12.sep.toString())
+        .type(AnchorEvent.Type.CUSTOMER_UPDATED)
+        .customer(GetCustomerResponse.to(customer))
+        .build()
+
+    JSONAssert.assertEquals(
+      gson.toJson(expectedCustomerEvent),
+      gson.toJson(anchorEventCapture[0]),
+      JSONCompareMode.STRICT
+    )
+
+    val expectedEvent =
+      AnchorEvent.builder()
+        .id(anchorEventCapture[1].id)
+        .sep(SEP_31.sep.toString())
+        .type(AnchorEvent.Type.TRANSACTION_STATUS_CHANGED)
+        .transaction(expectedResponse)
+        .build()
+
+    JSONAssert.assertEquals(
+      gson.toJson(expectedEvent),
+      gson.toJson(anchorEventCapture[1]),
+      JSONCompareMode.STRICT
+    )
+
+    assertTrue(sep31TxnCapture.captured.updatedAt >= startDate)
+    assertTrue(sep31TxnCapture.captured.updatedAt <= endDate)
+  }
+
+  @Test
+  fun test_handle_sep6_invalidRequest() {
+    val request = NotifyCustomerInfoUpdatedRequest.builder().transactionId(TX_ID).build()
+    val txn6 = JdbcSep6Transaction()
+    txn6.status = PENDING_CUSTOMER_INFO_UPDATE.toString()
+
+    every { txn6Store.findByTransactionId(TX_ID) } returns txn6
+    every { txn24Store.findByTransactionId(any()) } returns null
+    every { txn31Store.findByTransactionId(any()) } returns null
+    every { requestValidator.validate(request) } throws
+      InvalidParamsException(VALIDATION_ERROR_MESSAGE)
+
+    val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
+    assertEquals(VALIDATION_ERROR_MESSAGE, ex.message?.trimIndent())
+
+    verify(exactly = 0) { customerIntegration.getCustomer(any()) }
+    verify(exactly = 0) { txn6Store.save(any()) }
+    verify(exactly = 0) { txn24Store.save(any()) }
+    verify(exactly = 0) { txn31Store.save(any()) }
+    verify(exactly = 0) { sepTransactionCounter.increment() }
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = ["deposit", "withdrawal"])
+  fun test_handle_sep6_ok_without_id(kind: String) {
+    val request = NotifyCustomerInfoUpdatedRequest.builder().transactionId(TX_ID).build()
+    val txn6 = JdbcSep6Transaction()
+    txn6.status = PENDING_CUSTOMER_INFO_UPDATE.toString()
+    txn6.kind = kind
+    txn6.userActionRequiredBy = Instant.now()
+    val sep6TxnCapture = slot<JdbcSep6Transaction>()
+    val anchorEventCapture = slot<AnchorEvent>()
+
+    every { txn6Store.findByTransactionId(TX_ID) } returns txn6
+    every { txn24Store.findByTransactionId(any()) } returns null
+    every { txn31Store.findByTransactionId(any()) } returns null
+    every { txn6Store.save(capture(sep6TxnCapture)) } returns null
+    every { eventSession.publish(capture(anchorEventCapture)) } just Runs
+    every { metricsService.counter(PLATFORM_RPC_TRANSACTION, "SEP", "sep6") } returns
+      sepTransactionCounter
+
+    val startDate = Instant.now()
+    val response = handler.handle(request)
+    val endDate = Instant.now()
+
+    verify(exactly = 0) { customerIntegration.getCustomer(any()) }
+    verify(exactly = 0) { txn24Store.save(any()) }
+    verify(exactly = 0) { txn31Store.save(any()) }
+    verify(exactly = 1) { sepTransactionCounter.increment() }
+
+    val expectedSep6Txn = JdbcSep6Transaction()
+    expectedSep6Txn.status = PENDING_ANCHOR.toString()
+    expectedSep6Txn.kind = kind
+    expectedSep6Txn.updatedAt = sep6TxnCapture.captured.updatedAt
+
+    JSONAssert.assertEquals(
+      gson.toJson(expectedSep6Txn),
+      gson.toJson(sep6TxnCapture.captured),
+      JSONCompareMode.STRICT
+    )
+
+    val expectedResponse = GetTransactionResponse()
+    expectedResponse.sep = SEP_6
+    expectedResponse.kind = PlatformTransactionData.Kind.from(kind)
+    expectedResponse.status = PENDING_ANCHOR
+    expectedResponse.updatedAt = sep6TxnCapture.captured.updatedAt
+    expectedResponse.amountExpected = Amount(null, "")
+    expectedResponse.customers = Customers(StellarId(), StellarId())
+
+    JSONAssert.assertEquals(
+      gson.toJson(expectedResponse),
+      gson.toJson(response),
+      JSONCompareMode.STRICT
+    )
+
+    val expectedEvent =
+      AnchorEvent.builder()
+        .id(anchorEventCapture.captured.id)
+        .sep(SEP_6.sep.toString())
+        .type(AnchorEvent.Type.TRANSACTION_STATUS_CHANGED)
+        .transaction(expectedResponse)
+        .build()
+
+    JSONAssert.assertEquals(
+      gson.toJson(expectedEvent),
+      gson.toJson(anchorEventCapture.captured),
+      JSONCompareMode.STRICT
+    )
+
+    assertTrue(sep6TxnCapture.captured.updatedAt >= startDate)
+    assertTrue(sep6TxnCapture.captured.updatedAt <= endDate)
+  }
+
+  @ParameterizedTest
+  @CsvSource(
+    "deposit, ACCEPTED, pending_anchor, pending_anchor",
+    "deposit, ACCEPTED, pending_customer_info_update, pending_anchor",
+    "deposit, PROCESSING, pending_anchor, pending_anchor",
+    "deposit, PROCESSING, pending_customer_info_update, pending_anchor",
+    "deposit, NEEDS_INFO, pending_anchor, pending_customer_info_update",
+    "deposit, NEEDS_INFO, pending_customer_info_update, pending_customer_info_update",
+    "deposit, REJECTED, pending_anchor, error",
+    "deposit, REJECTED, pending_customer_info_update, error",
+    "withdrawal, ACCEPTED, pending_anchor, pending_anchor",
+    "withdrawal, ACCEPTED, pending_customer_info_update, pending_anchor",
+    "withdrawal, PROCESSING, pending_anchor, pending_anchor",
+    "withdrawal, PROCESSING, pending_customer_info_update, pending_anchor",
+    "withdrawal, NEEDS_INFO, pending_anchor, pending_customer_info_update",
+    "withdrawal, NEEDS_INFO, pending_customer_info_update, pending_customer_info_update",
+    "withdrawal, REJECTED, pending_anchor, error",
+    "withdrawal, REJECTED, pending_customer_info_update, error",
+  )
+  fun test_handle_sep6_ok_with_id(
+    kind: String,
+    customerStatus: String,
+    oldStatus: String,
+    newStatus: String
+  ) {
+    val request =
+      NotifyCustomerInfoUpdatedRequest.builder()
+        .transactionId(TX_ID)
+        .customerId(TEST_CUSTOMER_ID)
+        .customerType(TEST_CUSTOMER_TYPE)
+        .message(TEST_MESSAGE)
+        .build()
+    val txn6 = JdbcSep6Transaction()
+    txn6.id = TX_ID
+    txn6.status = oldStatus
+    txn6.kind = kind
+    txn6.userActionRequiredBy = Instant.now()
+    val sep6TxnCapture = slot<JdbcSep6Transaction>()
+    val anchorEventCapture = mutableListOf<AnchorEvent>()
+
+    val customer = GetCustomerResponse.builder().status(customerStatus).build()
+    every {
+      customerIntegration.getCustomer(
+        GetCustomerRequest.builder()
+          .id(TEST_CUSTOMER_ID)
+          .transactionId(TX_ID)
+          .type(TEST_CUSTOMER_TYPE)
+          .build()
+      )
+    } returns customer
+    every { txn6Store.findByTransactionId(TX_ID) } returns txn6
+    every { txn24Store.findByTransactionId(any()) } returns null
+    every { txn31Store.findByTransactionId(any()) } returns null
+    every { txn6Store.save(capture(sep6TxnCapture)) } returns null
+    every { eventSession.publish(capture(anchorEventCapture)) } just Runs
+    every { metricsService.counter(PLATFORM_RPC_TRANSACTION, "SEP", "sep6") } returns
+      sepTransactionCounter
+
+    val startDate = Instant.now()
+    val response = handler.handle(request)
+    val endDate = Instant.now()
+
+    verify(exactly = 0) { txn24Store.save(any()) }
+    verify(exactly = 0) { txn31Store.save(any()) }
+    verify(exactly = 1) { sepTransactionCounter.increment() }
+
+    val expectedSep6Txn = JdbcSep6Transaction()
+    expectedSep6Txn.id = TX_ID
+    expectedSep6Txn.status = newStatus
+    expectedSep6Txn.kind = kind
+    expectedSep6Txn.updatedAt = sep6TxnCapture.captured.updatedAt
+    expectedSep6Txn.message = TEST_MESSAGE
+
+    JSONAssert.assertEquals(
+      gson.toJson(expectedSep6Txn),
+      gson.toJson(sep6TxnCapture.captured),
+      JSONCompareMode.STRICT
+    )
+
+    val expectedResponse = GetTransactionResponse()
+    expectedResponse.id = TX_ID
+    expectedResponse.sep = SEP_6
+    expectedResponse.kind = PlatformTransactionData.Kind.from(kind)
+    expectedResponse.status = SepTransactionStatus.from(newStatus)
+    expectedResponse.updatedAt = sep6TxnCapture.captured.updatedAt
+    expectedResponse.amountExpected = Amount(null, "")
+    expectedResponse.message = TEST_MESSAGE
+    expectedResponse.customers = Customers(StellarId(), StellarId())
+
+    JSONAssert.assertEquals(
+      gson.toJson(expectedResponse),
+      gson.toJson(response),
+      JSONCompareMode.STRICT
+    )
+
+    val expectedCustomerEvent =
+      AnchorEvent.builder()
+        .id(anchorEventCapture[0].id)
+        .sep(SEP_12.sep.toString())
+        .type(AnchorEvent.Type.CUSTOMER_UPDATED)
+        .customer(GetCustomerResponse.to(customer))
+        .build()
+
+    JSONAssert.assertEquals(
+      gson.toJson(expectedCustomerEvent),
+      gson.toJson(anchorEventCapture[0]),
+      JSONCompareMode.STRICT
+    )
+
+    val expectedTxnEvent =
+      AnchorEvent.builder()
+        .id(anchorEventCapture[1].id)
+        .sep(SEP_6.sep.toString())
+        .type(AnchorEvent.Type.TRANSACTION_STATUS_CHANGED)
+        .transaction(expectedResponse)
+        .build()
+
+    JSONAssert.assertEquals(
+      gson.toJson(expectedTxnEvent),
+      gson.toJson(anchorEventCapture[1]),
+      JSONCompareMode.STRICT
+    )
+
+    assertTrue(sep6TxnCapture.captured.updatedAt >= startDate)
+    assertTrue(sep6TxnCapture.captured.updatedAt <= endDate)
+  }
 }
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/RequestOffchainFundsHandlerTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/RequestOffchainFundsHandlerTest.kt
index be7475b29f..85b788de69 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/RequestOffchainFundsHandlerTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/RequestOffchainFundsHandlerTest.kt
@@ -11,6 +11,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.CsvSource
+import org.junit.jupiter.params.provider.ValueSource
 import org.skyscreamer.jsonassert.JSONAssert
 import org.skyscreamer.jsonassert.JSONCompareMode
 import org.stellar.anchor.api.event.AnchorEvent
@@ -37,6 +38,7 @@ import org.stellar.anchor.metrics.MetricsService
 import org.stellar.anchor.platform.data.JdbcSep24Transaction
 import org.stellar.anchor.platform.data.JdbcSep6Transaction
 import org.stellar.anchor.platform.service.AnchorMetrics.PLATFORM_RPC_TRANSACTION
+import org.stellar.anchor.platform.utils.toRate
 import org.stellar.anchor.platform.validator.RequestValidator
 import org.stellar.anchor.sep24.Sep24TransactionStore
 import org.stellar.anchor.sep31.Sep31TransactionStore
@@ -185,7 +187,7 @@ class RequestOffchainFundsHandlerTest {
   }
 
   @Test
-  fun test_handle_withoutAmounts_amount_out_absent() {
+  fun test_handle_withoutAmounts_fee_absent() {
     val request = RequestOffchainFundsRequest.builder().transactionId(TX_ID).build()
     val txn24 = JdbcSep24Transaction()
     txn24.status = INCOMPLETE.toString()
@@ -200,7 +202,7 @@ class RequestOffchainFundsHandlerTest {
     every { txn24Store.save(capture(sep24TxnCapture)) } returns null
 
     val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
-    assertEquals("amount_out is required", ex.message)
+    assertEquals("fee_details or amount_fee is required", ex.message)
 
     verify(exactly = 0) { txn6Store.save(any()) }
     verify(exactly = 0) { txn24Store.save(any()) }
@@ -254,7 +256,7 @@ class RequestOffchainFundsHandlerTest {
 
     val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
     assertEquals(
-      "All or none of the amount_in, amount_out, and (fee_details or amount_fee) should be set",
+      "All (amount_out is optional) or none of the amount_in, amount_out, and (fee_details or amount_fee) should be set",
       ex.message
     )
 
@@ -388,6 +390,63 @@ class RequestOffchainFundsHandlerTest {
     verify(exactly = 0) { sepTransactionCounter.increment() }
   }
 
+  @Test
+  fun test_handle_sep24_with_quote_amount_out_missing() {
+    val request =
+      RequestOffchainFundsRequest.builder()
+        .amountIn(AmountAssetRequest("1", FIAT_USD))
+        .feeDetails(Amount("0.1", FIAT_USD).toRate())
+        .transactionId(TX_ID)
+        .build()
+    val txn24 = JdbcSep24Transaction()
+    txn24.status = INCOMPLETE.toString()
+    txn24.kind = DEPOSIT.kind
+    txn24.quoteId = "testQuoteId"
+    val sep24TxnCapture = slot<JdbcSep24Transaction>()
+
+    every { txn6Store.findByTransactionId(any()) } returns null
+    every { txn24Store.findByTransactionId(TX_ID) } returns txn24
+    every { txn31Store.findByTransactionId(any()) } returns null
+    every { txn24Store.save(capture(sep24TxnCapture)) } returns null
+
+    val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
+    assertEquals("amount_out is required for transactions with firm quotes", ex.message)
+
+    verify(exactly = 0) { txn6Store.save(any()) }
+    verify(exactly = 0) { txn24Store.save(any()) }
+    verify(exactly = 0) { txn31Store.save(any()) }
+    verify(exactly = 0) { sepTransactionCounter.increment() }
+  }
+
+  @Test
+  fun test_handle_sep24_with_simple_quote() {
+    val request =
+      RequestOffchainFundsRequest.builder()
+        .amountIn(AmountAssetRequest("1", FIAT_USD))
+        .feeDetails(Amount("0.1", FIAT_USD).toRate())
+        .transactionId(TX_ID)
+        .build()
+    val txn24 = JdbcSep24Transaction()
+    txn24.status = INCOMPLETE.toString()
+    txn24.kind = DEPOSIT.kind
+    txn24.amountInAsset = STELLAR_USDC
+    txn24.amountOutAsset = STELLAR_USDC
+    val sep24TxnCapture = slot<JdbcSep24Transaction>()
+
+    every { txn6Store.findByTransactionId(any()) } returns null
+    every { txn24Store.findByTransactionId(TX_ID) } returns txn24
+    every { txn31Store.findByTransactionId(any()) } returns null
+    every { txn24Store.save(capture(sep24TxnCapture)) } returns null
+
+    val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
+    assertEquals("amount_out is required for non-exchange transactions", ex.message)
+
+    verify(exactly = 0) { txn6Store.save(any()) }
+    verify(exactly = 0) { txn24Store.save(any()) }
+    verify(exactly = 0) { txn31Store.save(any()) }
+    verify(exactly = 0) { sepTransactionCounter.increment() }
+  }
+
   @Test
   fun test_handle_sep24_ok_withExpectedAmount() {
     val request =
@@ -700,6 +759,65 @@ class RequestOffchainFundsHandlerTest {
     verify(exactly = 0) { sepTransactionCounter.increment() }
   }
 
+  @ParameterizedTest
+  @ValueSource(strings = ["deposit", "deposit-exchange"])
+  fun test_handle_sep6_with_quote_amount_out_missing(kind: String) {
+    val request =
+      RequestOffchainFundsRequest.builder()
+        .amountIn(AmountAssetRequest("1", FIAT_USD))
+        .feeDetails(Amount("0.1", FIAT_USD).toRate())
+        .transactionId(TX_ID)
+        .build()
+    val txn6 = JdbcSep6Transaction()
+    txn6.status = INCOMPLETE.toString()
+    txn6.kind = kind
+    txn6.quoteId = "testQuoteId"
+    val sep6TxnCapture = slot<JdbcSep6Transaction>()
+
+    every { txn6Store.findByTransactionId(any()) } returns txn6
+    every { txn24Store.findByTransactionId(TX_ID) } returns null
+    every { txn31Store.findByTransactionId(any()) } returns null
+    every { txn6Store.save(capture(sep6TxnCapture)) } returns null
+
+    val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
+    assertEquals("amount_out is required for transactions with firm quotes", ex.message)
+
+    verify(exactly = 0) { txn6Store.save(any()) }
+    verify(exactly = 0) { txn24Store.save(any()) }
+    verify(exactly = 0) { txn31Store.save(any()) }
+    verify(exactly = 0) { sepTransactionCounter.increment() }
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = ["deposit", "deposit-exchange"])
+  fun test_handle_sep6_with_simple_quote(kind: String) {
+    val request =
+      RequestOffchainFundsRequest.builder()
+        .amountIn(AmountAssetRequest("1", FIAT_USD))
+        .feeDetails(Amount("0.1", FIAT_USD).toRate())
+        .transactionId(TX_ID)
+        .build()
+    val txn6 = JdbcSep6Transaction()
+    txn6.status = INCOMPLETE.toString()
+    txn6.kind = kind
+    txn6.amountInAsset = FIAT_USD
+    txn6.amountOutAsset = FIAT_USD
+    val sep6TxnCapture = slot<JdbcSep6Transaction>()
+
+    every { txn6Store.findByTransactionId(any()) } returns txn6
+    every { txn24Store.findByTransactionId(TX_ID) } returns null
+    every { txn31Store.findByTransactionId(any()) } returns null
+    every { txn6Store.save(capture(sep6TxnCapture)) } returns null
+
+    val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
+    assertEquals("amount_out is required for non-exchange transactions", ex.message)
+
+    verify(exactly = 0) { txn6Store.save(any()) }
+    verify(exactly = 0) { txn24Store.save(any()) }
+    verify(exactly = 0) { txn31Store.save(any()) }
+    verify(exactly = 0) { sepTransactionCounter.increment() }
+  }
+
   @CsvSource(
     value =
       [
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/RequestOnchainFundsHandlerTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/RequestOnchainFundsHandlerTest.kt
index 29afb38d27..065c8266af 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/RequestOnchainFundsHandlerTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/rpc/RequestOnchainFundsHandlerTest.kt
@@ -11,6 +11,7 @@ import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.assertThrows
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.CsvSource
+import org.junit.jupiter.params.provider.ValueSource
 import org.skyscreamer.jsonassert.JSONAssert
 import org.skyscreamer.jsonassert.JSONCompareMode
 import org.stellar.anchor.api.event.AnchorEvent
@@ -27,10 +28,7 @@ import org.stellar.anchor.api.rpc.method.AmountAssetRequest
 import org.stellar.anchor.api.rpc.method.AmountRequest
 import org.stellar.anchor.api.rpc.method.RequestOnchainFundsRequest
 import org.stellar.anchor.api.sep.SepTransactionStatus.*
-import org.stellar.anchor.api.shared.Amount
-import org.stellar.anchor.api.shared.Customers
-import org.stellar.anchor.api.shared.SepDepositInfo
-import org.stellar.anchor.api.shared.StellarId
+import org.stellar.anchor.api.shared.*
 import org.stellar.anchor.asset.AssetService
 import org.stellar.anchor.asset.DefaultAssetService
 import org.stellar.anchor.config.CustodyConfig
@@ -65,7 +63,6 @@ class RequestOnchainFundsHandlerTest {
     private const val STELLAR_USDC_ISSUER =
       "GA5ZSEJYB37JRC5AVCIA5MOP4RHTM335X2KGX3IHOJAPP5RE34K4KZVN"
     private const val TEXT_MEMO = "testMemo"
-    private const val TEXT_MEMO_2 = "testMemo2"
     private const val HASH_MEMO = "YWYwOTk2M2QtNzU3Mi00NGQ4LWE5MDktMmY2YzMzNTY="
     private const val TEXT_MEMO_TYPE = "text"
     private const val HASH_MEMO_TYPE = "hash"
@@ -195,13 +192,14 @@ class RequestOnchainFundsHandlerTest {
   }
 
   @Test
-  fun test_handle_withoutAmounts_amount_out_absent() {
+  fun test_handle_withoutAmounts_fee_absent() {
     val request = RequestOnchainFundsRequest.builder().transactionId(TX_ID).build()
     val txn24 = JdbcSep24Transaction()
     txn24.status = INCOMPLETE.toString()
     txn24.kind = WITHDRAWAL.kind
     txn24.amountIn = "1"
     txn24.amountInAsset = STELLAR_USDC
+    txn24.feeDetails = FeeDetails()
     val sep24TxnCapture = slot<JdbcSep24Transaction>()
 
     every { txn6Store.findByTransactionId(any()) } returns null
@@ -210,7 +208,7 @@ class RequestOnchainFundsHandlerTest {
     every { txn24Store.save(capture(sep24TxnCapture)) } returns null
 
     val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
-    assertEquals("amount_out is required", ex.message)
+    assertEquals("fee_details or amount_fee is required", ex.message)
 
     verify(exactly = 0) { txn6Store.save(any()) }
     verify(exactly = 0) { txn24Store.save(any()) }
@@ -264,7 +262,7 @@ class RequestOnchainFundsHandlerTest {
 
     val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
     assertEquals(
-      "All or none of the amount_in, amount_out, and (fee_details or amount_fee) should be set",
+      "All (amount_out is optional) or none of the amount_in, amount_out, and (fee_details or amount_fee) should be set",
       ex.message
     )
 
@@ -549,6 +547,63 @@ class RequestOnchainFundsHandlerTest {
     verify(exactly = 0) { sepTransactionCounter.increment() }
   }
 
+  @Test
+  fun test_handle_sep24_with_quote_amount_out_missing() {
+    val request =
+      RequestOnchainFundsRequest.builder()
+        .amountIn(AmountAssetRequest("1", STELLAR_USDC))
+        .feeDetails(Amount("0.1", STELLAR_USDC).toRate())
+        .transactionId(TX_ID)
+        .build()
+    val txn24 = JdbcSep24Transaction()
+    txn24.status = INCOMPLETE.toString()
+    txn24.kind = WITHDRAWAL.kind
+    txn24.quoteId = "testQuoteId"
+    val sep24TxnCapture = slot<JdbcSep24Transaction>()
+
+    every { txn6Store.findByTransactionId(any()) } returns null
+    every { txn24Store.findByTransactionId(TX_ID) } returns txn24
+    every { txn31Store.findByTransactionId(any()) } returns null
+    every { txn24Store.save(capture(sep24TxnCapture)) } returns null
+
+    val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
+    assertEquals("amount_out is required for transactions with firm quotes", ex.message)
+
+    verify(exactly = 0) { txn6Store.save(any()) }
+    verify(exactly = 0) { txn24Store.save(any()) }
+    verify(exactly = 0) { txn31Store.save(any()) }
+    verify(exactly = 0) { sepTransactionCounter.increment() }
+  }
+
+  @Test
+  fun test_handle_sep24_with_simple_quote() {
+    val request =
+      RequestOnchainFundsRequest.builder()
+        .amountIn(AmountAssetRequest("1", STELLAR_USDC))
+        .feeDetails(Amount("0.1", STELLAR_USDC).toRate())
+        .transactionId(TX_ID)
+        .build()
+    val txn24 = JdbcSep24Transaction()
+    txn24.status = INCOMPLETE.toString()
+    txn24.kind = WITHDRAWAL.kind
+    txn24.amountInAsset = STELLAR_USDC
+    txn24.amountOutAsset = STELLAR_USDC
+    val sep24TxnCapture = slot<JdbcSep24Transaction>()
+
+    every { txn6Store.findByTransactionId(any()) } returns null
+    every { txn24Store.findByTransactionId(TX_ID) } returns txn24
+    every { txn31Store.findByTransactionId(any()) } returns null
+    every { txn24Store.save(capture(sep24TxnCapture)) } returns null
+
+    val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
+    assertEquals("amount_out is required for non-exchange transactions", ex.message)
+
+    verify(exactly = 0) { txn6Store.save(any()) }
+    verify(exactly = 0) { txn24Store.save(any()) }
+    verify(exactly = 0) { txn31Store.save(any()) }
+    verify(exactly = 0) { sepTransactionCounter.increment() }
+  }
+
   @Test
   fun test_handle_ok_sep24_withExpectedAmount() {
     val request =
@@ -558,8 +613,8 @@ class RequestOnchainFundsHandlerTest {
         .amountOut(AmountAssetRequest("0.9", FIAT_USD))
         .feeDetails(Amount("0.1", STELLAR_USDC).toRate())
         .amountExpected(AmountRequest("1"))
-        .memo(TEXT_MEMO)
-        .memoType(TEXT_MEMO_TYPE)
+        .memo(HASH_MEMO)
+        .memoType(HASH_MEMO_TYPE)
         .destinationAccount(DESTINATION_ACCOUNT)
         .build()
     val txn24 = JdbcSep24Transaction()
@@ -603,8 +658,8 @@ class RequestOnchainFundsHandlerTest {
     expectedSep24Txn.amountFee = "0.1"
     expectedSep24Txn.amountFeeAsset = STELLAR_USDC
     expectedSep24Txn.amountExpected = "1"
-    expectedSep24Txn.memo = TEXT_MEMO
-    expectedSep24Txn.memoType = TEXT_MEMO_TYPE
+    expectedSep24Txn.memo = HASH_MEMO
+    expectedSep24Txn.memoType = HASH_MEMO_TYPE
     expectedSep24Txn.toAccount = DESTINATION_ACCOUNT
     expectedSep24Txn.withdrawAnchorAccount = DESTINATION_ACCOUNT
 
@@ -624,8 +679,8 @@ class RequestOnchainFundsHandlerTest {
     expectedResponse.feeDetails = Amount("0.1", STELLAR_USDC).toRate()
     expectedResponse.amountExpected = Amount("1", STELLAR_USDC)
     expectedResponse.updatedAt = sep24TxnCapture.captured.updatedAt
-    expectedResponse.memo = TEXT_MEMO
-    expectedResponse.memoType = TEXT_MEMO_TYPE
+    expectedResponse.memo = HASH_MEMO
+    expectedResponse.memoType = HASH_MEMO_TYPE
     expectedResponse.destinationAccount = DESTINATION_ACCOUNT
 
     JSONAssert.assertEquals(
@@ -685,7 +740,7 @@ class RequestOnchainFundsHandlerTest {
     txn24.requestAssetIssuer = STELLAR_USDC_ISSUER
     val sep24TxnCapture = slot<JdbcSep24Transaction>()
     val anchorEventCapture = slot<AnchorEvent>()
-    val depositInfo = SepDepositInfo(DESTINATION_ACCOUNT_2, TEXT_MEMO_2, TEXT_MEMO_TYPE)
+    val depositInfo = SepDepositInfo(DESTINATION_ACCOUNT_2, TEXT_MEMO, TEXT_MEMO_TYPE)
 
     every { txn6Store.findByTransactionId(any()) } returns null
     every { txn24Store.findByTransactionId(TX_ID) } returns txn24
@@ -721,7 +776,7 @@ class RequestOnchainFundsHandlerTest {
     expectedSep24Txn.amountFee = "0.1"
     expectedSep24Txn.amountFeeAsset = STELLAR_USDC
     expectedSep24Txn.amountExpected = "1"
-    expectedSep24Txn.memo = TEXT_MEMO_2
+    expectedSep24Txn.memo = TEXT_MEMO
     expectedSep24Txn.memoType = TEXT_MEMO_TYPE
     expectedSep24Txn.toAccount = DESTINATION_ACCOUNT_2
     expectedSep24Txn.withdrawAnchorAccount = DESTINATION_ACCOUNT_2
@@ -742,7 +797,7 @@ class RequestOnchainFundsHandlerTest {
     expectedResponse.feeDetails = Amount("0.1", STELLAR_USDC).toRate()
     expectedResponse.amountExpected = Amount("1", STELLAR_USDC)
     expectedResponse.updatedAt = sep24TxnCapture.captured.updatedAt
-    expectedResponse.memo = TEXT_MEMO_2
+    expectedResponse.memo = TEXT_MEMO
     expectedResponse.memoType = TEXT_MEMO_TYPE
     expectedResponse.destinationAccount = DESTINATION_ACCOUNT_2
 
@@ -888,8 +943,8 @@ class RequestOnchainFundsHandlerTest {
         .amountIn(AmountAssetRequest("1", STELLAR_USDC))
         .amountOut(AmountAssetRequest("0.9", FIAT_USD))
         .amountFee(AmountAssetRequest("0.1", STELLAR_USDC))
-        .memo(TEXT_MEMO)
-        .memoType(TEXT_MEMO_TYPE)
+        .memo(HASH_MEMO)
+        .memoType(HASH_MEMO_TYPE)
         .destinationAccount(DESTINATION_ACCOUNT)
         .userActionRequiredBy(actionRequiredBy)
         .build()
@@ -933,8 +988,8 @@ class RequestOnchainFundsHandlerTest {
     expectedSep24Txn.amountFee = "0.1"
     expectedSep24Txn.amountFeeAsset = STELLAR_USDC
     expectedSep24Txn.amountExpected = "1"
-    expectedSep24Txn.memo = TEXT_MEMO
-    expectedSep24Txn.memoType = TEXT_MEMO_TYPE
+    expectedSep24Txn.memo = HASH_MEMO
+    expectedSep24Txn.memoType = HASH_MEMO_TYPE
     expectedSep24Txn.toAccount = DESTINATION_ACCOUNT
     expectedSep24Txn.withdrawAnchorAccount = DESTINATION_ACCOUNT
     expectedSep24Txn.userActionRequiredBy = actionRequiredBy
@@ -955,8 +1010,8 @@ class RequestOnchainFundsHandlerTest {
     expectedResponse.feeDetails = Amount("0.1", STELLAR_USDC).toRate()
     expectedResponse.amountExpected = Amount("1", STELLAR_USDC)
     expectedResponse.updatedAt = sep24TxnCapture.captured.updatedAt
-    expectedResponse.memo = TEXT_MEMO
-    expectedResponse.memoType = TEXT_MEMO_TYPE
+    expectedResponse.memo = HASH_MEMO
+    expectedResponse.memoType = HASH_MEMO_TYPE
     expectedResponse.destinationAccount = DESTINATION_ACCOUNT
     expectedResponse.userActionRequiredBy = actionRequiredBy
 
@@ -989,8 +1044,8 @@ class RequestOnchainFundsHandlerTest {
     val request =
       RequestOnchainFundsRequest.builder()
         .transactionId(TX_ID)
-        .memo(TEXT_MEMO)
-        .memoType(TEXT_MEMO_TYPE)
+        .memo(HASH_MEMO)
+        .memoType(HASH_MEMO_TYPE)
         .destinationAccount(DESTINATION_ACCOUNT)
         .build()
     val txn24 = JdbcSep24Transaction()
@@ -1040,8 +1095,8 @@ class RequestOnchainFundsHandlerTest {
     expectedSep24Txn.amountFee = "0.1"
     expectedSep24Txn.amountFeeAsset = STELLAR_USDC
     expectedSep24Txn.amountExpected = "1"
-    expectedSep24Txn.memo = TEXT_MEMO
-    expectedSep24Txn.memoType = TEXT_MEMO_TYPE
+    expectedSep24Txn.memo = HASH_MEMO
+    expectedSep24Txn.memoType = HASH_MEMO_TYPE
     expectedSep24Txn.toAccount = DESTINATION_ACCOUNT
     expectedSep24Txn.withdrawAnchorAccount = DESTINATION_ACCOUNT
 
@@ -1061,8 +1116,8 @@ class RequestOnchainFundsHandlerTest {
     expectedResponse.feeDetails = Amount("0.1", STELLAR_USDC).toRate()
     expectedResponse.amountExpected = Amount("1", STELLAR_USDC)
     expectedResponse.updatedAt = sep24TxnCapture.captured.updatedAt
-    expectedResponse.memo = TEXT_MEMO
-    expectedResponse.memoType = TEXT_MEMO_TYPE
+    expectedResponse.memo = HASH_MEMO
+    expectedResponse.memoType = HASH_MEMO_TYPE
     expectedResponse.destinationAccount = DESTINATION_ACCOUNT
 
     JSONAssert.assertEquals(
@@ -1213,6 +1268,65 @@ class RequestOnchainFundsHandlerTest {
     verify(exactly = 0) { sepTransactionCounter.increment() }
   }
 
+  @ParameterizedTest
+  @ValueSource(strings = ["withdrawal", "withdrawal-exchange"])
+  fun test_handle_sep6_with_quote_amount_out_missing(kind: String) {
+    val request =
+      RequestOnchainFundsRequest.builder()
+        .amountIn(AmountAssetRequest("1", STELLAR_USDC))
+        .feeDetails(Amount("0.1", STELLAR_USDC).toRate())
+        .transactionId(TX_ID)
+        .build()
+    val txn6 = JdbcSep6Transaction()
+    txn6.status = INCOMPLETE.toString()
+    txn6.kind = kind
+    txn6.quoteId = "testQuoteId"
+    val sep6TxnCapture = slot<JdbcSep6Transaction>()
+
+    every { txn6Store.findByTransactionId(any()) } returns txn6
+    every { txn24Store.findByTransactionId(TX_ID) } returns null
+    every { txn31Store.findByTransactionId(any()) } returns null
+    every { txn6Store.save(capture(sep6TxnCapture)) } returns null
+
+    val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
+    assertEquals("amount_out is required for transactions with firm quotes", ex.message)
+
+    verify(exactly = 0) { txn6Store.save(any()) }
+    verify(exactly = 0) { txn24Store.save(any()) }
+    verify(exactly = 0) { txn31Store.save(any()) }
+    verify(exactly = 0) { sepTransactionCounter.increment() }
+  }
+
+  @ParameterizedTest
+  @ValueSource(strings = ["withdrawal", "withdrawal-exchange"])
+  fun test_handle_sep6_with_simple_quote(kind: String) {
+    val request =
+      RequestOnchainFundsRequest.builder()
+        .amountIn(AmountAssetRequest("1", STELLAR_USDC))
+        .feeDetails(Amount("0.1", STELLAR_USDC).toRate())
+        .transactionId(TX_ID)
+        .build()
+    val txn6 = JdbcSep6Transaction()
+    txn6.status = INCOMPLETE.toString()
+    txn6.kind = kind
+    txn6.amountInAsset = STELLAR_USDC
+    txn6.amountOutAsset = STELLAR_USDC
+    val sep6TxnCapture = slot<JdbcSep6Transaction>()
+
+    every { txn6Store.findByTransactionId(any()) } returns txn6
+    every { txn24Store.findByTransactionId(TX_ID) } returns null
+    every { txn31Store.findByTransactionId(any()) } returns null
+    every { txn6Store.save(capture(sep6TxnCapture)) } returns null
+
+    val ex = assertThrows<InvalidParamsException> { handler.handle(request) }
+    assertEquals("amount_out is required for non-exchange transactions", ex.message)
+
+    verify(exactly = 0) { txn6Store.save(any()) }
+    verify(exactly = 0) { txn24Store.save(any()) }
+    verify(exactly = 0) { txn31Store.save(any()) }
+    verify(exactly = 0) { sepTransactionCounter.increment() }
+  }
+
   @CsvSource(value = ["withdrawal", "withdrawal-exchange"])
   @ParameterizedTest
   fun test_handle_ok_sep6_withExpectedAmount(kind: String) {
@@ -1223,8 +1337,8 @@ class RequestOnchainFundsHandlerTest {
         .amountOut(AmountAssetRequest("0.9", FIAT_USD))
         .feeDetails(Amount("0.1", STELLAR_USDC).toRate())
         .amountExpected(AmountRequest("1"))
-        .memo(TEXT_MEMO)
-        .memoType(TEXT_MEMO_TYPE)
+        .memo(HASH_MEMO)
+        .memoType(HASH_MEMO_TYPE)
         .destinationAccount(DESTINATION_ACCOUNT)
         .build()
     val txn6 = JdbcSep6Transaction()
@@ -1269,8 +1383,8 @@ class RequestOnchainFundsHandlerTest {
     expectedSep6Txn.amountFee = "0.1"
     expectedSep6Txn.amountFeeAsset = STELLAR_USDC
     expectedSep6Txn.amountExpected = "1"
-    expectedSep6Txn.memo = TEXT_MEMO
-    expectedSep6Txn.memoType = TEXT_MEMO_TYPE
+    expectedSep6Txn.memo = HASH_MEMO
+    expectedSep6Txn.memoType = HASH_MEMO_TYPE
     expectedSep6Txn.withdrawAnchorAccount = DESTINATION_ACCOUNT
 
     JSONAssert.assertEquals(
@@ -1295,8 +1409,8 @@ class RequestOnchainFundsHandlerTest {
     expectedResponse.feeDetails = Amount("0.1", STELLAR_USDC).toRate()
     expectedResponse.amountExpected = Amount("1", STELLAR_USDC)
     expectedResponse.updatedAt = sep6TxnCapture.captured.updatedAt
-    expectedResponse.memo = TEXT_MEMO
-    expectedResponse.memoType = TEXT_MEMO_TYPE
+    expectedResponse.memo = HASH_MEMO
+    expectedResponse.memoType = HASH_MEMO_TYPE
     expectedResponse.customers = Customers(StellarId(null, null, null), StellarId(null, null, null))
 
     JSONAssert.assertEquals(
@@ -1357,7 +1471,7 @@ class RequestOnchainFundsHandlerTest {
     txn6.requestAssetIssuer = STELLAR_USDC_ISSUER
     val sep6TxnCapture = slot<JdbcSep6Transaction>()
     val anchorEventCapture = slot<AnchorEvent>()
-    val depositInfo = SepDepositInfo(DESTINATION_ACCOUNT_2, TEXT_MEMO_2, TEXT_MEMO_TYPE)
+    val depositInfo = SepDepositInfo(DESTINATION_ACCOUNT_2, TEXT_MEMO, TEXT_MEMO_TYPE)
 
     every { txn6Store.findByTransactionId(TX_ID) } returns txn6
     every { txn24Store.findByTransactionId(any()) } returns null
@@ -1392,7 +1506,7 @@ class RequestOnchainFundsHandlerTest {
     expectedSep6Txn.amountFee = "0.1"
     expectedSep6Txn.amountFeeAsset = STELLAR_USDC
     expectedSep6Txn.amountExpected = "1"
-    expectedSep6Txn.memo = TEXT_MEMO_2
+    expectedSep6Txn.memo = TEXT_MEMO
     expectedSep6Txn.memoType = TEXT_MEMO_TYPE
     expectedSep6Txn.withdrawAnchorAccount = DESTINATION_ACCOUNT_2
 
@@ -1412,7 +1526,7 @@ class RequestOnchainFundsHandlerTest {
     expectedResponse.feeDetails = Amount("0.1", STELLAR_USDC).toRate()
     expectedResponse.amountExpected = Amount("1", STELLAR_USDC)
     expectedResponse.updatedAt = sep6TxnCapture.captured.updatedAt
-    expectedResponse.memo = TEXT_MEMO_2
+    expectedResponse.memo = TEXT_MEMO
     expectedResponse.memoType = TEXT_MEMO_TYPE
     expectedResponse.customers = Customers(StellarId(null, null, null), StellarId(null, null, null))
 
@@ -1449,8 +1563,8 @@ class RequestOnchainFundsHandlerTest {
         .amountIn(AmountAssetRequest("1", STELLAR_USDC))
         .amountOut(AmountAssetRequest("0.9", FIAT_USD))
         .amountFee(AmountAssetRequest("0.1", STELLAR_USDC))
-        .memo(TEXT_MEMO)
-        .memoType(TEXT_MEMO_TYPE)
+        .memo(HASH_MEMO)
+        .memoType(HASH_MEMO_TYPE)
         .destinationAccount(DESTINATION_ACCOUNT)
         .build()
     val txn6 = JdbcSep6Transaction()
@@ -1490,8 +1604,8 @@ class RequestOnchainFundsHandlerTest {
     expectedSep6Txn.amountFee = "0.1"
     expectedSep6Txn.amountFeeAsset = STELLAR_USDC
     expectedSep6Txn.amountExpected = "1"
-    expectedSep6Txn.memo = TEXT_MEMO
-    expectedSep6Txn.memoType = TEXT_MEMO_TYPE
+    expectedSep6Txn.memo = HASH_MEMO
+    expectedSep6Txn.memoType = HASH_MEMO_TYPE
     expectedSep6Txn.withdrawAnchorAccount = DESTINATION_ACCOUNT
 
     JSONAssert.assertEquals(
@@ -1510,8 +1624,8 @@ class RequestOnchainFundsHandlerTest {
     expectedResponse.feeDetails = Amount("0.1", STELLAR_USDC).toRate()
     expectedResponse.amountExpected = Amount("1", STELLAR_USDC)
     expectedResponse.updatedAt = sep6TxnCapture.captured.updatedAt
-    expectedResponse.memo = TEXT_MEMO
-    expectedResponse.memoType = TEXT_MEMO_TYPE
+    expectedResponse.memo = HASH_MEMO
+    expectedResponse.memoType = HASH_MEMO_TYPE
     expectedResponse.customers = Customers(StellarId(null, null, null), StellarId(null, null, null))
 
     JSONAssert.assertEquals(
@@ -1544,8 +1658,8 @@ class RequestOnchainFundsHandlerTest {
     val request =
       RequestOnchainFundsRequest.builder()
         .transactionId(TX_ID)
-        .memo(TEXT_MEMO)
-        .memoType(TEXT_MEMO_TYPE)
+        .memo(HASH_MEMO)
+        .memoType(HASH_MEMO_TYPE)
         .destinationAccount(DESTINATION_ACCOUNT)
         .build()
     val txn6 = JdbcSep6Transaction()
@@ -1593,8 +1707,8 @@ class RequestOnchainFundsHandlerTest {
     expectedSep6Txn.amountFee = "0.1"
     expectedSep6Txn.amountFeeAsset = STELLAR_USDC
     expectedSep6Txn.amountExpected = "1"
-    expectedSep6Txn.memo = TEXT_MEMO
-    expectedSep6Txn.memoType = TEXT_MEMO_TYPE
+    expectedSep6Txn.memo = HASH_MEMO
+    expectedSep6Txn.memoType = HASH_MEMO_TYPE
     expectedSep6Txn.withdrawAnchorAccount = DESTINATION_ACCOUNT
 
     JSONAssert.assertEquals(
@@ -1613,8 +1727,8 @@ class RequestOnchainFundsHandlerTest {
     expectedResponse.feeDetails = expectedResponse.amountFee.toRate()
     expectedResponse.amountExpected = Amount("1", STELLAR_USDC)
     expectedResponse.updatedAt = sep6TxnCapture.captured.updatedAt
-    expectedResponse.memo = TEXT_MEMO
-    expectedResponse.memoType = TEXT_MEMO_TYPE
+    expectedResponse.memo = HASH_MEMO
+    expectedResponse.memoType = HASH_MEMO_TYPE
     expectedResponse.customers = Customers(StellarId(null, null, null), StellarId(null, null, null))
 
     JSONAssert.assertEquals(
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/service/Sep24MoreInfoUrlConstructorTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/service/Sep24MoreInfoUrlConstructorTest.kt
index 30a71c7118..34dfdb070a 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/service/Sep24MoreInfoUrlConstructorTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/service/Sep24MoreInfoUrlConstructorTest.kt
@@ -4,7 +4,7 @@ import io.mockk.MockKAnnotations
 import io.mockk.every
 import io.mockk.impl.annotations.MockK
 import java.time.Instant
-import java.util.Calendar
+import java.util.*
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Assertions.assertEquals
 import org.junit.jupiter.api.BeforeEach
@@ -18,7 +18,8 @@ import org.stellar.anchor.api.exception.SepValidationException
 import org.stellar.anchor.auth.JwtService
 import org.stellar.anchor.auth.MoreInfoUrlJwt.Sep24MoreInfoUrlJwt
 import org.stellar.anchor.config.ClientsConfig.ClientConfig
-import org.stellar.anchor.config.ClientsConfig.ClientType.*
+import org.stellar.anchor.config.ClientsConfig.ClientType.CUSTODIAL
+import org.stellar.anchor.config.ClientsConfig.ClientType.NONCUSTODIAL
 import org.stellar.anchor.config.CustodySecretConfig
 import org.stellar.anchor.config.SecretConfig
 import org.stellar.anchor.platform.config.MoreInfoUrlConfig
@@ -46,17 +47,13 @@ class Sep24MoreInfoUrlConstructorTest {
     secretConfig.setupMock()
 
     val clientConfig =
-      ClientConfig(
-        "lobstr",
-        NONCUSTODIAL,
-        null,
-        setOf("GBLGJA4TUN5XOGTV6WO2BWYUI2OZR5GYQ5PDPCRMQ5XEPJOYWB2X4CJO"),
-        null,
-        setOf("lobstr.co"),
-        "https://callback.lobstr.co/api/v2/anchor/callback",
-        false,
-        null
-      )
+      ClientConfig.builder()
+        .name("lobstr")
+        .type(NONCUSTODIAL)
+        .signingKeys(setOf("GBLGJA4TUN5XOGTV6WO2BWYUI2OZR5GYQ5PDPCRMQ5XEPJOYWB2X4CJO"))
+        .domains(setOf("lobstr.co"))
+        .callbackUrl("https://callback.lobstr.co/api/v2/anchor/callback")
+        .build()
     every { clientsConfig.getClientConfigByDomain(any()) } returns null
     every { clientsConfig.getClientConfigByDomain(clientConfig.domains.first()) } returns
       clientConfig
@@ -67,17 +64,11 @@ class Sep24MoreInfoUrlConstructorTest {
         "GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
       )
     } returns
-      ClientConfig(
-        "some-wallet",
-        CUSTODIAL,
-        null,
-        setOf("GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"),
-        null,
-        null,
-        null,
-        false,
-        null
-      )
+      ClientConfig.builder()
+        .name("some-wallet")
+        .type(CUSTODIAL)
+        .signingKeys(setOf("GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"))
+        .build()
 
     jwtService = JwtService(secretConfig, custodySecretConfig)
   }
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/service/SimpleInteractiveUrlConstructorTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/service/SimpleInteractiveUrlConstructorTest.kt
index ce9aee44fa..dc5cbc8416 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/service/SimpleInteractiveUrlConstructorTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/service/SimpleInteractiveUrlConstructorTest.kt
@@ -62,17 +62,13 @@ class SimpleInteractiveUrlConstructorTest {
     secretConfig.setupMock()
 
     val clientConfig =
-      ClientConfig(
-        "lobstr",
-        NONCUSTODIAL,
-        null,
-        setOf("GBLGJA4TUN5XOGTV6WO2BWYUI2OZR5GYQ5PDPCRMQ5XEPJOYWB2X4CJO"),
-        null,
-        setOf("lobstr.co"),
-        "https://callback.lobstr.co/api/v2/anchor/callback",
-        false,
-        null
-      )
+      ClientConfig.builder()
+        .name("lobstr")
+        .type(NONCUSTODIAL)
+        .signingKeys(setOf("GBLGJA4TUN5XOGTV6WO2BWYUI2OZR5GYQ5PDPCRMQ5XEPJOYWB2X4CJO"))
+        .domains(setOf("lobstr.co"))
+        .callbackUrl("https://callback.lobstr.co/api/v2/anchor/callback")
+        .build()
     every { clientsConfig.getClientConfigByDomain(any()) } returns null
     every { clientsConfig.getClientConfigByDomain(clientConfig.domains.first()) } returns
       clientConfig
@@ -83,17 +79,11 @@ class SimpleInteractiveUrlConstructorTest {
         "GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
       )
     } returns
-      ClientConfig(
-        "some-wallet",
-        CUSTODIAL,
-        null,
-        setOf("GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"),
-        null,
-        emptySet(),
-        null,
-        false,
-        null
-      )
+      ClientConfig.builder()
+        .name("some-wallet")
+        .type(CUSTODIAL)
+        .signingKeys(setOf("GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"))
+        .build()
     every { testAsset.sep38AssetName } returns
       "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
     every { sep10Jwt.homeDomain } returns TEST_HOME_DOMAIN
diff --git a/platform/src/test/kotlin/org/stellar/anchor/platform/utils/AssetValidationUtilsTest.kt b/platform/src/test/kotlin/org/stellar/anchor/platform/utils/AssetValidationUtilsTest.kt
index 9839466643..01c79d3b89 100644
--- a/platform/src/test/kotlin/org/stellar/anchor/platform/utils/AssetValidationUtilsTest.kt
+++ b/platform/src/test/kotlin/org/stellar/anchor/platform/utils/AssetValidationUtilsTest.kt
@@ -27,71 +27,85 @@ class AssetValidationUtilsTest {
   }
 
   @Test
-  fun test_validateAsset_failure() {
+  fun test_validateAsset_Amount_failure() {
     // fails if amount_in.amount is null
     var assetAmount = AmountAssetRequest(null, null)
     var ex =
       assertThrows<AnchorException> {
-        AssetValidationUtils.validateAsset("amount_in", assetAmount, assetService)
+        AssetValidationUtils.validateAssetAmount("amount_in", assetAmount, assetService)
       }
     Assertions.assertInstanceOf(BadRequestException::class.java, ex)
     Assertions.assertEquals("amount_in.amount cannot be empty", ex.message)
 
     // fails if amount_in.amount is empty
     assetAmount = AmountAssetRequest("", null)
-    ex = assertThrows { AssetValidationUtils.validateAsset("amount_in", assetAmount, assetService) }
+    ex = assertThrows {
+      AssetValidationUtils.validateAssetAmount("amount_in", assetAmount, assetService)
+    }
     Assertions.assertInstanceOf(BadRequestException::class.java, ex)
     Assertions.assertEquals("amount_in.amount cannot be empty", ex.message)
 
     // fails if amount_in.amount is invalid
     assetAmount = AmountAssetRequest("abc", null)
-    ex = assertThrows { AssetValidationUtils.validateAsset("amount_in", assetAmount, assetService) }
+    ex = assertThrows {
+      AssetValidationUtils.validateAssetAmount("amount_in", assetAmount, assetService)
+    }
     Assertions.assertInstanceOf(BadRequestException::class.java, ex)
     Assertions.assertEquals("amount_in.amount is invalid", ex.message)
 
     // fails if amount_in.amount is negative
     assetAmount = AmountAssetRequest("-1", null)
-    ex = assertThrows { AssetValidationUtils.validateAsset("amount_in", assetAmount, assetService) }
+    ex = assertThrows {
+      AssetValidationUtils.validateAssetAmount("amount_in", assetAmount, assetService)
+    }
     Assertions.assertInstanceOf(BadRequestException::class.java, ex)
     Assertions.assertEquals("amount_in.amount should be positive", ex.message)
 
     // fails if amount_in.amount is zero
     assetAmount = AmountAssetRequest("0", null)
-    ex = assertThrows { AssetValidationUtils.validateAsset("amount_in", assetAmount, assetService) }
+    ex = assertThrows {
+      AssetValidationUtils.validateAssetAmount("amount_in", assetAmount, assetService)
+    }
     Assertions.assertInstanceOf(BadRequestException::class.java, ex)
     Assertions.assertEquals("amount_in.amount should be positive", ex.message)
 
     // fails if amount_in.asset is empty
     assetAmount = AmountAssetRequest("10", "")
-    ex = assertThrows { AssetValidationUtils.validateAsset("amount_in", assetAmount, assetService) }
+    ex = assertThrows {
+      AssetValidationUtils.validateAssetAmount("amount_in", assetAmount, assetService)
+    }
     Assertions.assertInstanceOf(BadRequestException::class.java, ex)
     Assertions.assertEquals("amount_in.asset cannot be empty", ex.message)
 
     // fails if listAllAssets is empty
     every { assetService.listAllAssets() } returns listOf()
     val mockAsset = AmountAssetRequest("10", fiatUSD)
-    ex = assertThrows { AssetValidationUtils.validateAsset("amount_in", mockAsset, assetService) }
+    ex = assertThrows {
+      AssetValidationUtils.validateAssetAmount("amount_in", mockAsset, assetService)
+    }
     Assertions.assertInstanceOf(BadRequestException::class.java, ex)
     Assertions.assertEquals("'${fiatUSD}' is not a supported asset.", ex.message)
 
     // fails if listAllAssets does not contain the desired asset
-    ex = assertThrows { AssetValidationUtils.validateAsset("amount_in", mockAsset, assetService) }
+    ex = assertThrows {
+      AssetValidationUtils.validateAssetAmount("amount_in", mockAsset, assetService)
+    }
     Assertions.assertInstanceOf(BadRequestException::class.java, ex)
     Assertions.assertEquals("'${fiatUSD}' is not a supported asset.", ex.message)
   }
 
   @Test
-  fun test_validateAsset() {
+  fun test_validateAssetAmount() {
     this.assetService = DefaultAssetService.fromJsonResource("test_assets.json")
     val mockAsset = AmountAssetRequest("10", fiatUSD)
     Assertions.assertDoesNotThrow {
-      AssetValidationUtils.validateAsset("amount_in", mockAsset, assetService)
+      AssetValidationUtils.validateAssetAmount("amount_in", mockAsset, assetService)
     }
     val mockAssetWrongAmount = AmountAssetRequest("10.001", fiatUSD)
 
     val ex =
       assertThrows<AnchorException> {
-        AssetValidationUtils.validateAsset("amount_in", mockAssetWrongAmount, assetService)
+        AssetValidationUtils.validateAssetAmount("amount_in", mockAssetWrongAmount, assetService)
       }
     Assertions.assertInstanceOf(BadRequestException::class.java, ex)
   }
diff --git a/service-runner/build.gradle.kts b/service-runner/build.gradle.kts
index fae2ee354f..1a6df10f2b 100644
--- a/service-runner/build.gradle.kts
+++ b/service-runner/build.gradle.kts
@@ -61,9 +61,9 @@ tasks.register<JavaExec>("startServersWithTestProfile") {
   mainClass.set("org.stellar.anchor.platform.run_profiles.RunTestProfile")
 }
 
-/** Run docker-compose up to start Postgres, Kafka, etc. */
+/** Run docker compose up to start Postgres, Kafka, etc. */
 tasks.register<JavaExec>("dockerComposeStart") {
-  println("Running docker-compose to start Postgres, Kafka ,etc.")
+  println("Running docker compose to start Postgres, Kafka ,etc.")
   group = "application"
   classpath = sourceSets["main"].runtimeClasspath
   mainClass.set("org.stellar.anchor.platform.run_profiles.RunDockerDevStackNoWait")
diff --git a/service-runner/src/main/kotlin/org/stellar/anchor/platform/TestProfileRunner.kt b/service-runner/src/main/kotlin/org/stellar/anchor/platform/TestProfileRunner.kt
index 9cde43be4c..46cf66f158 100644
--- a/service-runner/src/main/kotlin/org/stellar/anchor/platform/TestProfileRunner.kt
+++ b/service-runner/src/main/kotlin/org/stellar/anchor/platform/TestProfileRunner.kt
@@ -7,7 +7,6 @@ import com.palantir.docker.compose.configuration.ProjectName
 import com.palantir.docker.compose.connection.waiting.HealthChecks
 import java.io.File
 import java.lang.Thread.sleep
-import java.lang.reflect.Field
 import java.util.*
 import kotlinx.coroutines.*
 import org.springframework.context.ConfigurableApplicationContext
@@ -140,13 +139,14 @@ class TestProfileExecutor(val config: TestConfig) {
   private fun startDocker() {
     if (shouldStartDockerCompose) {
       info("Starting docker compose...")
-      if (isWindows()) {
-        setupWindowsEnv()
-      }
-
-      info("Initializing TestProfileRunner...")
       val dockerComposeFile = getResourceFile("docker-compose-test.yaml")
       val userHomeFolder = File(System.getProperty("user.home"))
+      if (isWindows()) {
+        System.getenv("DOCKER_LOCATION")
+          ?: throw RuntimeException("DOCKER_LOCATION env variable is not set")
+        System.getenv("DOCKER_COMPOSE_LOCATION")
+          ?: throw RuntimeException("DOCKER_COMPOSE_LOCATION env variable is not set")
+      }
       docker =
         DockerComposeExtension.builder()
           .saveLogsTo("${userHomeFolder}/docker-logs/anchor-platform-integration-test")
@@ -160,9 +160,6 @@ class TestProfileExecutor(val config: TestConfig) {
           .build()
 
       docker.beforeAll(null)
-
-      // TODO: Check server readiness instead of wait for 5 seconds
-      sleep(5000)
     }
   }
 
@@ -189,46 +186,4 @@ class TestProfileExecutor(val config: TestConfig) {
   private fun isWindows(): Boolean {
     return System.getProperty("os.name").lowercase(Locale.getDefault()).contains("win")
   }
-
-  private fun setupWindowsEnv() {
-    val windowsDockerLocation =
-      System.getenv("WIN_DOCKER_LOCATION")
-        ?: throw RuntimeException("WIN_DOCKER_LOCATION env variable is not set")
-
-    setEnv(mapOf("DOCKER_LOCATION" to File(windowsDockerLocation, "docker.exe").absolutePath))
-    setEnv(
-      mapOf(
-        "DOCKER_COMPOSE_LOCATION" to File(windowsDockerLocation, "docker-compose.exe").absolutePath
-      )
-    )
-  }
-
-  @Suppress("UNCHECKED_CAST")
-  private fun setEnv(envs: Map<String, String>?) {
-    try {
-      val processEnvironmentClass = Class.forName("java.lang.ProcessEnvironment")
-      val theEnvironmentField: Field = processEnvironmentClass.getDeclaredField("theEnvironment")
-      theEnvironmentField.isAccessible = true
-      val env = theEnvironmentField.get(null) as MutableMap<String, String>
-      env.putAll(envs!!)
-      val theCaseInsensitiveEnvironmentField: Field =
-        processEnvironmentClass.getDeclaredField("theCaseInsensitiveEnvironment")
-      theCaseInsensitiveEnvironmentField.isAccessible = true
-      val cienv = theCaseInsensitiveEnvironmentField.get(null) as MutableMap<String, String>
-      cienv.putAll(envs)
-    } catch (e: NoSuchFieldException) {
-      val classes = Collections::class.java.declaredClasses
-      val env = System.getenv()
-      for (cl in classes) {
-        if ("java.util.Collections\$UnmodifiableMap" == cl.name) {
-          val field: Field = cl.getDeclaredField("m")
-          field.isAccessible = true
-          val obj: Any = field.get(env)
-          val map = obj as MutableMap<String, String>
-          map.clear()
-          map.putAll(envs!!)
-        }
-      }
-    }
-  }
 }
diff --git a/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunDockerDevStackNoWait.kt b/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunDockerDevStackNoWait.kt
index 38f6d60a34..b8dea29ce0 100644
--- a/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunDockerDevStackNoWait.kt
+++ b/service-runner/src/main/kotlin/org/stellar/anchor/platform/run_profiles/RunDockerDevStackNoWait.kt
@@ -8,7 +8,7 @@ import org.stellar.anchor.platform.*
 fun main() = runBlocking {
   testProfileExecutor = TestProfileExecutor(TestConfig())
   // The "registerShutdownHook(testProfileExecutor)" is commented out to avoid shutting down the
-  // docker-compose stack when the JVM is shutdown.
+  // docker compose stack when the JVM is shutdown.
   testProfileExecutor.start(true) {
     it.env[RUN_DOCKER] = "true"
     it.env[RUN_ALL_SERVERS] = "false"
diff --git a/service-runner/src/main/resources/config/assets.yaml b/service-runner/src/main/resources/config/assets.yaml
index def98aee01..e6f9415b50 100644
--- a/service-runner/src/main/resources/config/assets.yaml
+++ b/service-runner/src/main/resources/config/assets.yaml
@@ -4,7 +4,7 @@ assets:
     code: USDC
     issuer: GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP
     distribution_account: GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF
-    significant_decimals: 2
+    significant_decimals: 7
     deposit:
       enabled: true
       min_amount: 0
@@ -66,7 +66,7 @@ assets:
     code: USDC
     issuer: GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5
     distribution_account: GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF
-    significant_decimals: 2
+    significant_decimals: 4
     deposit:
       enabled: true
       min_amount: 0
@@ -190,7 +190,7 @@ assets:
   # Fiat
   - schema: iso4217
     code: USD
-    significant_decimals: 7
+    significant_decimals: 4
     send:
       min_amount: 0
       max_amount: 1000000
@@ -210,7 +210,7 @@ assets:
     sep38_enabled: true
   - schema: iso4217
     code: CAD
-    significant_decimals: 7
+    significant_decimals: 4
     send:
       min_amount: 0
       max_amount: 1000000
diff --git a/service-runner/src/main/resources/profiles/default/config.env b/service-runner/src/main/resources/profiles/default/config.env
index 28a17eaadd..ee8a3b0c33 100644
--- a/service-runner/src/main/resources/profiles/default/config.env
+++ b/service-runner/src/main/resources/profiles/default/config.env
@@ -50,7 +50,10 @@ sep24.more_info_url.base_url=http://localhost:8091/sep24/transaction/more_info
 clients[0].name=reference
 clients[0].type=noncustodial
 clients[0].domain=wallet-server:8092
-clients[0].callback_url=http://wallet-server:8092/callbacks
+clients[0].callback_url_sep6=http://wallet-server:8092/callbacks/sep6
+clients[0].callback_url_sep24=http://wallet-server:8092/callbacks/sep24
+clients[0].callback_url_sep31=http://wallet-server:8092/callbacks/sep31
+clients[0].callback_url_sep12=http://wallet-server:8092/callbacks/sep12
 clients[1].name=referenceCustodial
 clients[1].type=custodial
 clients[1].signing_key=GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG
diff --git a/service-runner/src/main/resources/version-info.properties b/service-runner/src/main/resources/version-info.properties
index ad171da523..28b65171e5 100644
--- a/service-runner/src/main/resources/version-info.properties
+++ b/service-runner/src/main/resources/version-info.properties
@@ -1 +1 @@
-version=2.8.4
\ No newline at end of file
+version=2.9.0
\ No newline at end of file
diff --git a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/CallbackService.kt b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/CallbackService.kt
index 205f1ab391..d0569da1e3 100644
--- a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/CallbackService.kt
+++ b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/CallbackService.kt
@@ -7,34 +7,36 @@ import java.util.*
 import org.stellar.sdk.KeyPair
 
 class CallbackService {
-  private val receivedCallbacks: MutableList<JsonObject> = mutableListOf()
+  private val callbacks = mutableMapOf<CallbackType, MutableList<JsonObject>>()
 
-  fun processCallback(receivedCallback: JsonObject) {
-    receivedCallbacks.add(receivedCallback)
+  init {
+    CallbackType.entries.forEach { callbacks[it] = mutableListOf() }
   }
 
-  // Get all events. This is for testing purpose.
-  // If txnId is not null, the events are filtered.
-  fun getCallbacks(txnId: String?): List<JsonObject> {
-    if (txnId != null) {
-      // filter events with txnId
-      return receivedCallbacks.filter {
-        it.getAsJsonObject("transaction")?.get("id")?.asString == txnId
-      }
-    }
-    // return all events
-    return receivedCallbacks
+  fun processCallback(receivedCallback: JsonObject, type: String) {
+    val callbackType = CallbackType.fromString(type)
+    callbacks[callbackType]?.add(receivedCallback)
   }
 
-  // Get the latest event received. This is for testing purpose
-  fun getLatestCallback(): JsonObject? {
-    return receivedCallbacks.lastOrNull()
+  fun getTransactionCallbacks(type: String, txnId: String?): List<JsonObject> {
+    val callbackType = CallbackType.fromString(type)
+    if (callbackType == CallbackType.SEP12) {
+      throw IllegalArgumentException("SEP12 is not a valid transaction type")
+    }
+    return callbacks[callbackType]?.let { callbacks ->
+      txnId?.let { id ->
+        callbacks.filter { it.getAsJsonObject("transaction")?.get("id")?.asString == id }
+      }
+        ?: callbacks
+    }
+      ?: emptyList()
   }
 
-  // Clear all events. This is for testing purpose
-  fun clear() {
-    log.debug("Clearing events")
-    receivedCallbacks.clear()
+  fun getCustomerCallbacks(customerId: String?): List<JsonObject> {
+    return callbacks[CallbackType.SEP12]?.let { callbacks ->
+      customerId?.let { id -> callbacks.filter { it.get("id").asString == id } } ?: callbacks
+    }
+      ?: emptyList()
   }
 
   companion object {
@@ -44,63 +46,115 @@ class CallbackService {
       domain: String?,
       signer: KeyPair?
     ): Boolean {
-      val messagePrefix = "Failed to verify signature"
-      if (header == null) {
-        log.warn("$messagePrefix: Signature header is null")
-        return false
-      }
-      val tokens = header.split(",")
-      if (tokens.size != 2) {
-        log.warn("$messagePrefix: Invalid signature header")
-        return false
-      }
-      // t=timestamp
-      val timestampTokens = tokens[0].trim().split("=")
-      if (timestampTokens.size != 2 || timestampTokens[0] != "t") {
-        log.warn("$messagePrefix: Invalid timestamp in signature header")
-        return false
-      }
-      val timestampLong = timestampTokens[1].trim().toLongOrNull() ?: return false
-      val timestamp = Instant.ofEpochSecond(timestampLong)
+      return SignatureVerifier(header, body, domain, signer).verify()
+    }
+  }
 
-      if (Duration.between(timestamp, Instant.now()).toMinutes() > 2) {
-        // timestamp is older than 2 minutes
-        log.warn("$messagePrefix: Timestamp is older than 2 minutes")
-        return false
-      }
+  private enum class CallbackType {
+    SEP6,
+    SEP24,
+    SEP31,
+    SEP12;
 
-      // s=signature
-      val sigTokens = tokens[1].trim().split("=", limit = 2)
-      if (sigTokens.size != 2 || sigTokens[0] != "s") {
-        log.warn("$messagePrefix: Invalid signature in signature header")
-        return false
+    companion object {
+      fun fromString(type: String): CallbackType {
+        return when (type.lowercase()) {
+          "sep6" -> SEP6
+          "sep24" -> SEP24
+          "sep31" -> SEP31
+          "sep12" -> SEP12
+          else -> throw IllegalArgumentException("Invalid type: $type")
+        }
       }
+    }
+  }
+}
 
-      val sigBase64 = sigTokens[1].trim()
-      if (sigBase64.isEmpty()) {
-        log.warn("$messagePrefix: Signature is empty")
-        return false
-      }
+private class SignatureVerifier(
+  private val header: String?,
+  private val body: String?,
+  private val domain: String?,
+  private val signer: KeyPair?
+) {
 
-      val signature = Base64.getDecoder().decode(sigBase64)
+  fun verify(): Boolean {
+    if (!validateInputs()) return false
 
-      if (body == null) {
-        log.warn("$messagePrefix: Body is null")
-        return false
-      }
+    val (timestamp, signature) = parseHeader() ?: return false
+    if (!validateTimestamp(timestamp)) return false
 
-      val payloadToVerify = "${timestampLong}.${domain}.${body}"
-      if (signer == null) {
-        log.warn("$messagePrefix: Signer is null")
-        return false
-      }
+    return verifySignature(timestamp, signature)
+  }
 
-      if (!signer.verify(payloadToVerify.toByteArray(), signature)) {
-        log.warn("$messagePrefix: Signature verification failed")
-        return false
-      }
+  private fun validateInputs(): Boolean {
+    if (header == null) {
+      log.warn("Failed to verify signature: Signature header is null")
+      return false
+    }
+    if (body == null) {
+      log.warn("Failed to verify signature: Body is null")
+      return false
+    }
+    if (signer == null) {
+      log.warn("Failed to verify signature: Signer is null")
+      return false
+    }
+    return true
+  }
+
+  private fun parseHeader(): Pair<Long, ByteArray>? {
+    val tokens = header!!.split(",")
+    if (tokens.size != 2) {
+      log.warn("Failed to verify signature: Invalid signature header")
+      return null
+    }
+
+    val timestamp = parseTimestamp(tokens[0]) ?: return null
+    val signature = parseSignature(tokens[1]) ?: return null
+
+    return Pair(timestamp, signature)
+  }
+
+  private fun parseTimestamp(token: String): Long? {
+    val timestampTokens = token.trim().split("=")
+    if (timestampTokens.size != 2 || timestampTokens[0] != "t") {
+      log.warn("Failed to verify signature: Invalid timestamp in signature header")
+      return null
+    }
+    return timestampTokens[1].trim().toLongOrNull()
+  }
+
+  private fun parseSignature(token: String): ByteArray? {
+    val sigTokens = token.trim().split("=", limit = 2)
+    if (sigTokens.size != 2 || sigTokens[0] != "s") {
+      log.warn("Failed to verify signature: Invalid signature in signature header")
+      return null
+    }
+
+    val sigBase64 = sigTokens[1].trim()
+    if (sigBase64.isEmpty()) {
+      log.warn("Failed to verify signature: Signature is empty")
+      return null
+    }
+
+    return Base64.getDecoder().decode(sigBase64)
+  }
+
+  private fun validateTimestamp(timestamp: Long): Boolean {
+    val instantTimestamp = Instant.ofEpochSecond(timestamp)
+    if (Duration.between(instantTimestamp, Instant.now()).toMinutes() > 2) {
+      log.warn("Failed to verify signature: Timestamp is older than 2 minutes")
+      return false
+    }
+    return true
+  }
 
-      return true
+  private fun verifySignature(timestamp: Long, signature: ByteArray): Boolean {
+    val payloadToVerify = "$timestamp.$domain.$body"
+    if (!signer!!.verify(payloadToVerify.toByteArray(), signature)) {
+      log.warn("Failed to verify signature: Signature verification failed")
+      return false
     }
+    return true
   }
 }
diff --git a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Route.kt b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Route.kt
deleted file mode 100644
index 0f35fc2309..0000000000
--- a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Route.kt
+++ /dev/null
@@ -1,90 +0,0 @@
-package org.stellar.reference.wallet
-
-import com.google.gson.Gson
-import com.google.gson.JsonObject
-import io.jsonwebtoken.Jwts
-import io.ktor.http.*
-import io.ktor.server.application.*
-import io.ktor.server.request.*
-import io.ktor.server.response.*
-import io.ktor.server.routing.*
-import java.time.Instant
-import kotlinx.datetime.Clock
-import org.stellar.anchor.util.GsonUtils
-import org.stellar.reference.wallet.CallbackService.Companion.verifySignature
-import org.stellar.sdk.KeyPair
-import org.stellar.walletsdk.StellarConfiguration
-import org.stellar.walletsdk.Wallet
-import org.stellar.walletsdk.auth.DefaultAuthHeaderSigner
-import org.stellar.walletsdk.auth.DomainAuthHeaderSigner
-import org.stellar.walletsdk.auth.WalletSigner
-import org.stellar.walletsdk.horizon.AccountKeyPair
-import org.stellar.walletsdk.horizon.SigningKeyPair
-import org.stellar.walletsdk.horizon.sign
-import org.stellar.walletsdk.util.toJava
-
-var signer: KeyPair? = null
-val gson: Gson = GsonUtils.getInstance()
-
-fun Route.callback(config: Config, callbackEventService: CallbackService) {
-  route("/callbacks") {
-    // The `POST /callback` endpoint of the CallbackAPI to receive an event.
-    post {
-      // Extract TS from request header and verify the ts difference is within 1-2 minutes
-      val header = call.request.headers["Signature"]
-      val body = call.receive<String>()
-      if (signer == null) {
-        signer = KeyPair.fromAccountId(fetchSigningKey(config))
-      }
-
-      if (!verifySignature(header, body, config.wallet.hostname, signer)) {
-        call.response.status(HttpStatusCode.Forbidden)
-        return@post
-      }
-
-      val event: JsonObject = gson.fromJson(body, JsonObject::class.java)
-      callbackEventService.processCallback(event)
-      call.respond("POST /callback received")
-    }
-    get { call.respond(gson.toJson(callbackEventService.getCallbacks(call.parameters["txnId"]))) }
-  }
-
-  route("/callbacks/latest") { get { call.respond("GET /callbacks/latest") } }
-}
-
-fun Route.noncustodial(config: Config) {
-  val wallet = Wallet(StellarConfiguration.Testnet)
-  val key = SigningKeyPair.fromSecret(config.secret.key)
-  val domainSigner =
-    object : DefaultAuthHeaderSigner() {
-      override suspend fun createToken(
-        claims: Map<String, String>,
-        clientDomain: String?,
-        issuer: AccountKeyPair?
-      ): String {
-        val timeExp = Instant.ofEpochSecond(Clock.System.now().plus(expiration).epochSeconds)
-        val builder = createBuilder(timeExp, claims)
-
-        builder.signWith(key.toJava().private, Jwts.SIG.EdDSA)
-
-        return builder.compact()
-      }
-    }
-
-  route("/signChallenge") {
-    post {
-      val body = call.receive<WalletSigner.DomainSigner.SigningData>()
-      val transaction = wallet.stellar().decodeTransaction(body.transaction)
-      val signed = transaction.sign(key).toEnvelopeXdrBase64()
-      call.respond(WalletSigner.DomainSigner.SigningData(signed, body.networkPassphrase))
-    }
-  }
-
-  route("/signHeader") {
-    post {
-      val body = call.receive<DomainAuthHeaderSigner.JWTSignData>()
-      val token = domainSigner.createToken(body.claims, body.clientDomain, null)
-      call.respond(DomainAuthHeaderSigner.SignedJWT(token))
-    }
-  }
-}
diff --git a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Routes.kt b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Routes.kt
new file mode 100644
index 0000000000..c49d29a8c8
--- /dev/null
+++ b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Routes.kt
@@ -0,0 +1,152 @@
+package org.stellar.reference.wallet
+
+import com.google.gson.Gson
+import com.google.gson.JsonObject
+import com.moandjiezana.toml.Toml
+import io.jsonwebtoken.Jwts
+import io.ktor.client.*
+import io.ktor.client.call.*
+import io.ktor.client.request.*
+import io.ktor.http.*
+import io.ktor.server.application.*
+import io.ktor.server.request.*
+import io.ktor.server.response.*
+import io.ktor.server.routing.*
+import io.ktor.util.pipeline.*
+import java.time.Instant
+import kotlinx.datetime.Clock
+import org.stellar.anchor.util.GsonUtils
+import org.stellar.reference.wallet.CallbackService.Companion.verifySignature
+import org.stellar.sdk.KeyPair
+import org.stellar.walletsdk.StellarConfiguration
+import org.stellar.walletsdk.Wallet
+import org.stellar.walletsdk.auth.DefaultAuthHeaderSigner
+import org.stellar.walletsdk.auth.DomainAuthHeaderSigner
+import org.stellar.walletsdk.auth.WalletSigner
+import org.stellar.walletsdk.horizon.AccountKeyPair
+import org.stellar.walletsdk.horizon.SigningKeyPair
+import org.stellar.walletsdk.horizon.sign
+import org.stellar.walletsdk.util.toJava
+
+class Routes(private val config: Config, private val callbackEventService: CallbackService) {
+  private var signer: KeyPair? = null
+  private val gson: Gson = GsonUtils.getInstance()
+  private val wallet = Wallet(StellarConfiguration.Testnet)
+  private val key = SigningKeyPair.fromSecret(config.secret.key)
+  private val domainSigner = createDomainSigner()
+
+  fun Route.setupCallbackRoutes() {
+    callback()
+  }
+
+  fun Route.setupNoncustodialRoutes() {
+    noncustodial()
+  }
+
+  private fun Route.callback() {
+    route("/callbacks/{sep}") {
+      post { handleCallbackPost() }
+      get { handleCallbackGet() }
+    }
+  }
+
+  private suspend fun PipelineContext<Unit, ApplicationCall>.handleCallbackPost() {
+    val header = call.request.headers["Signature"]
+    val body = call.receive<String>()
+
+    if (!verifyCallbackSignature(header, body)) {
+      call.response.status(HttpStatusCode.Forbidden)
+      return
+    }
+
+    val event: JsonObject = gson.fromJson(body, JsonObject::class.java)
+    callbackEventService.processCallback(event, call.parameters["sep"]!!)
+    call.respond("POST /callback received")
+  }
+
+  private suspend fun PipelineContext<Unit, ApplicationCall>.handleCallbackGet() {
+    val response =
+      when (val sep = call.parameters["sep"]) {
+        "sep12" -> {
+          val id = call.parameters["id"]
+          if (id != null) {
+            gson.toJson(callbackEventService.getCustomerCallbacks(id))
+          } else {
+            "Error: Missing 'id' parameter for SEP-12 callback"
+          }
+        }
+        else -> {
+          val txnId = call.parameters["txnId"]
+          if (sep != null && txnId != null) {
+            gson.toJson(callbackEventService.getTransactionCallbacks(sep, txnId))
+          } else {
+            "Error: Missing 'sep' or 'txnId' parameter"
+          }
+        }
+      }
+    call.respond(response)
+  }
+
+  private suspend fun verifyCallbackSignature(header: String?, body: String): Boolean {
+    if (signer == null) {
+      signer = KeyPair.fromAccountId(fetchSigningKey(config))
+    }
+    return verifySignature(header, body, config.wallet.hostname, signer)
+  }
+
+  private suspend fun fetchSigningKey(config: Config): String {
+    val endpoint = Url(config.anchor.endpoint)
+    val client = HttpClient()
+
+    val response =
+      client.get {
+        url {
+          this.protocol = endpoint.protocol
+          host = endpoint.host
+          port = endpoint.port
+          encodedPath = "/.well-known/stellar.toml"
+        }
+      }
+    return Toml().read(response.body<String>()).getString("SIGNING_KEY")
+  }
+
+  private fun Route.noncustodial() {
+    route("/signChallenge") { post { handleSignChallenge() } }
+    route("/signHeader") { post { handleSignHeader() } }
+  }
+
+  private suspend fun PipelineContext<Unit, ApplicationCall>.handleSignChallenge() {
+    val body = call.receive<WalletSigner.DomainSigner.SigningData>()
+    val transaction = wallet.stellar().decodeTransaction(body.transaction)
+    val signed = transaction.sign(key).toEnvelopeXdrBase64()
+    call.respond(WalletSigner.DomainSigner.SigningData(signed, body.networkPassphrase))
+  }
+
+  private suspend fun PipelineContext<Unit, ApplicationCall>.handleSignHeader() {
+    val body = call.receive<DomainAuthHeaderSigner.JWTSignData>()
+    val token = domainSigner.createToken(body.claims, body.clientDomain, null)
+    call.respond(DomainAuthHeaderSigner.SignedJWT(token))
+  }
+
+  private fun createDomainSigner() =
+    object : DefaultAuthHeaderSigner() {
+      override suspend fun createToken(
+        claims: Map<String, String>,
+        clientDomain: String?,
+        issuer: AccountKeyPair?
+      ): String {
+        val timeExp = Instant.ofEpochSecond(Clock.System.now().plus(expiration).epochSeconds)
+        val builder = createBuilder(timeExp, claims)
+        builder.signWith(key.toJava().private, Jwts.SIG.EdDSA)
+        return builder.compact()
+      }
+    }
+}
+
+fun Route.callback(config: Config, callbackEventService: CallbackService) {
+  Routes(config, callbackEventService).apply { setupCallbackRoutes() }
+}
+
+fun Route.noncustodial(config: Config) {
+  Routes(config, CallbackService()).apply { setupNoncustodialRoutes() }
+}
diff --git a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Util.kt b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Util.kt
deleted file mode 100644
index 28b8db4e96..0000000000
--- a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/Util.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.stellar.reference.wallet
-
-import com.moandjiezana.toml.Toml
-import io.ktor.client.*
-import io.ktor.client.call.*
-import io.ktor.client.request.*
-import io.ktor.http.*
-import kotlinx.coroutines.runBlocking
-
-fun fetchSigningKey(config: Config): String = runBlocking {
-  val endpoint = Url(config.anchor.endpoint)
-  val client = HttpClient()
-
-  val response =
-    client.get {
-      url {
-        this.protocol = endpoint.protocol
-        host = endpoint.host
-        port = endpoint.port
-        encodedPath = "/.well-known/stellar.toml"
-      }
-    }
-  return@runBlocking Toml().read(response.body<String>()).getString("SIGNING_KEY")
-}
diff --git a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/WalletServerClient.kt b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/WalletServerClient.kt
index ed9c1c6e0d..375fe53c43 100644
--- a/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/WalletServerClient.kt
+++ b/wallet-reference-server/src/main/kotlin/org/stellar/reference/wallet/WalletServerClient.kt
@@ -7,83 +7,69 @@ import io.ktor.client.request.*
 import io.ktor.http.*
 import kotlin.time.Duration.Companion.seconds
 import kotlinx.coroutines.delay
-import org.stellar.anchor.api.callback.SendEventRequest
-import org.stellar.anchor.api.callback.SendEventResponse
+import org.stellar.anchor.api.sep.sep12.Sep12GetCustomerResponse
 import org.stellar.anchor.util.GsonUtils
 
-class WalletServerClient(val endpoint: Url = Url("http://localhost:8092")) {
-  val gson = GsonUtils.getInstance()
-  val client = HttpClient()
+class WalletServerClient(private val endpoint: Url = Url("http://localhost:8092")) {
+  private val gson = GsonUtils.getInstance()
+  internal val client = HttpClient()
 
-  suspend fun sendCallback(sendEventRequest: SendEventRequest): SendEventResponse {
-    val response =
-      client.post {
+  suspend fun <T> getTransactionCallbacks(
+    sep: String,
+    txnId: String? = null,
+    responseType: Class<T>
+  ): List<T> =
+    client
+      .get {
         url {
-          this.protocol = endpoint.protocol
-          host = endpoint.host
-          port = endpoint.port
-          encodedPath = "/callback"
+          setupUrl("/callbacks/$sep")
+          txnId?.let { parameter("txnId", it) }
         }
-        contentType(ContentType.Application.Json)
-        setBody(gson.toJson(sendEventRequest))
       }
+      .body<String>()
+      .let { parseResponse(it, responseType) }
 
-    return gson.fromJson(response.body<String>(), SendEventResponse::class.java)
-  }
+  suspend fun <T> pollTransactionCallbacks(
+    sep: String,
+    txnId: String?,
+    expected: Int,
+    responseType: Class<T>
+  ): List<T> = poll(expected) { getTransactionCallbacks(sep, txnId, responseType) }
 
-  suspend fun <T> getCallbacks(txnId: String? = null, responseType: Class<T>): List<T> {
-    val response =
-      client.get {
+  suspend fun getCustomerCallbacks(id: String?): List<Sep12GetCustomerResponse> =
+    client
+      .get {
         url {
-          this.protocol = endpoint.protocol
-          host = endpoint.host
-          port = endpoint.port
-          encodedPath = "/callbacks"
-          txnId?.let { parameter("txnId", it) }
+          setupUrl("/callbacks/sep12")
+          id?.let { parameter("id", it) }
         }
       }
+      .body<String>()
+      .let { parseResponse(it, Sep12GetCustomerResponse::class.java) }
 
-    return gson.fromJson(
-      response.body<String>(),
-      TypeToken.getParameterized(List::class.java, responseType).type
-    )
-  }
+  suspend fun pollCustomerCallbacks(id: String?, expected: Int): List<Sep12GetCustomerResponse> =
+    poll(expected) { getCustomerCallbacks(id) }
 
-  suspend fun <T> pollCallbacks(txnId: String?, expected: Int, responseType: Class<T>): List<T> {
-    var retries = 5
-    var callbacks: List<T> = listOf()
-    while (retries > 0) {
-      callbacks = getCallbacks(txnId, responseType)
-      if (callbacks.size >= expected) {
-        return callbacks
-      }
-      delay(5.seconds)
-      retries--
-    }
-    return callbacks
+  suspend fun clearCallbacks() {
+    client.delete { url { setupUrl("/events") } }
   }
 
-  suspend fun <T> getLatestCallback(): T? {
-    val response =
-      client.get {
-        url {
-          this.protocol = endpoint.protocol
-          host = endpoint.host
-          port = endpoint.port
-          encodedPath = "/callbacks/latest"
-        }
-      }
-    return gson.fromJson(response.body<String>(), object : TypeToken<T>() {}.type)
+  private fun URLBuilder.setupUrl(path: String) {
+    protocol = endpoint.protocol
+    host = endpoint.host
+    port = endpoint.port
+    encodedPath = path
   }
 
-  suspend fun clearCallbacks() {
-    client.delete {
-      url {
-        this.protocol = endpoint.protocol
-        host = endpoint.host
-        port = endpoint.port
-        encodedPath = "/events"
-      }
+  private fun <T> parseResponse(response: String, responseType: Class<T>): List<T> =
+    gson.fromJson(response, TypeToken.getParameterized(List::class.java, responseType).type)
+
+  private suspend fun <T> poll(expected: Int, fetcher: suspend () -> List<T>): List<T> {
+    repeat(5) {
+      val callbacks = fetcher()
+      if (callbacks.size >= expected) return callbacks
+      delay(5.seconds)
     }
+    return fetcher()
   }
 }