diff --git a/app/build.gradle b/app/build.gradle
index ab67d89..43146ae 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@ android {
         applicationId "com.utsmm.kbz.sit"
         minSdk 24
         targetSdk 33
-        versionCode 10
+        versionCode 1
         versionName "1.0"
 
 //        applicationId "com.utsmm.kbz"
@@ -40,7 +40,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled true
+            minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
index d43c4b9..dc33a70 100644
Binary files a/app/release/app-release.apk and b/app/release/app-release.apk differ
diff --git a/app/release/baselineProfiles/0/app-release.dm b/app/release/baselineProfiles/0/app-release.dm
index cfa7757..ff737b9 100644
Binary files a/app/release/baselineProfiles/0/app-release.dm and b/app/release/baselineProfiles/0/app-release.dm differ
diff --git a/app/release/baselineProfiles/1/app-release.dm b/app/release/baselineProfiles/1/app-release.dm
index 964d2f4..b43f05b 100644
Binary files a/app/release/baselineProfiles/1/app-release.dm and b/app/release/baselineProfiles/1/app-release.dm differ
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
index b57f258..ef42794 100644
--- a/app/release/output-metadata.json
+++ b/app/release/output-metadata.json
@@ -4,15 +4,15 @@
     "type": "APK",
     "kind": "Directory"
   },
-  "applicationId": "com.utsmm.kbz",
+  "applicationId": "com.utsmm.kbz.sit",
   "variantName": "release",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 10,
-      "versionName": "1.10",
+      "versionCode": 1,
+      "versionName": "1.0",
       "outputFile": "app-release.apk"
     }
   ],
diff --git a/app/src/main/java/com/utsmm/kbz/util/EReceiptUtil.java b/app/src/main/java/com/utsmm/kbz/util/EReceiptUtil.java
index 9ce9b8b..f507d41 100644
--- a/app/src/main/java/com/utsmm/kbz/util/EReceiptUtil.java
+++ b/app/src/main/java/com/utsmm/kbz/util/EReceiptUtil.java
@@ -34,6 +34,8 @@ public class EReceiptUtil {
     private String batchNumber;
 
     private String packageName;
+    private String qrTerminalId;
+    private String qrMerchantId;
     private EReceiptUtil(){
         terminalId = SystemParamsOperation.getInstance().getTerminalId();
         merchantId = SystemParamsOperation.getInstance().getMerchantId();
@@ -42,6 +44,8 @@ public class EReceiptUtil {
         batchNumber = SystemParamsOperation.getInstance().getCurrentBatchNum();
         serialNum = TMSUtil.getInstance().getSerialNumber();
         packageName = BuildConfig.APPLICATION_ID;
+        qrTerminalId = SystemParamsOperation.getInstance().getSecHostTerminalId();
+        qrMerchantId = SystemParamsOperation.getInstance().getSecHostMerchantId();
     }
 
     public EReceiptRequest generateQRReceipt(PayDetail payDetail, TransResultStatus status) {
@@ -61,8 +65,8 @@ public class EReceiptUtil {
         request.setDE49("MMK");
         request.setSerial(serialNum);
         request.setAppId(packageName);
-        request.setDE41(terminalId);
-        request.setDE42(merchantId);
+        request.setDE41(qrTerminalId);
+        request.setDE42(qrMerchantId);
         request.setInvoiceNumber(payDetail.getInvoiceNo());
         request.setDE11(payDetail.getVoucherNo());
 
@@ -105,8 +109,8 @@ public class EReceiptUtil {
         request.setDE49("MMK");
         request.setSerial(serialNum);
         request.setAppId(packageName);
-        request.setDE41(terminalId);
-        request.setDE42(merchantId);
+        request.setDE41(qrTerminalId);
+        request.setDE42(qrMerchantId);
         request.setInvoiceNumber(payDetail.getInvoiceNo());
         request.setDE11(payDetail.getVoucherNo());
 
diff --git a/nexdlkey-lib/build/.transforms/5bc694b3c3dbcd3106b0fd441ea046d8/results.bin b/nexdlkey-lib/build/.transforms/5bc694b3c3dbcd3106b0fd441ea046d8/results.bin
new file mode 100644
index 0000000..e69de29
diff --git a/nexdlkey-lib/build/.transforms/76455aeeb6d402d0857b3062cfdcf8bc/results.bin b/nexdlkey-lib/build/.transforms/76455aeeb6d402d0857b3062cfdcf8bc/results.bin
new file mode 100644
index 0000000..1a38fac
--- /dev/null
+++ b/nexdlkey-lib/build/.transforms/76455aeeb6d402d0857b3062cfdcf8bc/results.bin
@@ -0,0 +1 @@
+i/nexgo-sdk-dlkey-1.0.2-runtime_dex
diff --git a/nexdlkey-lib/build/.transforms/7b2165e09ee637fe83ab9cb5e54a72a3/results.bin b/nexdlkey-lib/build/.transforms/7b2165e09ee637fe83ab9cb5e54a72a3/results.bin
new file mode 100644
index 0000000..c626d1b
--- /dev/null
+++ b/nexdlkey-lib/build/.transforms/7b2165e09ee637fe83ab9cb5e54a72a3/results.bin
@@ -0,0 +1 @@
+i/jars/classes.jar
diff --git a/nexdlkey-lib/build/.transforms/b26a2046de089ad40b54763960720ea9/results.bin b/nexdlkey-lib/build/.transforms/b26a2046de089ad40b54763960720ea9/results.bin
new file mode 100644
index 0000000..b064cd1
--- /dev/null
+++ b/nexdlkey-lib/build/.transforms/b26a2046de089ad40b54763960720ea9/results.bin
@@ -0,0 +1 @@
+i/nexgo-sdk-dlkey-1.0.2-runtime_global-synthetics
diff --git a/nexdlkey-lib/build/.transforms/bc0589cc3bf79abae491297e400bea42/results.bin b/nexdlkey-lib/build/.transforms/bc0589cc3bf79abae491297e400bea42/results.bin
new file mode 100644
index 0000000..e69de29
diff --git a/nexdlkey-lib/build/.transforms/f4ae73d88ff24e71ef8d3d27bac9ae3e/results.bin b/nexdlkey-lib/build/.transforms/f4ae73d88ff24e71ef8d3d27bac9ae3e/results.bin
new file mode 100644
index 0000000..5aac0ef
--- /dev/null
+++ b/nexdlkey-lib/build/.transforms/f4ae73d88ff24e71ef8d3d27bac9ae3e/results.bin
@@ -0,0 +1 @@
+o/nexgo-sdk-dlkey-1.0.2-runtime
diff --git a/nexdlkey-lib/build/.transforms/f4ae73d88ff24e71ef8d3d27bac9ae3e/transformed/nexgo-sdk-dlkey-1.0.2-runtime/nexgo-sdk-dlkey-1.0.2-runtime_dex/classes.dex b/nexdlkey-lib/build/.transforms/f4ae73d88ff24e71ef8d3d27bac9ae3e/transformed/nexgo-sdk-dlkey-1.0.2-runtime/nexgo-sdk-dlkey-1.0.2-runtime_dex/classes.dex
new file mode 100644
index 0000000..12ff893
Binary files /dev/null and b/nexdlkey-lib/build/.transforms/f4ae73d88ff24e71ef8d3d27bac9ae3e/transformed/nexgo-sdk-dlkey-1.0.2-runtime/nexgo-sdk-dlkey-1.0.2-runtime_dex/classes.dex differ