diff --git a/app/src/main/java/com/example/bdkipoc/qris/QrisActivity.java b/app/src/main/java/com/example/bdkipoc/qris/QrisActivity.java
index 62c6fee..0f37f41 100644
--- a/app/src/main/java/com/example/bdkipoc/qris/QrisActivity.java
+++ b/app/src/main/java/com/example/bdkipoc/qris/QrisActivity.java
@@ -70,7 +70,7 @@ public class QrisActivity extends AppCompatActivity {
 
     private static final String BACKEND_BASE = "https://be-edc.msvc.app";
     private static final String MIDTRANS_CHARGE_URL = "https://api.sandbox.midtrans.com/v2/charge";
-    private static final String MIDTRANS_AUTH = "Basic U0ItTWlkLXNlcnZlci1JM2RJWXdIRzVuamVMeHJCMVZ5endWMUM="; // Replace with your actual key
+    private static final String MIDTRANS_AUTH = "Basic U0ItTWlkLXNlcnZlci1PM2t1bXkwVDl4M1VvYnVvVTc3NW5QbXc=";
     private static final String WEBHOOK_URL = "https://be-edc.msvc.app/webhooks/midtrans";
 
     @Override
diff --git a/app/src/main/java/com/example/bdkipoc/qris/QrisResultActivity.java b/app/src/main/java/com/example/bdkipoc/qris/QrisResultActivity.java
index 8b21143..1ba75f6 100644
--- a/app/src/main/java/com/example/bdkipoc/qris/QrisResultActivity.java
+++ b/app/src/main/java/com/example/bdkipoc/qris/QrisResultActivity.java
@@ -94,7 +94,7 @@ public class QrisResultActivity extends AppCompatActivity {
     private String webhookUrl = "https://be-edc.msvc.app/webhooks/midtrans";
     
     // Server key for signature generation
-    private static final String MIDTRANS_AUTH = "Basic U0ItTWlkLXNlcnZlci1JM2RJWXdIRzVuamVMeHJCMVZ5endWMUM=";
+    private static final String MIDTRANS_AUTH = "Basic U0ItTWlkLXNlcnZlci1PM2t1bXkwVDl4M1VvYnVvVTc3NW5QbXc=";
     private static final String MIDTRANS_CHARGE_URL = "https://api.sandbox.midtrans.com/v2/charge";
 
     // ✅ ADD: Mapping dari technical issuer ke display name
@@ -841,7 +841,7 @@ public class QrisResultActivity extends AppCompatActivity {
                 payload.put("status_message", "Success, transaction is found");
                 payload.put("transaction_id", webhookTransactionId);
                 payload.put("order_id", orderId);
-                payload.put("merchant_id", merchantId != null ? merchantId : "G900255786");
+                payload.put("merchant_id", merchantId != null ? merchantId : "G616299250");
                 payload.put("gross_amount", grossAmount != null ? grossAmount : String.valueOf(originalAmount));
                 payload.put("currency", "IDR");
                 payload.put("payment_type", "qris");
@@ -1335,7 +1335,7 @@ public class QrisResultActivity extends AppCompatActivity {
                 payload.put("settlement_time", transactionTime != null ? transactionTime : "2025-04-16T06:00:00Z");
                 payload.put("payment_type", "qris");
                 payload.put("order_id", currentOrderId);
-                payload.put("merchant_id", merchantId != null ? merchantId : "G900255786");
+                payload.put("merchant_id", merchantId != null ? merchantId : "G616299250");
                 payload.put("issuer", finalIssuer);
                 payload.put("gross_amount", currentGrossAmount);
                 payload.put("fraud_status", "accept");