diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index ae0133b3..7ed5058d 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -6,7 +6,7 @@
     "/chunks/status-check.js": "/chunks/status-check.js?id=0bcc38e60d97631d",
     "/chunks/purchase-code.js": "/chunks/purchase-code.js?id=8ce2150648a811b5",
     "/chunks/database.js": "/chunks/database.js?id=2abed3c6d692416a",
-    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=7f6a9af36bfcd706",
+    "/chunks/environment-setup.js": "/chunks/environment-setup.js?id=8e01d577c73325e2",
     "/chunks/app-setup.js": "/chunks/app-setup.js?id=0df2494d2269a949",
     "/chunks/admin-account.js": "/chunks/admin-account.js?id=2d131d1d784c98b9",
     "/chunks/shared.js": "/chunks/shared.js?id=e68646d339b36632",
@@ -38,13 +38,13 @@
     "/chunks/plan-delete.js": "/chunks/plan-delete.js?id=e56fd84d4718e2f3",
     "/chunks/payments.js": "/chunks/payments.js?id=2a6dba57de536b0d",
     "/chunks/payments/billings.js": "/chunks/payments/billings.js?id=8ff91573838e18e0",
-    "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=730f776273bc9f09",
+    "/chunks/payments/settings.js": "/chunks/payments/settings.js?id=879367415c7fbbe9",
     "/chunks/app-settings.js": "/chunks/app-settings.js?id=ac94675bfea2ac48",
     "/chunks/app-appearance.js": "/chunks/app-appearance.js?id=7801199064bd834b",
     "/chunks/app-index.js": "/chunks/app-index.js?id=80eed2df9c7ef155",
-    "/chunks/app-environment.js": "/chunks/app-environment.js?id=5be816eb94bd9a78",
+    "/chunks/app-environment.js": "/chunks/app-environment.js?id=6013a9e2282b0b25",
     "/chunks/app-others.js": "/chunks/app-others.js?id=33040c1f2fbb9b63",
-    "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=80ab5897c46993b5",
+    "/chunks/app-sign-in-out.js": "/chunks/app-sign-in-out.js?id=5434946f737025bb",
     "/chunks/app-adsense.js": "/chunks/app-adsense.js?id=5ce9441ee0eadd98",
     "/chunks/app-server.js": "/chunks/app-server.js?id=b33faa1138402046",
     "/chunks/app-language.js": "/chunks/app-language.js?id=c1b828a7724a7a5c",
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Environment.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Environment.vue
index 77a4b887..4c91622b 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/Environment.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/Environment.vue
@@ -483,6 +483,10 @@ export default {
 					label: 'us-west-002',
 					value: 'us-west-002',
 				},
+				{
+					label: 'us-west-004',
+					value: 'us-west-004',
+				},
 				{
 					label: 'eu-central-003',
 					value: 'eu-central-003',
diff --git a/resources/js/views/Admin/AppSettings/AppSettingsTabs/SignInUp.vue b/resources/js/views/Admin/AppSettings/AppSettingsTabs/SignInUp.vue
index fbdbb45f..ba04952e 100644
--- a/resources/js/views/Admin/AppSettings/AppSettingsTabs/SignInUp.vue
+++ b/resources/js/views/Admin/AppSettings/AppSettingsTabs/SignInUp.vue
@@ -73,7 +73,7 @@
                     (!config.isFacebookLoginConfigured || facebook.isVisibleCredentialsForm) && facebook.allowedService
                 "
                 @submit.prevent="storeCredentials('facebook')"
-                ref="credentialsForm"
+                ref="facebook"
                 v-slot="{ invalid }"
                 tag="form"
                 class="rounded-xl p-5 shadow-lg"
@@ -157,7 +157,7 @@
             <ValidationObserver
                 v-if="(!config.isGoogleLoginConfigured || google.isVisibleCredentialsForm) && google.allowedService"
                 @submit.prevent="storeCredentials('google')"
-                ref="credentialsForm"
+                ref="google"
                 v-slot="{ invalid }"
                 tag="form"
                 class="rounded-xl p-5 shadow-lg"
@@ -241,7 +241,7 @@
             <ValidationObserver
                 v-if="(!config.isGithubLoginConfigured || github.isVisibleCredentialsForm) && github.allowedService"
                 @submit.prevent="storeCredentials('github')"
-                ref="credentialsForm"
+                ref="github"
                 v-slot="{ invalid }"
                 tag="form"
                 class="rounded-xl p-5 shadow-lg"
@@ -361,7 +361,7 @@ export default {
         },
         async storeCredentials(service) {
             // Validate fields
-            const isValid = await this.$refs.credentialsForm.validate()
+            const isValid = await this.$refs[service].validate()
 
             if (!isValid) return
 
diff --git a/resources/js/views/Admin/PaymentSettings/PaymentSettingsTab/Payments.vue b/resources/js/views/Admin/PaymentSettings/PaymentSettingsTab/Payments.vue
index 61f03aa1..a597576e 100644
--- a/resources/js/views/Admin/PaymentSettings/PaymentSettingsTab/Payments.vue
+++ b/resources/js/views/Admin/PaymentSettings/PaymentSettingsTab/Payments.vue
@@ -102,6 +102,13 @@
 
             <!--Stripe credentials are set up-->
             <div v-if="stripe.allowedService">
+				<AppInputText
+					:title="$t('Your Webhook URL')"
+					:description="$t('Please copy your url and paste it to the service webhook setup.')"
+				>
+					<CopyInput size="small" :str="getWebhookEndpoint('stripe')" />
+				</AppInputText>
+
                 <div v-if="stripe.isConfigured">
                     <AppInputText
                         @input="$updateText('/admin/settings', 'stripe_payment_description', stripe.paymentDescription)"
@@ -127,13 +134,6 @@
                         />
                     </AppInputText>
 
-                    <AppInputText
-                        :title="$t('Your Webhook URL')"
-                        :description="$t('Please copy your url and paste it to the service webhook setup.')"
-                    >
-                        <CopyInput size="small" :str="getWebhookEndpoint('stripe')" />
-                    </AppInputText>
-
                     <div
                         @click="stripe.isVisibleCredentialsForm = !stripe.isVisibleCredentialsForm"
                         class="flex cursor-pointer items-center"
@@ -148,7 +148,7 @@
                 <ValidationObserver
                     v-if="!stripe.isConfigured || stripe.isVisibleCredentialsForm"
                     @submit.prevent="storeCredentials('stripe')"
-                    ref="credentialsForm"
+                    ref="stripe"
                     v-slot="{ invalid }"
                     tag="form"
                     class="rounded-xl p-5 shadow-lg"
@@ -233,6 +233,13 @@
 
             <!--Paystack credentials are set up-->
             <div v-if="paystack.allowedService">
+				<AppInputText
+					:title="$t('Your Webhook URL')"
+					:description="$t('Please copy your url and paste it to the service webhook setup.')"
+				>
+					<CopyInput size="small" :str="getWebhookEndpoint('paystack')" />
+				</AppInputText>
+
                 <div v-if="paystack.isConfigured">
                     <AppInputText
                         @input="
@@ -260,13 +267,6 @@
                         />
                     </AppInputText>
 
-                    <AppInputText
-                        :title="$t('Your Webhook URL')"
-                        :description="$t('Please copy your url and paste it to the service webhook setup.')"
-                    >
-                        <CopyInput size="small" :str="getWebhookEndpoint('paystack')" />
-                    </AppInputText>
-
                     <div
                         @click="paystack.isVisibleCredentialsForm = !paystack.isVisibleCredentialsForm"
                         class="flex cursor-pointer items-center"
@@ -281,7 +281,7 @@
                 <ValidationObserver
                     v-if="!paystack.isConfigured || paystack.isVisibleCredentialsForm"
                     @submit.prevent="storeCredentials('paystack')"
-                    ref="credentialsForm"
+                    ref="paystack"
                     v-slot="{ invalid }"
                     tag="form"
                     class="rounded-xl p-5 shadow-lg"
@@ -349,6 +349,13 @@
 
             <!--Stripe credentials are set up-->
             <div v-if="paypal.allowedService">
+				<AppInputText
+					:title="$t('Your Webhook URL')"
+					:description="$t('Please copy your url and paste it to the service webhook setup.')"
+				>
+					<CopyInput size="small" :str="getWebhookEndpoint('paypal')" />
+				</AppInputText>
+
                 <div v-if="paypal.isConfigured">
                     <AppInputSwitch :title="$t('Live Mode')" :description="$t('Toggle amid live and sandbox mode')">
                         <SwitchInput
@@ -382,13 +389,6 @@
                         />
                     </AppInputText>
 
-                    <AppInputText
-                        :title="$t('Your Webhook URL')"
-                        :description="$t('Please copy your url and paste it to the service webhook setup.')"
-                    >
-                        <CopyInput size="small" :str="getWebhookEndpoint('paypal')" />
-                    </AppInputText>
-
                     <div
                         @click="paypal.isVisibleCredentialsForm = !paypal.isVisibleCredentialsForm"
                         class="flex cursor-pointer items-center"
@@ -403,7 +403,7 @@
                 <ValidationObserver
                     v-if="!paypal.isConfigured || paypal.isVisibleCredentialsForm"
                     @submit.prevent="storeCredentials('paypal')"
-                    ref="credentialsForm"
+                    ref="paypal"
                     v-slot="{ invalid }"
                     tag="form"
                     class="rounded-xl p-5 shadow-lg"
@@ -591,7 +591,7 @@ export default {
     methods: {
         async storeCredentials(service) {
             // Validate fields
-            const isValid = await this.$refs.credentialsForm.validate()
+            const isValid = await this.$refs[service].validate()
 
             if (!isValid) return
 
diff --git a/resources/js/views/SetupWizard/EnvironmentSetup.vue b/resources/js/views/SetupWizard/EnvironmentSetup.vue
index 2c93f39e..ed95b76a 100644
--- a/resources/js/views/SetupWizard/EnvironmentSetup.vue
+++ b/resources/js/views/SetupWizard/EnvironmentSetup.vue
@@ -565,6 +565,10 @@ export default {
                     label: 'us-west-002',
                     value: 'us-west-002',
                 },
+				{
+					label: 'us-west-004',
+					value: 'us-west-004',
+				},
                 {
                     label: 'eu-central-003',
                     value: 'eu-central-003',