diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 871957cf5e..67adf3d62a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -75,15 +75,15 @@ jobs:
           connection-string-env-var: ServiceControl_TransportTests_SQL_ConnectionString
           catalog: nservicebus
       - name: Setup PostgreSQL
-        uses: Particular/setup-postgres-action@v1.0.0
+        uses: Particular/setup-postgres-action@v1.0.2
         if: matrix.test-category == 'PostgreSQL'
-        with:          
+        with:
           connection-string-name: ServiceControl_TransportTests_PostgreSQL_ConnectionString
           tag: ServiceControl
           registry-username: ${{ secrets.DOCKERHUB_USERNAME }}
-          registry-password: ${{ secrets.DOCKERHUB_TOKEN }}  
+          registry-password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Setup RabbitMQ
-        uses: Particular/setup-rabbitmq-action@v1.7.0
+        uses: Particular/setup-rabbitmq-action@v1.7.1
         if: matrix.test-category == 'RabbitMQ'
         with:
           connection-string-name: ServiceControl_TransportTests_RabbitMQ_ConnectionString
diff --git a/local-packages/NServiceBus.Transport.AzureServiceBus.4.2.4-alpha.0.4.nupkg b/local-packages/NServiceBus.Transport.AzureServiceBus.4.2.4-alpha.0.4.nupkg
new file mode 100644
index 0000000000..aa1c6f7daa
Binary files /dev/null and b/local-packages/NServiceBus.Transport.AzureServiceBus.4.2.4-alpha.0.4.nupkg differ
diff --git a/nuget.config b/nuget.config
index d72d1d3d28..892e0ea8b5 100644
--- a/nuget.config
+++ b/nuget.config
@@ -3,6 +3,7 @@
   <packageSources>
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="particular packages" value="https://f.feedz.io/particular-software/packages/nuget/index.json" />
+    <add key="local packages" value="local-packages" />
   </packageSources>
   <packageSourceMapping>
     <packageSource key="nuget.org">
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
index fd8b459434..ceb5c3ea9b 100644
--- a/src/Directory.Packages.props
+++ b/src/Directory.Packages.props
@@ -43,7 +43,7 @@
     <PackageVersion Include="NServiceBus.RabbitMQ" Version="9.1.1" />
     <PackageVersion Include="NServiceBus.SagaAudit" Version="5.0.1" />
     <PackageVersion Include="NServiceBus.Testing" Version="9.0.0" />
-    <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="4.2.3" />
+    <PackageVersion Include="NServiceBus.Transport.AzureServiceBus" Version="4.2.4-alpha.0.4" />
     <PackageVersion Include="NServiceBus.Transport.AzureStorageQueues" Version="13.0.1" />
     <PackageVersion Include="NServiceBus.Transport.Msmq.Sources" Version="3.0.1" />
     <PackageVersion Include="NServiceBus.Transport.SqlServer" Version="8.1.6" />
diff --git a/src/ServiceControl/Recoverability/Retrying/Infrastructure/ReturnToSenderDequeuer.cs b/src/ServiceControl/Recoverability/Retrying/Infrastructure/ReturnToSenderDequeuer.cs
index edd08e220d..36d08d4c14 100644
--- a/src/ServiceControl/Recoverability/Retrying/Infrastructure/ReturnToSenderDequeuer.cs
+++ b/src/ServiceControl/Recoverability/Retrying/Infrastructure/ReturnToSenderDequeuer.cs
@@ -142,9 +142,17 @@ public virtual async Task Run(string forwardingBatchId, Predicate<MessageContext
                     Log.DebugFormat($"Waiting for forwarder for batch {forwardingBatchId} to finish.");
                 }
 
-                await syncEvent.Task;
+                Log.Debug("Awaiting syncEvent.Task");
+                _ = await syncEvent.Task;
+                Log.Debug("syncEvent.Task completed");
+
+                Log.Debug("Disposing registration.");
                 registration?.Dispose();
+                Log.Debug("Registration disposed");
+
+                Log.Debug("Stopping message receiver");
                 await messageReceiver.StopReceive(cancellationToken);
+                Log.Debug("Message receiver stopped");
 
                 Log.Info($"Forwarder for batch {forwardingBatchId} finished forwarding all messages.");