diff --git a/src/bundles/Elsa.Server.Web/Program.cs b/src/bundles/Elsa.Server.Web/Program.cs
index 64b000aa79..78f1468e53 100644
--- a/src/bundles/Elsa.Server.Web/Program.cs
+++ b/src/bundles/Elsa.Server.Web/Program.cs
@@ -71,7 +71,6 @@
             .AddWorkflowsFrom<Program>()
             .UseFluentStorageProvider()
             .UseFileStorage()
-            // .UseFileStorage(sp => StorageFactory.Blobs.AzureBlobStorageWithSas(configuration.GetConnectionString("AzureStorageSasUrl")))
             .UseIdentity(identity =>
             {
                 if (useMongoDb)
diff --git a/src/modules/Elsa.Workflows.Runtime/Activities/Event.cs b/src/modules/Elsa.Workflows.Runtime/Activities/Event.cs
index 86df0ee5c1..870e8c40c3 100644
--- a/src/modules/Elsa.Workflows.Runtime/Activities/Event.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Activities/Event.cs
@@ -16,6 +16,8 @@ namespace Elsa.Workflows.Runtime.Activities;
 [UsedImplicitly]
 public class Event : Trigger<object?>
 {
+    internal const string EventPayloadWorkflowInputKey = "__EventPayloadWorkflowInput";
+    
     /// <inheritdoc />
     internal Event([CallerFilePath] string? source = default, [CallerLineNumber] int? line = default) : base(source, line)
     {
@@ -79,6 +81,8 @@ protected override async ValueTask ExecuteAsync(ActivityExecutionContext context
             return;
         }
 
+        var input = context.GetWorkflowInput<object?>(EventPayloadWorkflowInputKey);
+        context.SetResult(input);
         await context.CompleteActivityAsync();
     }
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.Workflows.Runtime/Activities/PublishEvent.cs b/src/modules/Elsa.Workflows.Runtime/Activities/PublishEvent.cs
index 1f6a46028f..ef3d0415ed 100644
--- a/src/modules/Elsa.Workflows.Runtime/Activities/PublishEvent.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Activities/PublishEvent.cs
@@ -40,8 +40,8 @@ public PublishEvent([CallerFilePath] string? source = default, [CallerLineNumber
     /// <summary>
     /// The input to send as the event body.
     /// </summary>
-    [Input(Description = "The input to send as the event body.")]
-    public Input<IDictionary<string, object>?> Input { get; set; } = default!;
+    [Input(Description = "The payload to send as the event body.")]
+    public Input<object> Payload { get; set; } = default!;
 
     /// <inheritdoc />
     protected override async ValueTask ExecuteAsync(ActivityExecutionContext context)
@@ -50,10 +50,10 @@ protected override async ValueTask ExecuteAsync(ActivityExecutionContext context
         var correlationId = CorrelationId.GetOrDefault(context);
         var isLocalEvent = IsLocalEvent.GetOrDefault(context);
         var workflowInstanceId = isLocalEvent ? context.WorkflowExecutionContext.Id : default;
-        var input = Input.GetOrDefault(context);
+        var payload = Payload.GetOrDefault(context);
         var publisher = context.GetRequiredService<IEventPublisher>();
-
-        await publisher.DispatchAsync(eventName, correlationId, workflowInstanceId, null, input, context.CancellationToken);
+        
+        await publisher.DispatchAsync(eventName, correlationId, workflowInstanceId, null, payload, context.CancellationToken);
         await context.CompleteActivityAsync();
     }
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.Workflows.Runtime/Contracts/IEventPublisher.cs b/src/modules/Elsa.Workflows.Runtime/Contracts/IEventPublisher.cs
index bb9be51a37..f11feacbe9 100644
--- a/src/modules/Elsa.Workflows.Runtime/Contracts/IEventPublisher.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Contracts/IEventPublisher.cs
@@ -11,10 +11,10 @@ public interface IEventPublisher
     /// <summary>
     /// Synchronously publishes the specified event using the workflow runtime, effectively triggering all <see cref="Event"/> activities matching the provided event name.
     /// </summary>
-    Task<ICollection<WorkflowExecutionResult>> PublishAsync(string eventName, string? correlationId = default, string? workflowInstanceId = default, string? activityInstanceId = default, IDictionary<string, object>? input = default, CancellationToken cancellationToken = default);
+    Task<ICollection<WorkflowExecutionResult>> PublishAsync(string eventName, string? correlationId = default, string? workflowInstanceId = default, string? activityInstanceId = default, object? payload = default, CancellationToken cancellationToken = default);
 
     /// <summary>
     /// Asynchronously publishes the specified event using the workflow dispatcher.
     /// </summary>
-    Task DispatchAsync(string eventName, string? correlationId = default, string? workflowInstanceId = default, string? activityInstanceId = default, IDictionary<string, object>? input = default, CancellationToken cancellationToken = default);
+    Task DispatchAsync(string eventName, string? correlationId = default, string? workflowInstanceId = default, string? activityInstanceId = default, object? payload = default, CancellationToken cancellationToken = default);
 }
\ No newline at end of file
diff --git a/src/modules/Elsa.Workflows.Runtime/Services/EventPublisher.cs b/src/modules/Elsa.Workflows.Runtime/Services/EventPublisher.cs
index 1acd1159ff..44d5c4524a 100644
--- a/src/modules/Elsa.Workflows.Runtime/Services/EventPublisher.cs
+++ b/src/modules/Elsa.Workflows.Runtime/Services/EventPublisher.cs
@@ -28,10 +28,10 @@ public EventPublisher(IWorkflowInbox workflowInbox)
         string? correlationId = default,
         string? workflowInstanceId = default,
         string? activityInstanceId = default,
-        IDictionary<string, object>? input = default,
+        object? payload = default,
         CancellationToken cancellationToken = default)
     {
-        return await PublishInternalAsync(eventName, false, correlationId, workflowInstanceId, activityInstanceId, input, cancellationToken);
+        return await PublishInternalAsync(eventName, false, correlationId, workflowInstanceId, activityInstanceId, payload, cancellationToken);
     }
 
     /// <inheritdoc />
@@ -40,10 +40,10 @@ public EventPublisher(IWorkflowInbox workflowInbox)
         string? correlationId = default,
         string? workflowInstanceId = default,
         string? activityInstanceId = default,
-        IDictionary<string, object>? input = default,
+        object? payload = default,
         CancellationToken cancellationToken = default)
     {
-        await PublishInternalAsync(eventName, true, correlationId, workflowInstanceId, activityInstanceId, input, cancellationToken);
+        await PublishInternalAsync(eventName, true, correlationId, workflowInstanceId, activityInstanceId, payload, cancellationToken);
     }
 
     private async Task<ICollection<WorkflowExecutionResult>> PublishInternalAsync(
@@ -52,11 +52,15 @@ public EventPublisher(IWorkflowInbox workflowInbox)
         string? correlationId = default,
         string? workflowInstanceId = default,
         string? activityInstanceId = default,
-        IDictionary<string, object>? input = default,
+        object? payload = default,
         CancellationToken cancellationToken = default)
     {
         var eventBookmark = new EventBookmarkPayload(eventName);
-        var message = NewWorkflowInboxMessage.For<Event>(eventBookmark, workflowInstanceId, correlationId, activityInstanceId, input);
+        var workflowInput = new Dictionary<string, object>
+        {
+            [Event.EventPayloadWorkflowInputKey] = payload ?? new Dictionary<string, object>()
+        };
+        var message = NewWorkflowInboxMessage.For<Event>(eventBookmark, workflowInstanceId, correlationId, activityInstanceId, workflowInput);
         var options = new WorkflowInboxMessageDeliveryOptions
         {
             DispatchAsynchronously = dispatchAsynchronously