diff --git a/.github/scripts/generate_ephemeral_accounts.sh b/.github/scripts/generate_ephemeral_accounts.sh
new file mode 100755
index 0000000000..41a2223038
--- /dev/null
+++ b/.github/scripts/generate_ephemeral_accounts.sh
@@ -0,0 +1,104 @@
+#!/usr/bin/env bash
+#
+# Generates ephemeral Stellar testnet accounts for CI runs.
+# Each run gets fresh accounts so tests can run in parallel.
+#
+# Requires: stellar CLI, TEST_USDC_ISSUER_SECRET env var
+# Outputs:  KEY=VALUE pairs to the file specified by $1 (default /tmp/ephemeral-accounts.env)
+
+set -euo pipefail
+
+OUTPUT_FILE="${1:-/tmp/ephemeral-accounts.env}"
+USDC_ASSET="USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
+NETWORK="testnet"
+
+if [[ -z "${TEST_USDC_ISSUER_SECRET:-}" ]]; then
+  echo "ERROR: TEST_USDC_ISSUER_SECRET is not set or empty. Add it as a GitHub Actions variable."
+  exit 1
+fi
+
+# Generate and fund accounts that need on-chain XLM
+funded_accounts=(client-wallet withdraw-fund-1 withdraw-fund-2 deposit-fund-1 deposit-fund-2 distribution)
+for name in "${funded_accounts[@]}"; do
+  echo "Generating and funding $name..."
+  stellar keys generate "$name" --network "$NETWORK" --fund --overwrite -q
+done
+
+# Generate extra signers (off-chain only, no funding needed)
+for name in extra-signer-1 extra-signer-2; do
+  echo "Generating $name (no funding)..."
+  stellar keys generate "$name" --network "$NETWORK" --overwrite -q
+done
+
+# Create USDC trustlines
+trustline_accounts=(distribution client-wallet withdraw-fund-1 deposit-fund-1)
+for name in "${trustline_accounts[@]}"; do
+  echo "Creating USDC trustline for $name..."
+  stellar tx new change-trust \
+    --source "$name" \
+    --line "$USDC_ASSET" \
+    --network "$NETWORK" -q
+done
+
+# Mint USDC from issuer to distribution (1000 USDC) and withdraw-fund-1 (10 USDC)
+# The issuer secret is passed directly since it's not a named identity
+echo "Minting 1000 USDC to distribution..."
+DIST_PUBKEY=$(stellar keys public-key distribution -q)
+stellar tx new payment \
+  --source "$TEST_USDC_ISSUER_SECRET" \
+  --destination "$DIST_PUBKEY" \
+  --asset "$USDC_ASSET" \
+  --amount 10000000000 \
+  --network "$NETWORK" -q
+
+echo "Minting 10 USDC to withdraw-fund-1..."
+WF1_PUBKEY=$(stellar keys public-key withdraw-fund-1 -q)
+stellar tx new payment \
+  --source "$TEST_USDC_ISSUER_SECRET" \
+  --destination "$WF1_PUBKEY" \
+  --asset "$USDC_ASSET" \
+  --amount 100000000 \
+  --network "$NETWORK" -q
+
+echo "Minting 100 USDC to client-wallet..."
+CW_PUBKEY=$(stellar keys public-key client-wallet -q)
+stellar tx new payment \
+  --source "$TEST_USDC_ISSUER_SECRET" \
+  --destination "$CW_PUBKEY" \
+  --asset "$USDC_ASSET" \
+  --amount 1000000000 \
+  --network "$NETWORK" -q
+
+# Add extra signers to client-wallet for multi-sig tests
+echo "Adding extra-signer-1 to client-wallet..."
+stellar tx new set-options \
+  --source "client-wallet" \
+  --signer "$(stellar keys public-key extra-signer-1 -q)" \
+  --signer-weight 1 \
+  --network "$NETWORK" -q
+
+echo "Adding extra-signer-2 to client-wallet..."
+stellar tx new set-options \
+  --source "client-wallet" \
+  --signer "$(stellar keys public-key extra-signer-2 -q)" \
+  --signer-weight 1 \
+  --network "$NETWORK" -q
+
+# Write env file
+CLIENT_WALLET_PUBKEY=$(stellar keys public-key client-wallet -q)
+DISTRIBUTION_ACCOUNT_PUBKEY="$DIST_PUBKEY"
+
+cat > "$OUTPUT_FILE" <<EOF
+TEST_CLIENT_WALLET_SECRET=$(stellar keys secret client-wallet -q)
+TEST_CLIENT_WALLET_EXTRA_SIGNER_1_SECRET=$(stellar keys secret extra-signer-1 -q)
+TEST_CLIENT_WALLET_EXTRA_SIGNER_2_SECRET=$(stellar keys secret extra-signer-2 -q)
+TEST_WITHDRAW_FUND_CLIENT_SECRET_1=$(stellar keys secret withdraw-fund-1 -q)
+TEST_WITHDRAW_FUND_CLIENT_SECRET_2=$(stellar keys secret withdraw-fund-2 -q)
+TEST_DEPOSIT_FUND_CLIENT_SECRET_1=$(stellar keys secret deposit-fund-1 -q)
+TEST_DEPOSIT_FUND_CLIENT_SECRET_2=$(stellar keys secret deposit-fund-2 -q)
+APP__PAYMENT_SIGNING_SEED=$(stellar keys secret distribution -q)
+CLIENT_WALLET_PUBKEY=$CLIENT_WALLET_PUBKEY
+DISTRIBUTION_ACCOUNT_PUBKEY=$DISTRIBUTION_ACCOUNT_PUBKEY
+EOF
+
+echo "Ephemeral accounts written to $OUTPUT_FILE"
diff --git a/.github/workflows/on_pull_request.yml b/.github/workflows/on_pull_request.yml
index af490ab503..66483e26ab 100644
--- a/.github/workflows/on_pull_request.yml
+++ b/.github/workflows/on_pull_request.yml
@@ -13,16 +13,10 @@ jobs:
   essential_tests:
     needs: [ gradle_build ]
     uses: ./.github/workflows/sub_essential_tests.yml
-    concurrency:
-      group: ap-test-job
-      cancel-in-progress: false
 
   extended_tests:
     needs: [ gradle_build, essential_tests ]
     uses: ./.github/workflows/sub_extended_tests.yml
-    concurrency:
-      group: ap-test-job
-      cancel-in-progress: false
 
   complete:
     if: always()
diff --git a/.github/workflows/sub_essential_tests.yml b/.github/workflows/sub_essential_tests.yml
index d247a3b395..2929475422 100644
--- a/.github/workflows/sub_essential_tests.yml
+++ b/.github/workflows/sub_essential_tests.yml
@@ -4,29 +4,17 @@ on:
   workflow_dispatch:
   workflow_call:
 
-concurrency:
-  group: ap-test-job
-  cancel-in-progress: false
-
 jobs:
   essential_tests:
     name: Run Essential Tests (Integration Tests, Faster End-2-End Tests, Unit Tests, and Stellar Validation Tools)
     runs-on: ubuntu-latest
     env:
-      # Anchor Platform secrets
+      # Anchor Platform secrets (off-chain only — kept fixed)
       SECRET_SEP10_SIGNING_SEED: ${{ vars.SECRET_SEP10_SIGNING_SEED }}
-      APP__PAYMENT_SIGNING_SEED: ${{ vars.APP__PAYMENT_SIGNING_SEED }}
       SECRET__KEY: ${{ vars.SECRET__KEY }}
 
-      # Test secrets
-      TEST_CLIENT_WALLET_SECRET: ${{ vars.TEST_CLIENT_WALLET_SECRET }}
+      # Smart wallet contract (pre-deployed — kept fixed)
       TEST_CLIENT_SMART_WALLET_ACCOUNT: ${{ vars.TEST_CLIENT_SMART_WALLET_ACCOUNT }}
-      TEST_CLIENT_WALLET_EXTRA_SIGNER_1_SECRET: ${{ vars.TEST_CLIENT_WALLET_EXTRA_SIGNER_1_SECRET }}
-      TEST_CLIENT_WALLET_EXTRA_SIGNER_2_SECRET: ${{ vars.TEST_CLIENT_WALLET_EXTRA_SIGNER_2_SECRET }}
-      TEST_WITHDRAW_FUND_CLIENT_SECRET_1: ${{ vars.TEST_WITHDRAW_FUND_CLIENT_SECRET_1 }}
-      TEST_WITHDRAW_FUND_CLIENT_SECRET_2: ${{ vars.TEST_WITHDRAW_FUND_CLIENT_SECRET_2 }}
-      TEST_DEPOSIT_FUND_CLIENT_SECRET_1: ${{ vars.TEST_DEPOSIT_FUND_CLIENT_SECRET_1 }}
-      TEST_DEPOSIT_FUND_CLIENT_SECRET_2: ${{ vars.TEST_DEPOSIT_FUND_CLIENT_SECRET_2 }}
     steps:
       #############################################
       # Setup JDK 17
@@ -66,6 +54,29 @@ jobs:
       #############################################
 
 
+      - name: Install Stellar CLI
+        run: |
+          curl -fsSL https://github.com/stellar/stellar-cli/raw/main/install.sh | sh
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Generate ephemeral test accounts
+        env:
+          TEST_USDC_ISSUER_SECRET: ${{ vars.TEST_USDC_ISSUER_SECRET }}
+        run: |
+          bash /home/runner/anchor-platform/.github/scripts/generate_ephemeral_accounts.sh
+          cat /tmp/ephemeral-accounts.env >> $GITHUB_ENV
+
+      - name: Patch config files with ephemeral accounts
+        run: |
+          CONFIG_DIR=/home/runner/anchor-platform/service-runner/src/main/resources/config
+          sed -i "s/GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF/$DISTRIBUTION_ACCOUNT_PUBKEY/g" \
+            $CONFIG_DIR/assets.yaml $CONFIG_DIR/reference-config.yaml \
+            $CONFIG_DIR/stellar.host.docker.internal.toml $CONFIG_DIR/stellar.localhost.toml
+          sed -i "s/GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG/$CLIENT_WALLET_PUBKEY/g" \
+            $CONFIG_DIR/clients.yaml
+          sed -i "s/GCSGSR6KQQ5BP2FXVPWRL6SWPUSFWLVONLIBJZUKTVQB5FYJFVL6XOXE/$DISTRIBUTION_ACCOUNT_PUBKEY/g" \
+            $CONFIG_DIR/stellar.host.docker.internal.toml $CONFIG_DIR/stellar.localhost.toml
+
       - name: Pull Stellar Validation Tests Docker Image
         run: docker pull stellar/anchor-tests:latest &
 
diff --git a/.github/workflows/sub_extended_tests.yml b/.github/workflows/sub_extended_tests.yml
index 1d782f7038..8fdc279124 100644
--- a/.github/workflows/sub_extended_tests.yml
+++ b/.github/workflows/sub_extended_tests.yml
@@ -4,29 +4,17 @@ on:
   workflow_dispatch:
   workflow_call:
 
-concurrency:
-  group: ap-test-job
-  cancel-in-progress: false
-
 jobs:
   extended_tests:
     name: Run Extended Tests
     runs-on: ubuntu-latest
     env:
-      # Anchor Platform secrets
+      # Anchor Platform secrets (off-chain only — kept fixed)
       SECRET_SEP10_SIGNING_SEED: ${{ vars.SECRET_SEP10_SIGNING_SEED }}
-      APP__PAYMENT_SIGNING_SEED: ${{ vars.APP__PAYMENT_SIGNING_SEED }}
       SECRET__KEY: ${{ vars.SECRET__KEY }}
 
-      # Test secrets
-      TEST_CLIENT_WALLET_SECRET: ${{ vars.TEST_CLIENT_WALLET_SECRET }}
+      # Smart wallet contract (pre-deployed — kept fixed)
       TEST_CLIENT_SMART_WALLET_ACCOUNT: ${{ vars.TEST_CLIENT_SMART_WALLET_ACCOUNT }}
-      TEST_CLIENT_WALLET_EXTRA_SIGNER_1_SECRET: ${{ vars.TEST_CLIENT_WALLET_EXTRA_SIGNER_1_SECRET }}
-      TEST_CLIENT_WALLET_EXTRA_SIGNER_2_SECRET: ${{ vars.TEST_CLIENT_WALLET_EXTRA_SIGNER_2_SECRET }}
-      TEST_WITHDRAW_FUND_CLIENT_SECRET_1: ${{ vars.TEST_WITHDRAW_FUND_CLIENT_SECRET_1 }}
-      TEST_WITHDRAW_FUND_CLIENT_SECRET_2: ${{ vars.TEST_WITHDRAW_FUND_CLIENT_SECRET_2 }}
-      TEST_DEPOSIT_FUND_CLIENT_SECRET_1: ${{ vars.TEST_DEPOSIT_FUND_CLIENT_SECRET_1 }}
-      TEST_DEPOSIT_FUND_CLIENT_SECRET_2: ${{ vars.TEST_DEPOSIT_FUND_CLIENT_SECRET_2 }}
     steps:
       #############################################
       # Setup JDK 17
@@ -65,6 +53,29 @@ jobs:
 
       #############################################
 
+      - name: Install Stellar CLI
+        run: |
+          curl -fsSL https://github.com/stellar/stellar-cli/raw/main/install.sh | sh
+          echo "$HOME/.local/bin" >> $GITHUB_PATH
+
+      - name: Generate ephemeral test accounts
+        env:
+          TEST_USDC_ISSUER_SECRET: ${{ vars.TEST_USDC_ISSUER_SECRET }}
+        run: |
+          bash /home/runner/anchor-platform/.github/scripts/generate_ephemeral_accounts.sh
+          cat /tmp/ephemeral-accounts.env >> $GITHUB_ENV
+
+      - name: Patch config files with ephemeral accounts
+        run: |
+          CONFIG_DIR=/home/runner/anchor-platform/service-runner/src/main/resources/config
+          sed -i "s/GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF/$DISTRIBUTION_ACCOUNT_PUBKEY/g" \
+            $CONFIG_DIR/assets.yaml $CONFIG_DIR/reference-config.yaml \
+            $CONFIG_DIR/stellar.host.docker.internal.toml $CONFIG_DIR/stellar.localhost.toml
+          sed -i "s/GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG/$CLIENT_WALLET_PUBKEY/g" \
+            $CONFIG_DIR/clients.yaml
+          sed -i "s/GCSGSR6KQQ5BP2FXVPWRL6SWPUSFWLVONLIBJZUKTVQB5FYJFVL6XOXE/$DISTRIBUTION_ACCOUNT_PUBKEY/g" \
+            $CONFIG_DIR/stellar.host.docker.internal.toml $CONFIG_DIR/stellar.localhost.toml
+
       - name: Run Kafka, Postgres, and Sep24 UI with docker compose
         run: docker compose -f /home/runner/anchor-platform/service-runner/src/main/resources/docker-compose-test.yaml up -d --build
 
diff --git a/essential-tests/build.gradle.kts b/essential-tests/build.gradle.kts
index 1247267e9c..43064540d4 100644
--- a/essential-tests/build.gradle.kts
+++ b/essential-tests/build.gradle.kts
@@ -42,4 +42,4 @@ tasks.test {
   exclude("**/org/stellar/anchor/platform/*Test.class")
   exclude("**/org/stellar/anchor/platform/integrationtest/**")
   exclude("**/org/stellar/anchor/platform/e2etest/**")
-}
+}
\ No newline at end of file
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/LedgerClientTests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/LedgerClientTests.kt
index 5c65f34824..56d67c0dfb 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/LedgerClientTests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/LedgerClientTests.kt
@@ -10,8 +10,6 @@ import org.junit.jupiter.api.parallel.Execution
 import org.junit.jupiter.api.parallel.ExecutionMode
 import org.junit.jupiter.params.ParameterizedTest
 import org.junit.jupiter.params.provider.MethodSource
-import org.skyscreamer.jsonassert.JSONAssert
-import org.skyscreamer.jsonassert.JSONCompareMode
 import org.stellar.anchor.config.StellarNetworkConfig
 import org.stellar.anchor.config.StellarNetworkConfig.ProviderType.HORIZON
 import org.stellar.anchor.ledger.Horizon
@@ -33,7 +31,7 @@ import org.stellar.sdk.xdr.TransactionEnvelope
 @Execution(ExecutionMode.SAME_THREAD)
 class LedgerClientTests : IntegrationTestBase(TestConfig()) {
   private val stellarNetworkConfig = mockk<StellarNetworkConfig>()
-  private val trustlineTestAccount = "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+  private val trustlineTestAccount = walletKeyPair.address
   val gson = GsonUtils.getInstance()!!
   private lateinit var sourceKeypair: KeyPair
   private lateinit var destKeyPair: KeyPair
@@ -47,7 +45,7 @@ class LedgerClientTests : IntegrationTestBase(TestConfig()) {
     every { stellarNetworkConfig.stellarNetworkPassphrase } returns TESTNET.networkPassphrase
 
     sourceKeypair = KeyPair.random()
-    destKeyPair = KeyPair.fromAccountId("GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG")
+    destKeyPair = KeyPair.fromAccountId(walletKeyPair.address)
     prepareAccount(Server(stellarNetworkConfig.horizonUrl), sourceKeypair)
   }
 
@@ -55,7 +53,9 @@ class LedgerClientTests : IntegrationTestBase(TestConfig()) {
   @MethodSource("getLedgerClient")
   fun `test getAccount()`(ledgerClient: LedgerClient) {
     val account = ledgerClient.getAccount(trustlineTestAccount)
-    JSONAssert.assertEquals(expectedAccount, gson.toJson(account), JSONCompareMode.LENIENT)
+    assertEquals(trustlineTestAccount, account.accountId)
+    assertNotNull(account.signers)
+    assertTrue(account.signers.isNotEmpty())
   }
 
   @ParameterizedTest
@@ -147,33 +147,3 @@ class LedgerClientTests : IntegrationTestBase(TestConfig()) {
     }
   }
 }
-
-private val expectedAccount =
-  """
-{
-  "accountId": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-  "thresholds": {
-    "low": 0,
-    "medium": 0,
-    "high": 0
-  },
-  "signers": [
-    {
-      "key": "GATEYCIMJZ2F6Y437QSYH4XFQ6HLD5YP4MBJZFFPZVEQDJOY4QTCB7BB",
-      "type": "SIGNER_KEY_TYPE_ED25519",
-      "weight": 1
-    },
-    {
-      "key": "GC6X2ANA2OS3O2ESHUV6X44NH6J46EP2EO2JB7563Y7DYOIXFKHMHJ5O",
-      "type": "SIGNER_KEY_TYPE_ED25519",
-      "weight": 1
-    },
-    {
-      "key": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
-      "type": "SIGNER_KEY_TYPE_ED25519",
-      "weight": 1
-    }
-  ]
-}  
-"""
-    .trimIndent()
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/PlatformAPITestBase.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/PlatformAPITestBase.kt
index 0b59c5910c..4815bb559c 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/PlatformAPITestBase.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/PlatformAPITestBase.kt
@@ -37,7 +37,7 @@ open class PlatformAPITestBase(config: TestConfig) : IntegrationTestBase(config)
     const val TEST_PAYMENT_MEMO = "22bf7341574e4b1082516a2e84a8"
     const val TEST_PAYMENT_DEST_ACCOUNT = "GBDYDBJKQBJK4GY4V7FAONSFF2IBJSKNTBYJ65F5KCGBY2BIGPGGLJOH"
     const val TEST_PAYMENT_ASSET_CIRCLE_USDC =
-      "USDC:GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5"
+      "USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
 
     // custody deposit address
     const val CUSTODY_DEST_ACCOUNT = "GC6X2ANA2OS3O2ESHUV6X44NH6J46EP2EO2JB7563Y7DYOIXFKHMHJ5O"
@@ -51,6 +51,12 @@ open class PlatformAPITestBase(config: TestConfig) : IntegrationTestBase(config)
       result = result.replace(search, replace)
     }
 
+    // Inject the client wallet account and distribution account
+    result = result.replace("%CLIENT_WALLET_ACCOUNT%", walletKeyPair.address)
+    val distributionAccount =
+      KeyPair.fromSecretSeed(config.get("app..payment.signing.seed")).accountId
+    result = result.replace("%DISTRIBUTION_ACCOUNT%", distributionAccount)
+
     for ((search, replace) in getTestPaymentValues()) {
       result = result.replace(search, replace)
     }
@@ -141,7 +147,7 @@ open class PlatformAPITestBase(config: TestConfig) : IntegrationTestBase(config)
 
     // send test payment of 1 USDC from distribution account to the test receiver account
     val usdcAsset =
-      Asset.create(null, "USDC", "GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5")
+      Asset.create(null, "USDC", "GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP")
         as AssetTypeCreditAlphaNum
     val sourceKey = KeyPair.fromSecretSeed(config.get("app..payment.signing.seed"))
     info(
@@ -220,7 +226,7 @@ open class PlatformAPITestBase(config: TestConfig) : IntegrationTestBase(config)
   private fun sendTestPaymentToHorizon(server: Server) {
     // send test payment of 1 USDC from distribution account to the test receiver account
     val usdcAsset =
-      Asset.create(null, "USDC", "GBBD47IF6LWK7P7MDEVSCWR7DPUWV3NY3DTQEVFL4NAT4AQH3ZLLFLA5")
+      Asset.create(null, "USDC", "GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP")
         as AssetTypeCreditAlphaNum
     val sourceKey = KeyPair.fromSecretSeed(config.get("app..payment.signing.seed"))
 
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/PlatformApiTests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/PlatformApiTests.kt
index 7fab6351ae..dbca9762be 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/PlatformApiTests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/PlatformApiTests.kt
@@ -297,19 +297,19 @@ private const val EXPECTED_RPC_RESPONSE =
               "started_at": "2024-06-25T20:36:17.651248Z",
               "updated_at": "2024-06-25T20:36:18.683321Z",
               "message": "test message",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial",
               "request_client_ip_address": "127.0.0.1",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               },
               "creator": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               }
             },
             "id": 1
@@ -340,19 +340,19 @@ private const val EXPECTED_RPC_BATCH_RESPONSE =
               "started_at": "2024-06-25T20:37:50.883071Z",
               "updated_at": "2024-06-25T20:37:51.908872Z",
               "message": "test message",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial",
               "request_client_ip_address": "127.0.0.1",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               },
               "creator": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               }
             },
             "id": 1
@@ -377,20 +377,20 @@ private const val EXPECTED_RPC_BATCH_RESPONSE =
               "started_at": "2024-06-25T20:37:50.883071Z",
               "updated_at": "2024-06-25T20:37:52.922103Z",
               "message": "test message",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "1",
               "client_name": "referenceCustodial",
               "request_client_ip_address": "127.0.0.1",              
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               },
               "creator": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               }
             },
             "id": 2
@@ -411,19 +411,19 @@ private const val EXPECTED_GET_TRANSACTION_BY_RPC_RESPONSE =
             },
             "started_at": "2024-08-07T20:36:18.344467Z",
             "destination_account":
-"GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+"%CLIENT_WALLET_ACCOUNT%",
             "client_name": "referenceCustodial",
             "request_client_ip_address": "127.0.0.1",
             "customers": {
               "sender": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               },
               "receiver": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               }
             },
             "creator": {
-              "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+              "account": "%CLIENT_WALLET_ACCOUNT%"
             }
           }
           """
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep24PlatformApiTests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep24PlatformApiTests.kt
index 370f723163..2352159414 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep24PlatformApiTests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep24PlatformApiTests.kt
@@ -237,7 +237,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
               "started_at": "2024-06-25T20:18:34.205694Z",
               "updated_at": "2024-06-25T20:18:35.274007Z",
               "message": "test message 1",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial"
             },
             "id": "1"
@@ -262,7 +262,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
               "started_at": "2024-06-25T20:18:34.205694Z",
               "updated_at": "2024-06-25T20:18:36.290857Z",
               "message": "test message 2",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -306,7 +306,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
                   ]
                 }
               ],
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -444,7 +444,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_FULL_WITH_TRUST_FLOW_ACTION_RESPONSES
               "started_at": "2024-06-25T20:19:48.818752Z",
               "updated_at": "2024-06-25T20:19:49.849169Z",
               "message": "test message 1",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial"
             },
             "id": "1"
@@ -469,7 +469,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_FULL_WITH_TRUST_FLOW_ACTION_RESPONSES
               "started_at": "2024-06-25T20:19:48.818752Z",
               "updated_at": "2024-06-25T20:19:50.877987Z",
               "message": "test message 2",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial"
             },
             "id": "2"
@@ -494,7 +494,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_FULL_WITH_TRUST_FLOW_ACTION_RESPONSES
               "started_at": "2024-06-25T20:19:48.818752Z",
               "updated_at": "2024-06-25T20:19:51.894806Z",
               "message": "test message 3",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -520,7 +520,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_FULL_WITH_TRUST_FLOW_ACTION_RESPONSES
               "started_at": "2024-06-25T20:19:48.818752Z",
               "updated_at": "2024-06-25T20:19:52.914135Z",
               "message": "test message 4",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -546,7 +546,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_FULL_WITH_TRUST_FLOW_ACTION_RESPONSES
               "started_at": "2024-06-25T20:19:48.818752Z",
               "updated_at": "2024-06-25T20:19:53.940893Z",
               "message": "test message 5",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -590,7 +590,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_FULL_WITH_TRUST_FLOW_ACTION_RESPONSES
                   ]
                 }
               ],
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -704,7 +704,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONS
               "started_at": "2024-06-25T20:21:24.266127Z",
               "updated_at": "2024-06-25T20:21:25.299818Z",
               "message": "test message 1",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial"
             },
             "id": "1"
@@ -729,7 +729,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONS
               "started_at": "2024-06-25T20:21:24.266127Z",
               "updated_at": "2024-06-25T20:21:26.312882Z",
               "message": "test message 2",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -755,7 +755,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONS
               "started_at": "2024-06-25T20:21:24.266127Z",
               "updated_at": "2024-06-25T20:21:27.330339Z",
               "message": "test message 3",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -781,7 +781,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONS
               "started_at": "2024-06-25T20:21:24.266127Z",
               "updated_at": "2024-06-25T20:21:28.350485Z",
               "message": "test message 4",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -825,7 +825,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONS
                   ]
                 }
               ],
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -961,7 +961,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_SHORT_PARTIAL_REFUND_FLOW_ACTION_RESPO
               "started_at": "2024-06-25T20:24:52.680611Z",
               "updated_at": "2024-06-25T20:24:53.700986Z",
               "message": "test message 1",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial"
             },
             "id": "1"
@@ -986,7 +986,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_SHORT_PARTIAL_REFUND_FLOW_ACTION_RESPO
               "started_at": "2024-06-25T20:24:52.680611Z",
               "updated_at": "2024-06-25T20:24:54.714524Z",
               "message": "test message 2",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -1024,7 +1024,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_SHORT_PARTIAL_REFUND_FLOW_ACTION_RESPO
                   }
                 ]
               },
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -1062,7 +1062,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_SHORT_PARTIAL_REFUND_FLOW_ACTION_RESPO
                   }
                 ]
               },
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -1118,7 +1118,7 @@ private const val SEP_24_DEPOSIT_COMPLETE_SHORT_PARTIAL_REFUND_FLOW_ACTION_RESPO
                   ]
                 }
               ],
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial"
             },
@@ -1204,7 +1204,7 @@ private const val SEP_24_WITHDRAW_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
               "updated_at": "2024-06-25T20:26:20.153836Z",
               "message": "test message 1",
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "memo": "ZjdiMzQ0YmUtZjNlZC00NWYwLThlNWItYWQ0NjAzMzY=",
               "memo_type": "id",
               "client_name": "referenceCustodial"
@@ -1254,7 +1254,7 @@ private const val SEP_24_WITHDRAW_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
                 }
               ],
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "memo": "ZjdiMzQ0YmUtZjNlZC00NWYwLThlNWItYWQ0NjAzMzY=",
               "memo_type": "id",
               "client_name": "referenceCustodial"
@@ -1305,7 +1305,7 @@ private const val SEP_24_WITHDRAW_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
                 }
               ],
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "memo": "ZjdiMzQ0YmUtZjNlZC00NWYwLThlNWItYWQ0NjAzMzY=",
               "memo_type": "id",
@@ -1403,7 +1403,7 @@ private const val SEP_24_WITHDRAW_COMPLETE_FULL_VIA_PENDING_EXTERNAL_FLOW_ACTION
               "updated_at": "2024-06-25T20:27:30.616647Z",
               "message": "test message 1",
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "memo": "NGQwMDk3NTgtODg3My00OGE1LWE4M2UtYTllOGU0OGM=",
               "memo_type": "id",
               "client_name": "referenceCustodial"
@@ -1453,7 +1453,7 @@ private const val SEP_24_WITHDRAW_COMPLETE_FULL_VIA_PENDING_EXTERNAL_FLOW_ACTION
                 }
               ],
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "memo": "NGQwMDk3NTgtODg3My00OGE1LWE4M2UtYTllOGU0OGM=",
               "memo_type": "id",
               "client_name": "referenceCustodial"
@@ -1503,7 +1503,7 @@ private const val SEP_24_WITHDRAW_COMPLETE_FULL_VIA_PENDING_EXTERNAL_FLOW_ACTION
                 }
               ],
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "memo": "NGQwMDk3NTgtODg3My00OGE1LWE4M2UtYTllOGU0OGM=",
               "memo_type": "id",
@@ -1555,7 +1555,7 @@ private const val SEP_24_WITHDRAW_COMPLETE_FULL_VIA_PENDING_EXTERNAL_FLOW_ACTION
                 }
               ],
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "memo": "NGQwMDk3NTgtODg3My00OGE1LWE4M2UtYTllOGU0OGM=",
               "memo_type": "id",
@@ -1593,7 +1593,7 @@ private const val SEP_24_WITHDRAW_COMPLETE_FULL_VIA_PENDING_USER_FLOW_ACTION_RES
               "updated_at": "2024-06-25T20:28:42.430584Z",
               "message": "test message 1",
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "memo": "ZWZhNWI5YWUtNWJiNS00ZmQyLThiZjQtOWY5M2NmNmY=",
               "memo_type": "id",
               "client_name": "referenceCustodial"
@@ -1643,7 +1643,7 @@ private const val SEP_24_WITHDRAW_COMPLETE_FULL_VIA_PENDING_USER_FLOW_ACTION_RES
                 }
               ],
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "memo": "ZWZhNWI5YWUtNWJiNS00ZmQyLThiZjQtOWY5M2NmNmY=",
               "memo_type": "id",
               "client_name": "referenceCustodial"
@@ -1693,7 +1693,7 @@ private const val SEP_24_WITHDRAW_COMPLETE_FULL_VIA_PENDING_USER_FLOW_ACTION_RES
                 }
               ],
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "memo": "ZWZhNWI5YWUtNWJiNS00ZmQyLThiZjQtOWY5M2NmNmY=",
               "memo_type": "id",
@@ -1745,7 +1745,7 @@ private const val SEP_24_WITHDRAW_COMPLETE_FULL_VIA_PENDING_USER_FLOW_ACTION_RES
                 }
               ],
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "memo": "ZWZhNWI5YWUtNWJiNS00ZmQyLThiZjQtOWY5M2NmNmY=",
               "memo_type": "id",
@@ -1903,7 +1903,7 @@ private const val SEP_24_WITHDRAW_FULL_REFUND_FLOW_ACTION_RESPONSES =
               "updated_at": "2024-06-25T20:29:53.671452Z",
               "message": "test message 1",
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "memo": "NmUyZTcyYjktNzIyMC00OGRiLTkwZDItNDkyOWU1OWU=",
               "memo_type": "id",
               "client_name": "referenceCustodial"
@@ -1953,7 +1953,7 @@ private const val SEP_24_WITHDRAW_FULL_REFUND_FLOW_ACTION_RESPONSES =
                 }
               ],
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "memo": "NmUyZTcyYjktNzIyMC00OGRiLTkwZDItNDkyOWU1OWU=",
               "memo_type": "id",
               "client_name": "referenceCustodial"
@@ -2028,7 +2028,7 @@ private const val SEP_24_WITHDRAW_FULL_REFUND_FLOW_ACTION_RESPONSES =
                 }
               ],
               "source_account": "GAIUIZPHLIHQEMNJGSZKCEUWHAZVGUZDBDMO2JXNAJZZZVNSVHQCEWJ4",
-              "destination_account": "GBN4NNCDGJO4XW4KQU3CBIESUJWFVBUZPOKUZHT7W7WRB7CWOA7BXVQF",
+              "destination_account": "%DISTRIBUTION_ACCOUNT%",
               "memo": "NmUyZTcyYjktNzIyMC00OGRiLTkwZDItNDkyOWU1OWU=",
               "memo_type": "id",
               "client_name": "referenceCustodial"
@@ -2594,7 +2594,7 @@ private const val VALIDATIONS_AND_ERRORS_RESPONSES =
         "asset": "iso4217:USD"
       },
       "message": "test message 10",
-      "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+      "destination_account": "%CLIENT_WALLET_ACCOUNT%",
       "client_name": "referenceCustodial"
     },
     "id": "10"
@@ -2632,7 +2632,7 @@ private const val VALIDATIONS_AND_ERRORS_RESPONSES =
         "asset": "iso4217:USD"
       },
       "message": "test message 12",
-      "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+      "destination_account": "%CLIENT_WALLET_ACCOUNT%"
     },
     "id": "12"
   },
@@ -2678,7 +2678,7 @@ private const val VALIDATIONS_AND_ERRORS_RESPONSES =
         "asset": "iso4217:USD"
       },
       "message": "test message 15",
-      "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+      "destination_account": "%CLIENT_WALLET_ACCOUNT%",
       "external_transaction_id": "ext-123456"
     },
     "id": "15"
@@ -2743,13 +2743,13 @@ private const val VALIDATIONS_AND_ERRORS_RESPONSES =
                 "asset": "%TESTPAYMENT_ASSET_CIRCLE_USDC%"
               },
               "payment_type": "payment",
-              "source_account": "GABCKCYPAGDDQMSCTMSBO7C2L34NU3XXCW7LR4VVSWCCXMAJY3B4YCZP",
-              "destination_account": "GBDYDBJKQBJK4GY4V7FAONSFF2IBJSKNTBYJ65F5KCGBY2BIGPGGLJOH"
+              "source_account": "%TESTPAYMENT_SRC_ACCOUNT%",
+              "destination_account": "%TESTPAYMENT_DEST_ACCOUNT%"
             }
           ]
         }
       ],
-      "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+      "destination_account": "%CLIENT_WALLET_ACCOUNT%",
       "external_transaction_id": "ext-123456"
     },
     "id": "19"
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep24Tests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep24Tests.kt
index 9e544272cd..0b11392361 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep24Tests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep24Tests.kt
@@ -112,6 +112,7 @@ class Sep24Tests : IntegrationTestBase(TestConfig()) {
   fun `test Sep24 deposit`() = runBlocking {
     printRequest("POST /transactions/withdraw/interactive")
     val depositRequest = GsonUtils.fromJsonToMap(depositRequestJson)
+    depositRequest["account"] = walletKeyPair.address
     val response =
       anchor
         .sep24()
@@ -128,7 +129,7 @@ class Sep24Tests : IntegrationTestBase(TestConfig()) {
     assertNotNull(savedDepositTxn.moreInfoUrl)
     assertEquals("INCOMPLETE", savedDepositTxn.status.name)
     assertEquals(
-      "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+      walletKeyPair.address,
       savedDepositTxn.to?.address,
     )
     // check the returning Sep24InteractiveUrlJwt
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep31PlatformApiTests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep31PlatformApiTests.kt
index 3fb484491b..cf101c2559 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep31PlatformApiTests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep31PlatformApiTests.kt
@@ -179,7 +179,7 @@ private const val SEP_31_RECEIVE_REFUNDED_SHORT_FLOW_ACTION_RESPONSES =
                 "receiver": { "id": "%RECEIVER_ID%" }
               },
               "creator": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               }
             },
             "id": "2"
@@ -254,7 +254,7 @@ private const val SEP_31_RECEIVE_REFUNDED_SHORT_FLOW_ACTION_RESPONSES =
                 "receiver": { "id": "%RECEIVER_ID%" }
               },
               "creator": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               }
             },
             "id": "3"
@@ -376,7 +376,7 @@ private const val SEP_31_RECEIVE_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONS
                 "receiver": { "id": "%RECEIVER_ID%" }
               },
               "creator": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               }
             },
             "id": "1"
@@ -429,7 +429,7 @@ private const val SEP_31_RECEIVE_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONS
                 "receiver": { "id": "%RECEIVER_ID%" }
               },
               "creator": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               }
             },
             "id": "2"
@@ -482,7 +482,7 @@ private const val SEP_31_RECEIVE_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONS
                 "receiver": { "id": "%RECEIVER_ID%" }
               },
               "creator": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               }
             },
             "id": "3"
@@ -535,7 +535,7 @@ private const val SEP_31_RECEIVE_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONS
                 "receiver": { "id": "%RECEIVER_ID%" }
               },
               "creator": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               }
             },
             "id": "4"
@@ -589,7 +589,7 @@ private const val SEP_31_RECEIVE_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONS
                 "receiver": { "id": "%RECEIVER_ID%" }
               },
               "creator": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               }
             },
             "id": "5"
@@ -644,7 +644,7 @@ private const val SEP_31_RECEIVE_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONS
                 "receiver": { "id": "%RECEIVER_ID%" }
               },
               "creator": {
-                "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                "account": "%CLIENT_WALLET_ACCOUNT%"
               }
             },
             "id": "6"
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep31Tests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep31Tests.kt
index 88f199c415..0420a68bce 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep31Tests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep31Tests.kt
@@ -250,12 +250,20 @@ class Sep31Tests : IntegrationTestBase(TestConfig()) {
     // check if the patched transactions are as expected
     var afterPatch = platformApiClient.getTransaction(savedTxn.transaction.id)
     assertEquals(afterPatch.id, savedTxn.transaction.id)
-    JSONAssert.assertEquals(expectedAfterPatch, json(afterPatch), LENIENT)
+    JSONAssert.assertEquals(
+      expectedAfterPatch.replace("%CLIENT_WALLET_ACCOUNT%", walletKeyPair.address),
+      json(afterPatch),
+      LENIENT
+    )
 
     // Test patch idempotency
     afterPatch = platformApiClient.getTransaction(savedTxn.transaction.id)
     assertEquals(afterPatch.id, savedTxn.transaction.id)
-    JSONAssert.assertEquals(expectedAfterPatch, json(afterPatch), LENIENT)
+    JSONAssert.assertEquals(
+      expectedAfterPatch.replace("%CLIENT_WALLET_ACCOUNT%", walletKeyPair.address),
+      json(afterPatch),
+      LENIENT
+    )
   }
 }
 
@@ -432,7 +440,7 @@ private const val expectedAfterPatch =
     }
   },
   "creator": {
-    "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+    "account": "%CLIENT_WALLET_ACCOUNT%"
   }
 }
 """
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep6PlatformApiTests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep6PlatformApiTests.kt
index afde52c242..d0c84d9e6d 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep6PlatformApiTests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep6PlatformApiTests.kt
@@ -208,7 +208,7 @@ class Sep6PlatformApiTests : PlatformApiTests() {
   }
 
   private fun `test sep6 deposit flow`(actionRequests: String, actionResponse: String) {
-    val depositRequest = gson.fromJson(SEP_6_DEPOSIT_FLOW_REQUEST, HashMap::class.java)
+    val depositRequest = gson.fromJson(inject(SEP_6_DEPOSIT_FLOW_REQUEST), HashMap::class.java)
 
     val customer =
       sep12Client.putCustomer(
@@ -222,7 +222,8 @@ class Sep6PlatformApiTests : PlatformApiTests() {
   }
 
   private fun `test sep6 deposit-exchange flow`(actionRequests: String, actionResponse: String) {
-    val depositRequest = gson.fromJson(SEP_6_DEPOSIT_EXCHANGE_FLOW_REQUEST, HashMap::class.java)
+    val depositRequest =
+      gson.fromJson(inject(SEP_6_DEPOSIT_EXCHANGE_FLOW_REQUEST), HashMap::class.java)
 
     val customer =
       sep12Client.putCustomer(
@@ -382,14 +383,14 @@ private const val SEP_6_DEPOSIT_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
               "started_at": "2024-06-25T20:02:31.003419Z",
               "updated_at": "2024-06-25T20:02:32.055853Z",
               "message": "test message 1",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -417,15 +418,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
               "updated_at": "2024-06-25T20:02:33.085143Z",
               "transfer_received_at": "2023-07-04T12:34:56Z",
               "message": "test message 2",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -471,15 +472,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
                   ]
                 }
               ],
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -512,14 +513,14 @@ private val SEP_6_DEPOSIT_WITH_PENDING_EXTERNAL_FLOW_ACTION_RESPONSES =
               "started_at": "2024-06-25T20:02:31.003419Z",
               "updated_at": "2024-06-25T20:02:32.055853Z",
               "message": "test message 1",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -558,15 +559,15 @@ private val SEP_6_DEPOSIT_WITH_PENDING_EXTERNAL_FLOW_ACTION_RESPONSES =
               "updated_at": "2024-06-25T20:02:33.085143Z",
               "transfer_received_at": "2023-07-04T12:34:56Z",
               "message": "test message 2",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -612,15 +613,15 @@ private val SEP_6_DEPOSIT_WITH_PENDING_EXTERNAL_FLOW_ACTION_RESPONSES =
                   ]
                 }
               ],
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -654,14 +655,14 @@ private const val SEP_6_DEPOSIT_EXCHANGE_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
               "started_at": "2024-06-25T20:05:21.747241Z",
               "updated_at": "2024-06-25T20:05:22.776951Z",
               "message": "test message 1",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -689,15 +690,15 @@ private const val SEP_6_DEPOSIT_EXCHANGE_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
               "updated_at": "2024-06-25T20:05:23.796201Z",
               "transfer_received_at": "2023-07-04T12:34:56Z",
               "message": "test message 2",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -743,15 +744,15 @@ private const val SEP_6_DEPOSIT_EXCHANGE_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
                   ]
                 }
               ],
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -871,14 +872,14 @@ private const val SEP_6_DEPOSIT_COMPLETE_FULL_WITH_TRUST_FLOW_ACTION_RESPONSES =
               "started_at": "2024-06-25T20:07:15.112397Z",
               "updated_at": "2024-06-25T20:07:16.135912Z",
               "message": "test message 1",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -905,14 +906,14 @@ private const val SEP_6_DEPOSIT_COMPLETE_FULL_WITH_TRUST_FLOW_ACTION_RESPONSES =
               "started_at": "2024-06-25T20:07:15.112397Z",
               "updated_at": "2024-06-25T20:07:16.200042Z",
               "message": "test message 2",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -940,15 +941,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_FULL_WITH_TRUST_FLOW_ACTION_RESPONSES =
               "updated_at": "2024-06-25T20:07:17.224307Z",
               "transfer_received_at": "2023-07-04T12:34:56Z",
               "message": "test message 3",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -976,15 +977,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_FULL_WITH_TRUST_FLOW_ACTION_RESPONSES =
               "updated_at": "2024-06-25T20:07:18.259066Z",
               "transfer_received_at": "2023-07-04T12:34:56Z",
               "message": "test message 4",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1012,15 +1013,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_FULL_WITH_TRUST_FLOW_ACTION_RESPONSES =
               "updated_at": "2024-06-25T20:07:19.304664Z",
               "transfer_received_at": "2023-07-04T12:34:56Z",
               "message": "test message 5",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1066,15 +1067,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_FULL_WITH_TRUST_FLOW_ACTION_RESPONSES =
                   ]
                 }
               ],
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1189,14 +1190,14 @@ private const val SEP_6_DEPOSIT_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONSE
               "started_at": "2024-06-25T20:09:35.672365Z",
               "updated_at": "2024-06-25T20:09:36.699649Z",
               "message": "test message 1",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1224,15 +1225,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONSE
               "updated_at": "2024-06-25T20:09:37.713378Z",
               "transfer_received_at": "2023-07-04T12:34:56Z",
               "message": "test message 2",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1260,15 +1261,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONSE
               "updated_at": "2024-06-25T20:09:38.732764Z",
               "transfer_received_at": "2023-07-04T12:34:56Z",
               "message": "test message 3",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1296,15 +1297,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONSE
               "updated_at": "2024-06-25T20:09:39.766277Z",
               "transfer_received_at": "2023-07-04T12:34:56Z",
               "message": "test message 4",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1350,15 +1351,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_FULL_WITH_RECOVERY_FLOW_ACTION_RESPONSE
                   ]
                 }
               ],
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1495,14 +1496,14 @@ private const val SEP_6_DEPOSIT_COMPLETE_SHORT_PARTIAL_REFUND_FLOW_ACTION_RESPON
               "started_at": "2024-06-25T20:11:02.407205Z",
               "updated_at": "2024-06-25T20:11:03.439769Z",
               "message": "test message 1",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1530,15 +1531,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_SHORT_PARTIAL_REFUND_FLOW_ACTION_RESPON
               "updated_at": "2024-06-25T20:11:04.458865Z",
               "transfer_received_at": "2023-07-04T12:34:56Z",
               "message": "test message 2",
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1578,15 +1579,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_SHORT_PARTIAL_REFUND_FLOW_ACTION_RESPON
                   }
                 ]
               },
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1626,15 +1627,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_SHORT_PARTIAL_REFUND_FLOW_ACTION_RESPON
                   }
                 ]
               },
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1692,15 +1693,15 @@ private const val SEP_6_DEPOSIT_COMPLETE_SHORT_PARTIAL_REFUND_FLOW_ACTION_RESPON
                   ]
                 }
               ],
-              "destination_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "destination_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1786,16 +1787,16 @@ private const val SEP_6_WITHDRAW_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
               "started_at": "2024-06-25T20:12:42.295731Z",
               "updated_at": "2024-06-25T20:12:43.318713Z",
               "message": "test message 1",
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "memo": "YWEyNDVlMjgtZGIyYS00YmRjLThkODgtYzExYmJhM2Y=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1843,16 +1844,16 @@ private const val SEP_6_WITHDRAW_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
                   ]
                 }
               ],
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "memo": "YWEyNDVlMjgtZGIyYS00YmRjLThkODgtYzExYmJhM2Y=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1901,17 +1902,17 @@ private const val SEP_6_WITHDRAW_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
                   ]
                 }
               ],
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "memo": "YWEyNDVlMjgtZGIyYS00YmRjLThkODgtYzExYmJhM2Y=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -1947,16 +1948,16 @@ private const val SEP_6_WITHDRAW_EXCHANGE_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
               "started_at": "2024-06-25T20:14:07.562913Z",
               "updated_at": "2024-06-25T20:14:08.587470Z",
               "message": "test message 1",
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "memo": "MjMwYzFlNjgtZTc3MC00ZTI5LTlhNDktNWM3OGJmZGY=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2004,16 +2005,16 @@ private const val SEP_6_WITHDRAW_EXCHANGE_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
                   ]
                 }
               ],
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "memo": "MjMwYzFlNjgtZTc3MC00ZTI5LTlhNDktNWM3OGJmZGY=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2062,17 +2063,17 @@ private const val SEP_6_WITHDRAW_EXCHANGE_COMPLETE_SHORT_FLOW_ACTION_RESPONSES =
                   ]
                 }
               ],
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "memo": "MjMwYzFlNjgtZTc3MC00ZTI5LTlhNDktNWM3OGJmZGY=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2168,16 +2169,16 @@ private const val SEP_6_WITHDRAW_COMPLETE_FULL_VIA_PENDING_EXTERNAL_FLOW_ACTION_
               "started_at": "2024-06-25T20:15:25.028960Z",
               "updated_at": "2024-06-25T20:15:26.050724Z",
               "message": "test message 1",
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "memo": "MTIxYmNmNjctN2IxYy00N2IwLTg1NDktZWU0ZGY4ODg=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2225,16 +2226,16 @@ private const val SEP_6_WITHDRAW_COMPLETE_FULL_VIA_PENDING_EXTERNAL_FLOW_ACTION_
                   ]
                 }
               ],
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "memo": "MTIxYmNmNjctN2IxYy00N2IwLTg1NDktZWU0ZGY4ODg=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2282,17 +2283,17 @@ private const val SEP_6_WITHDRAW_COMPLETE_FULL_VIA_PENDING_EXTERNAL_FLOW_ACTION_
                   ]
                 }
               ],
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "memo": "MTIxYmNmNjctN2IxYy00N2IwLTg1NDktZWU0ZGY4ODg=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2341,17 +2342,17 @@ private const val SEP_6_WITHDRAW_COMPLETE_FULL_VIA_PENDING_EXTERNAL_FLOW_ACTION_
                   ]
                 }
               ],
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "memo": "MTIxYmNmNjctN2IxYy00N2IwLTg1NDktZWU0ZGY4ODg=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2446,16 +2447,16 @@ private const val SEP_6_WITHDRAW_COMPLETE_FULL_VIA_PENDING_USER_FLOW_ACTION_RESP
               "started_at": "2024-06-25T19:55:51.246352Z",
               "updated_at": "2024-06-25T19:55:52.305301Z",
               "message": "test message 1",
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "memo": "MjJkMmM1MjEtMmQ4MS00ZmIxLWE0ZGItZjhjMDdiZjg=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2503,16 +2504,16 @@ private const val SEP_6_WITHDRAW_COMPLETE_FULL_VIA_PENDING_USER_FLOW_ACTION_RESP
                   ]
                 }
               ],
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "memo": "MjJkMmM1MjEtMmQ4MS00ZmIxLWE0ZGItZjhjMDdiZjg=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2560,17 +2561,17 @@ private const val SEP_6_WITHDRAW_COMPLETE_FULL_VIA_PENDING_USER_FLOW_ACTION_RESP
                   ]
                 }
               ],
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "memo": "MjJkMmM1MjEtMmQ4MS00ZmIxLWE0ZGItZjhjMDdiZjg=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2619,17 +2620,17 @@ private const val SEP_6_WITHDRAW_COMPLETE_FULL_VIA_PENDING_USER_FLOW_ACTION_RESP
                   ]
                 }
               ],
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "external_transaction_id": "ext-123456",
               "memo": "MjJkMmM1MjEtMmQ4MS00ZmIxLWE0ZGItZjhjMDdiZjg=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2726,16 +2727,16 @@ private const val SEP_6_WITHDRAW_FULL_REFUND_FLOW_ACTION_RESPONSES =
               "started_at": "2024-06-25T20:17:11.692327Z",
               "updated_at": "2024-06-25T20:17:12.718879Z",
               "message": "test message 1",
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "memo": "ZGU5YmVmZGMtOGFlNy00ZWJkLWFkYWYtNGE5YjcxOWI=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2783,16 +2784,16 @@ private const val SEP_6_WITHDRAW_FULL_REFUND_FLOW_ACTION_RESPONSES =
                   ]
                 }
               ],
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "memo": "ZGU5YmVmZGMtOGFlNy00ZWJkLWFkYWYtNGE5YjcxOWI=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2865,16 +2866,16 @@ private const val SEP_6_WITHDRAW_FULL_REFUND_FLOW_ACTION_RESPONSES =
                   ]
                 }
               ],
-              "source_account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+              "source_account": "%CLIENT_WALLET_ACCOUNT%",
               "memo": "ZGU5YmVmZGMtOGFlNy00ZWJkLWFkYWYtNGE5YjcxOWI=",
               "memo_type": "id",
               "client_name": "referenceCustodial",
               "customers": {
                 "sender": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 },
                 "receiver": {
-                  "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+                  "account": "%CLIENT_WALLET_ACCOUNT%"
                 }
               }
             },
@@ -2906,7 +2907,7 @@ private const val SEP_6_DEPOSIT_FLOW_REQUEST =
   """
         {
           "asset_code": "USDC",
-          "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+          "account": "%CLIENT_WALLET_ACCOUNT%",
           "amount": "1",
           "type": "SWIFT"
         }
@@ -2918,7 +2919,7 @@ private const val SEP_6_DEPOSIT_EXCHANGE_FLOW_REQUEST =
           "destination_asset": "USDC",
           "source_asset": "iso4217:USD",
           "amount": "1",
-          "account": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG",
+          "account": "%CLIENT_WALLET_ACCOUNT%",
           "type": "SWIFT"
         }
       """
diff --git a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep6Tests.kt b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep6Tests.kt
index 6c2aa640bc..4da9f4fd78 100644
--- a/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep6Tests.kt
+++ b/essential-tests/src/testFixtures/kotlin/org/stellar/anchor/platform/integrationtest/Sep6Tests.kt
@@ -9,15 +9,13 @@ import org.stellar.anchor.client.Sep38Client
 import org.stellar.anchor.client.Sep6Client
 import org.stellar.anchor.platform.IntegrationTestBase
 import org.stellar.anchor.platform.TestConfig
-import org.stellar.anchor.platform.TestSecrets.CLIENT_WALLET_SECRET
 import org.stellar.anchor.platform.gson
 import org.stellar.anchor.util.Log
-import org.stellar.sdk.KeyPair
 
 class Sep6Tests : IntegrationTestBase(TestConfig()) {
   private val sep6Client = Sep6Client(toml.getString("TRANSFER_SERVER"), token.token)
   private val sep38Client = Sep38Client(toml.getString("ANCHOR_QUOTE_SERVER"), this.token.token)
-  private val clientWalletAccount = KeyPair.fromSecretSeed(CLIENT_WALLET_SECRET).accountId
+  private val clientWalletAccount = walletKeyPair.address
 
   @Test
   fun `test Sep6 info endpoint`() {
@@ -174,7 +172,6 @@ class Sep6Tests : IntegrationTestBase(TestConfig()) {
   }
 
   companion object {
-
     private val expectedSep6Info =
       """
       {
@@ -281,19 +278,22 @@ class Sep6Tests : IntegrationTestBase(TestConfig()) {
       }
       """
         .trimIndent()
+  }
 
-    private val expectedSep6DepositResponse =
+  private val expectedSep6DepositResponse
+    get() =
       """
     {
         "transaction": {
             "kind": "deposit",
-            "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+            "to": "$clientWalletAccount"
         }
     }
   """
         .trimIndent()
 
-    private val expectedSep6DepositExchangeResponse =
+  private val expectedSep6DepositExchangeResponse
+    get() =
       """
       {
         "transaction": {
@@ -307,13 +307,14 @@ class Sep6Tests : IntegrationTestBase(TestConfig()) {
               "total": "0",
               "asset": "iso4217:USD"
           },
-          "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+          "to": "$clientWalletAccount"
         }
       }
     """
         .trimIndent()
 
-    private val expectedSep6DepositExchangeWithQuoteResponse =
+  private val expectedSep6DepositExchangeWithQuoteResponse
+    get() =
       """
       {
         "transaction": {
@@ -327,25 +328,27 @@ class Sep6Tests : IntegrationTestBase(TestConfig()) {
             "total": "1.00",
             "asset": "iso4217:USD"
           },
-          "to": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+          "to": "$clientWalletAccount"
         }
       }
     """
         .trimIndent()
 
-    private val expectedSep6WithdrawResponse =
+  private val expectedSep6WithdrawResponse
+    get() =
       """
       {
           "transaction": {
               "kind": "withdrawal",
               "status": "incomplete",
-              "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+              "from": "$clientWalletAccount"
           }
       }
     """
         .trimIndent()
 
-    private val expectedSep6WithdrawExchangeResponse =
+  private val expectedSep6WithdrawExchangeResponse
+    get() =
       """
       {
         "transaction": {
@@ -359,13 +362,14 @@ class Sep6Tests : IntegrationTestBase(TestConfig()) {
             "total": "0",
             "asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
           },
-          "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+          "from": "$clientWalletAccount"
         }
       }
     """
         .trimIndent()
 
-    private val expectedSep6WithdrawExchangeWithQuoteResponse =
+  private val expectedSep6WithdrawExchangeWithQuoteResponse
+    get() =
       """
       {
         "transaction": {
@@ -379,10 +383,9 @@ class Sep6Tests : IntegrationTestBase(TestConfig()) {
             "total": "1.00",
             "asset": "stellar:USDC:GDQOE23CFSUMSVQK4Y5JHPPYK73VYCNHZHA7ENKCV37P6SUEO6XQBKPP"
           },
-          "from": "GDJLBYYKMCXNVVNABOE66NYXQGIA5AC5D223Z2KF6ZEYK4UBCA7FKLTG"
+          "from": "$clientWalletAccount"
         }
       }
     """
         .trimIndent()
-  }
 }