diff --git a/.env.production b/.env.production
index 6ada1c3..3411c6d 100644
--- a/.env.production
+++ b/.env.production
@@ -77,11 +77,12 @@ TENNANT_KAUNTER_DB=kaunter_erahn
 KAUNTER_URL=https://ujrah.erahn.com.my
 INTERNAL_NOTIFICATION_SECRET="nIDTe(u@6[)VLJyd"
 
+WHATSAPP_CLOUD_ENABLED=true
 WHATSAPP_TOKEN=EAAZAonT56AO0BSnZAhWLi4UXDRT6iAldbiybxSQZAnGrzIke1QiNWvQkZAbQQTjWeVZC5bL1gEBhW6ff3Shf79nowXiTQEwyxqgZAZB6ZATwFCeTs8MZA5H6ZA76IJBuVqRiAZBvZCfkeSurbUNpEWyi9W7zsT2GWiZCLX8meX0KCfDHu7cp4aBgVu1Ps5ZCRO3bP4ZCQZDZD
-WHATSAPP_PHONE_NUMBER_ID=1323449077519027
+WHATSAPP_PHONE_NUMBER_ID=1375899418935337
 WHATSAPP_API_VERSION=v25.0
 WHATSAPP_TEMPLATE=hebahan_pembiayaan_online
 WHATSAPP_TEMPLATE_LANG=ms
 WHATSAPP_VERIFY_TOKEN=418ed86d49422071681c76bed25ae1cb7e90456c794a92f1c9ea417945a35a0a
 WHATSAPP_APP_SECRET=
-ADMIN_PHONE_NUMBER=6097414339
\ No newline at end of file
+ADMIN_PHONE_NUMBER=
\ No newline at end of file
diff --git a/.env.staging b/.env.staging
index 061aeea..f87ad63 100644
--- a/.env.staging
+++ b/.env.staging
@@ -88,11 +88,12 @@ TENNANT_KAUNTER_DB=kaunter_erahn
 KAUNTER_URL=https://staging.erahn.com.my/login
 INTERNAL_NOTIFICATION_SECRET=staging_noti_secret
 
-WHATSAPP_TOKEN= # Paste token from Graph API explorer.
-WHATSAPP_PHONE_NUMBER_ID=1323449077519027
+WHATSAPP_CLOUD_ENABLED=false
+WHATSAPP_TOKEN=EAAZAonT56AO0BSnZAhWLi4UXDRT6iAldbiybxSQZAnGrzIke1QiNWvQkZAbQQTjWeVZC5bL1gEBhW6ff3Shf79nowXiTQEwyxqgZAZB6ZATwFCeTs8MZA5H6ZA76IJBuVqRiAZBvZCfkeSurbUNpEWyi9W7zsT2GWiZCLX8meX0KCfDHu7cp4aBgVu1Ps5ZCRO3bP4ZCQZDZD
+WHATSAPP_PHONE_NUMBER_ID=1375899418935337
 WHATSAPP_API_VERSION=v25.0
-WHATSAPP_TEMPLATE=hello_world
-WHATSAPP_TEMPLATE_LANG=en_US
-WHATSAPP_VERIFY_TOKEN= # webhook verify token
-WHATSAPP_APP_SECRET= # X-Hub-Signature-256 checks; need to be enable first
-ADMIN_PHONE_NUMBER=60193450165
\ No newline at end of file
+WHATSAPP_TEMPLATE=hebahan_pembiayaan_online
+WHATSAPP_TEMPLATE_LANG=ms
+WHATSAPP_VERIFY_TOKEN=418ed86d49422071681c76bed25ae1cb7e90456c794a92f1c9ea417945a35a0a
+WHATSAPP_APP_SECRET=
+ADMIN_PHONE_NUMBER=
\ No newline at end of file
diff --git a/app/Jobs/WhatsappPembiayaanOnlinePaid.php b/app/Jobs/WhatsappPembiayaanOnlinePaid.php
index f1a0d9e..466e449 100644
--- a/app/Jobs/WhatsappPembiayaanOnlinePaid.php
+++ b/app/Jobs/WhatsappPembiayaanOnlinePaid.php
@@ -54,10 +54,10 @@ class WhatsappPembiayaanOnlinePaid extends Job
         $storedPhone = $customer ? ($customer->telefon ?: $customer->telefon2) : null;
         $to = $client->normalizeMsisdn($storedPhone);
 
-        if (env('APP_ENV') !== 'production') {
+        if (!config('whatsapp.whatsapp_cloud_enabled')) {
             $admin = $client->normalizeMsisdn(env('ADMIN_PHONE_NUMBER'));
             if (!$admin) {
-                Log::warning('WhatsApp Cloud skipped: ADMIN_PHONE_NUMBER required when not production', [
+                Log::warning('WhatsApp Cloud skipped: ADMIN_PHONE_NUMBER required when WHATSAPP_ENABLED is false', [
                     'norujukan' => $this->norujukan,
                 ]);
                 $this->logBlast($now, $storedPhone, 'skipped: ADMIN_PHONE_NUMBER empty');
diff --git a/config/whatsapp.php b/config/whatsapp.php
index 546b489..9dce1c7 100644
--- a/config/whatsapp.php
+++ b/config/whatsapp.php
@@ -1,6 +1,7 @@
 <?php
 
 return [
+    'whatsapp_cloud_enabled' => env('WHATSAPP_CLOUD_ENABLED', true),
     'token' => env('WHATSAPP_TOKEN'),
     'phone_number_id' => env('WHATSAPP_PHONE_NUMBER_ID'),
     'api_version' => env('WHATSAPP_API_VERSION', 'v25.0'),