diff --git a/modules/payment/src/Payment.Admin.Application.Contracts/FodyWeavers.xml b/modules/payment/src/Payment.Admin.Application.Contracts/FodyWeavers.xml
index 00e1d9a..be0de3a 100644
--- a/modules/payment/src/Payment.Admin.Application.Contracts/FodyWeavers.xml
+++ b/modules/payment/src/Payment.Admin.Application.Contracts/FodyWeavers.xml
@@ -1,3 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ConfigureAwait />
+  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
\ No newline at end of file
diff --git a/modules/payment/src/Payment.Admin.Application/FodyWeavers.xml b/modules/payment/src/Payment.Admin.Application/FodyWeavers.xml
index 00e1d9a..be0de3a 100644
--- a/modules/payment/src/Payment.Admin.Application/FodyWeavers.xml
+++ b/modules/payment/src/Payment.Admin.Application/FodyWeavers.xml
@@ -1,3 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ConfigureAwait />
+  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
\ No newline at end of file
diff --git a/modules/payment/src/Payment.Admin.Blazor/FodyWeavers.xml b/modules/payment/src/Payment.Admin.Blazor/FodyWeavers.xml
new file mode 100644
index 0000000..be0de3a
--- /dev/null
+++ b/modules/payment/src/Payment.Admin.Blazor/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait ContinueOnCapturedContext="false" />
+</Weavers>
\ No newline at end of file
diff --git a/modules/payment/src/Payment.Admin.Blazor/FodyWeavers.xsd b/modules/payment/src/Payment.Admin.Blazor/FodyWeavers.xsd
new file mode 100644
index 0000000..3f3946e
--- /dev/null
+++ b/modules/payment/src/Payment.Admin.Blazor/FodyWeavers.xsd
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ConfigureAwait" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:attribute name="ContinueOnCapturedContext" type="xs:boolean" />
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/modules/payment/src/Payment.Admin.HttpApi.Client/FodyWeavers.xml b/modules/payment/src/Payment.Admin.HttpApi.Client/FodyWeavers.xml
index 00e1d9a..be0de3a 100644
--- a/modules/payment/src/Payment.Admin.HttpApi.Client/FodyWeavers.xml
+++ b/modules/payment/src/Payment.Admin.HttpApi.Client/FodyWeavers.xml
@@ -1,3 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ConfigureAwait />
+  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
\ No newline at end of file
diff --git a/modules/payment/src/Payment.Admin.HttpApi/FodyWeavers.xml b/modules/payment/src/Payment.Admin.HttpApi/FodyWeavers.xml
index 00e1d9a..be0de3a 100644
--- a/modules/payment/src/Payment.Admin.HttpApi/FodyWeavers.xml
+++ b/modules/payment/src/Payment.Admin.HttpApi/FodyWeavers.xml
@@ -1,3 +1,3 @@
 <Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
-  <ConfigureAwait />
+  <ConfigureAwait ContinueOnCapturedContext="false" />
 </Weavers>
\ No newline at end of file