diff --git a/src/activities/Elsa.Activities.Mqtt/Elsa.Activities.Mqtt.csproj b/src/activities/Elsa.Activities.Mqtt/Elsa.Activities.Mqtt.csproj
index 86aec4bd3..99957ceef 100644
--- a/src/activities/Elsa.Activities.Mqtt/Elsa.Activities.Mqtt.csproj
+++ b/src/activities/Elsa.Activities.Mqtt/Elsa.Activities.Mqtt.csproj
@@ -1,25 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <Import Project="..\..\..\common.props" />
-    <Import Project="..\..\..\configureawait.props" />
-    
-    
+    <Import Project="..\..\..\common.props"/>
+    <Import Project="..\..\..\configureawait.props"/>
+
     <PropertyGroup>
         <TargetFramework>net5.0</TargetFramework>
-        <RootNamespace>Elsa.Activities.Mqtt</RootNamespace>
-        <Description>Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application.
-This package provides activities to send and receive messages using MQTT.</Description>
+        <Description>
+            Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application.
+            This package provides activities to send and receive messages using MQTT.
+        </Description>
         <PackageTags>elsa, workflows</PackageTags>
     </PropertyGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\core\Elsa.Abstractions\Elsa.Abstractions.csproj" />
-      <ProjectReference Include="..\..\core\Elsa.Core\Elsa.Core.csproj" />
-      <ProjectReference Include="..\..\modules\workflowtesting\Elsa.WorkflowTesting\Elsa.WorkflowTesting.csproj" />
+        <ProjectReference Include="..\..\core\Elsa.Abstractions\Elsa.Abstractions.csproj"/>
+        <ProjectReference Include="..\..\core\Elsa.Core\Elsa.Core.csproj"/>
+        <ProjectReference Include="..\..\modules\workflowtesting\Elsa.WorkflowTesting\Elsa.WorkflowTesting.csproj"/>
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="System.Net.Mqtt" Version="0.6.16-beta" />
+        <PackageReference Include="System.Net.Mqtt" Version="0.6.16-beta"/>
     </ItemGroup>
 
 </Project>
diff --git a/src/activities/Elsa.Activities.RabbitMq/Elsa.Activities.RabbitMq.csproj b/src/activities/Elsa.Activities.RabbitMq/Elsa.Activities.RabbitMq.csproj
index 3c15fe75a..2cf9f1768 100644
--- a/src/activities/Elsa.Activities.RabbitMq/Elsa.Activities.RabbitMq.csproj
+++ b/src/activities/Elsa.Activities.RabbitMq/Elsa.Activities.RabbitMq.csproj
@@ -3,15 +3,8 @@
     <Import Project="..\..\..\common.props" />
     <Import Project="..\..\..\configureawait.props" />
     
-
     <PropertyGroup>
         <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
-        <RootNamespace>Elsa.Activities.RabbitMq</RootNamespace>
-        <LangVersion>latest</LangVersion>
-        <Nullable>enable</Nullable>
-        <Authors>Elsa Contributors</Authors>
-        <TargetFramework>net5.0</TargetFramework>
-        <RootNamespace>Elsa.Activities.RabbitMq</RootNamespace>        
         <Description>
             Elsa is a set of workflow libraries and tools that enable lean and mean workflowing capabilities in any .NET Core application.
             This package provides activities to send and receive messages using Rabbit MQ.</Description>        
diff --git a/src/activities/Elsa.Activities.RabbitMq/FodyWeavers.xml b/src/activities/Elsa.Activities.RabbitMq/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/activities/Elsa.Activities.RabbitMq/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/activities/Elsa.Activities.Rebus/FodyWeavers.xml b/src/activities/Elsa.Activities.Rebus/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/activities/Elsa.Activities.Rebus/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/workflowtesting/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj
index 4fd97cab3..456bc7c2f 100644
--- a/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj
+++ b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/Elsa.WorkflowTesting.Api.csproj
@@ -5,9 +5,6 @@
     
     <PropertyGroup>
         <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
-        <Nullable>enable</Nullable>
-        <LangVersion>latest</LangVersion>
-        <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/FodyWeavers.xml b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/FodyWeavers.xml
new file mode 100644
index 000000000..00e1d9a1c
--- /dev/null
+++ b/src/modules/workflowtesting/Elsa.WorkflowTesting.Api/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/workflowtesting/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj b/src/modules/workflowtesting/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj
index 4c002a238..55f0e86e0 100644
--- a/src/modules/workflowtesting/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj
+++ b/src/modules/workflowtesting/Elsa.WorkflowTesting/Elsa.WorkflowTesting.csproj
@@ -5,9 +5,6 @@
     
     <PropertyGroup>
         <TargetFrameworks>net5.0;net6.0</TargetFrameworks>
-        <Nullable>enable</Nullable>
-        <LangVersion>default</LangVersion>
-        <TargetFramework>net5.0</TargetFramework>
     </PropertyGroup>
     
     <ItemGroup>
diff --git a/src/modules/workflowtesting/Elsa.WorkflowTesting/FodyWeavers.xml b/src/modules/workflowtesting/Elsa.WorkflowTesting/FodyWeavers.xml
new file mode 100644
index 000000000..06ee72161
--- /dev/null
+++ b/src/modules/workflowtesting/Elsa.WorkflowTesting/FodyWeavers.xml
@@ -0,0 +1 @@
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd" />
\ No newline at end of file