diff --git a/src/bundles/Elsa/FodyWeavers.xml b/src/bundles/Elsa/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/bundles/Elsa/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>
\ No newline at end of file
diff --git a/src/common/Elsa.Api.Common/FodyWeavers.xml b/src/common/Elsa.Api.Common/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/common/Elsa.Api.Common/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>
\ No newline at end of file
diff --git a/src/common/Elsa.Features/FodyWeavers.xml b/src/common/Elsa.Features/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/common/Elsa.Features/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>
\ No newline at end of file
diff --git a/src/common/Elsa.Formatting/FodyWeavers.xml b/src/common/Elsa.Formatting/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/common/Elsa.Formatting/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>
\ No newline at end of file
diff --git a/src/common/Elsa.Models.Common/FodyWeavers.xml b/src/common/Elsa.Models.Common/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/common/Elsa.Models.Common/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>
\ No newline at end of file
diff --git a/src/common/Elsa.Persistence.Common/FodyWeavers.xml b/src/common/Elsa.Persistence.Common/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/common/Elsa.Persistence.Common/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>
\ No newline at end of file
diff --git a/src/common/Elsa.Persistence.EntityFrameworkCore.Common/FodyWeavers.xml b/src/common/Elsa.Persistence.EntityFrameworkCore.Common/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/common/Elsa.Persistence.EntityFrameworkCore.Common/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>
\ No newline at end of file
diff --git a/src/common/Elsa.ServiceBus.Abstractions/FodyWeavers.xml b/src/common/Elsa.ServiceBus.Abstractions/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/common/Elsa.ServiceBus.Abstractions/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>
\ No newline at end of file
diff --git a/src/modules/Elsa.ActivityDefinitions.EntityFrameworkCore.Sqlite/FodyWeavers.xml b/src/modules/Elsa.ActivityDefinitions.EntityFrameworkCore.Sqlite/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/modules/Elsa.ActivityDefinitions.EntityFrameworkCore.Sqlite/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>
\ No newline at end of file
diff --git a/src/modules/Elsa.ActivityDefinitions.EntityFrameworkCore/FodyWeavers.xml b/src/modules/Elsa.ActivityDefinitions.EntityFrameworkCore/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/modules/Elsa.ActivityDefinitions.EntityFrameworkCore/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>
\ No newline at end of file
diff --git a/src/modules/Elsa.ActivityDefinitions/FodyWeavers.xml b/src/modules/Elsa.ActivityDefinitions/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/modules/Elsa.ActivityDefinitions/FodyWeavers.xml
@@ -0,0 +1,3 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ConfigureAwait />
+</Weavers>
\ No newline at end of file