diff --git a/api/payments/orchestrator/internal/service/orchestrator/payment_plan_ledger.go b/api/payments/orchestrator/internal/service/orchestrator/payment_plan_ledger.go
index 96861a4f..c491ffcb 100644
--- a/api/payments/orchestrator/internal/service/orchestrator/payment_plan_ledger.go
+++ b/api/payments/orchestrator/internal/service/orchestrator/payment_plan_ledger.go
@@ -229,6 +229,9 @@ func (p *paymentExecutor) ledgerTxForAction(ctx context.Context, payment *model.
 	if err != nil {
 		return rail.LedgerTx{}, err
 	}
+	if action == model.RailOperationCredit && strings.TrimSpace(accountRef) != "" {
+		setLedgerAccountAttributes(payment, accountRef)
+	}
 	if action == model.RailOperationDebit && toRail == model.RailLedger {
 		toRail = model.RailUnspecified
 	}
diff --git a/ci/prod/compose/fx_ingestor.yml b/ci/prod/compose/fx_ingestor.yml
index 68625c95..af1b50d7 100644
--- a/ci/prod/compose/fx_ingestor.yml
+++ b/ci/prod/compose/fx_ingestor.yml
@@ -32,6 +32,11 @@ services:
       MONGO_HOSTS_2: ${MONGO_HOSTS_2}
       MONGO_PORTS_2: ${MONGO_PORTS_2}
       FX_INGESTOR_METRICS_PORT: ${FX_INGESTOR_METRICS_PORT}
+      NATS_URL: ${FX_NATS_URL}
+      NATS_HOST: ${NATS_HOST}
+      NATS_PORT: ${NATS_PORT}
+      NATS_USER: ${NATS_USER}
+      NATS_PASSWORD: ${NATS_PASSWORD}
     command: ["--config.file", "/app/config.yml"]
     ports:
       - "0.0.0.0:${FX_INGESTOR_METRICS_PORT}:${FX_INGESTOR_METRICS_PORT}"
diff --git a/ci/prod/scripts/deploy/fx.sh b/ci/prod/scripts/deploy/fx.sh
index d7572c1e..7826c62e 100644
--- a/ci/prod/scripts/deploy/fx.sh
+++ b/ci/prod/scripts/deploy/fx.sh
@@ -23,7 +23,7 @@ case "$SERVICE" in
     COMPOSE_PROJECT="${FX_INGESTOR_COMPOSE_PROJECT:-sendico-fx-ingestor}"
     COMPOSE_FILE="fx_ingestor.yml"
     SERVICE_NAMES="${FX_INGESTOR_SERVICE_NAME:-sendico_fx_ingestor}"
-    REQUIRED_SECRETS=(FX_MONGO_USER FX_MONGO_PASSWORD)
+    REQUIRED_SECRETS=(FX_MONGO_USER FX_MONGO_PASSWORD NATS_USER NATS_PASSWORD FX_NATS_URL)
     ;;
   oracle)
     : "${FX_ORACLE_DIR:?missing FX_ORACLE_DIR}"
diff --git a/ci/scripts/fx/deploy.sh b/ci/scripts/fx/deploy.sh
index b3b27797..f9d38250 100755
--- a/ci/scripts/fx/deploy.sh
+++ b/ci/scripts/fx/deploy.sh
@@ -50,7 +50,14 @@ load_env_file ./.env.version
 
 FX_MONGO_SECRET_PATH="${FX_MONGO_SECRET_PATH:?missing FX_MONGO_SECRET_PATH}"
 FX_DEPLOY_TARGET="${FX_DEPLOY_TARGET:?missing FX_DEPLOY_TARGET}"
-FX_NEEDS_NATS="${FX_NEEDS_NATS:-false}"
+FX_NEEDS_NATS="${FX_NEEDS_NATS:-}"
+
+if [ -z "${FX_NEEDS_NATS}" ]; then
+  case "${FX_DEPLOY_TARGET}" in
+    ingestor|oracle) FX_NEEDS_NATS=true ;;
+    *) FX_NEEDS_NATS=false ;;
+  esac
+fi
 
 export FX_MONGO_USER="$(./ci/vlt kv_get kv "${FX_MONGO_SECRET_PATH}" user)"
 export FX_MONGO_PASSWORD="$(./ci/vlt kv_get kv "${FX_MONGO_SECRET_PATH}" password)"
diff --git a/frontend/pshared/lib/provider/payment/quotation/quotation.dart b/frontend/pshared/lib/provider/payment/quotation/quotation.dart
index d2a72e27..b1af4dda 100644
--- a/frontend/pshared/lib/provider/payment/quotation/quotation.dart
+++ b/frontend/pshared/lib/provider/payment/quotation/quotation.dart
@@ -38,7 +38,7 @@ class QuotationProvider extends ChangeNotifier {
     WalletsController wallets,
     PaymentFlowProvider flow,
     RecipientsProvider recipients,
-    PaymentMethodsProvider _methods,
+    PaymentMethodsProvider _,
   ) {
     _organizations = venue;
     final intent = _intentBuilder.build(
diff --git a/frontend/pweb/lib/pages/dashboard/buttons/balance/add/owner.dart b/frontend/pweb/lib/pages/dashboard/buttons/balance/add/owner.dart
index e3523e05..34e70e4f 100644
--- a/frontend/pweb/lib/pages/dashboard/buttons/balance/add/owner.dart
+++ b/frontend/pweb/lib/pages/dashboard/buttons/balance/add/owner.dart
@@ -19,7 +19,7 @@ class OwnerField extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) => DropdownButtonFormField<String?>(
-    value: value,
+    initialValue: value,
     decoration: getInputDecoration(context, AppLocalizations.of(context)!.assetOwner, true),
     items: items,
     onChanged: onChanged,