diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5f0a6a5..41d2aad 100755
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -214,7 +214,8 @@ jobs:
 
       - name: Determine Version
         id: gitversion
-        uses: gittools/actions/gitversion/execute@v0.10.2
+        uses: gittools/actions/gitversion/execute@v1.1.1
+
         with:
           useConfigFile: true
           updateAssemblyInfo: true
@@ -336,12 +337,12 @@ jobs:
           msg: ${{ github.repository }}
 
       - name: Install GitReleaseManager
-        uses: gittools/actions/gitreleasemanager/setup@v0.10.2
+        uses: gittools/actions/gitreleasemanager/setup@v0.17.0
         with:
           versionSpec: "0.13.x"
 
       - name: Create release with GitReleaseManager
-        uses: gittools/actions/gitreleasemanager/create@v0.10.2
+        uses: gittools/actions/gitreleasemanager/create@v0.17.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           owner: ${{ steps.repo.outputs._0 }}
@@ -353,7 +354,7 @@ jobs:
 
       - name: Publish release with GitReleaseManager
         if: ${{ contains(github.ref, 'refs/heads/main') }}
-        uses: gittools/actions/gitreleasemanager/publish@v0.10.2
+        uses: gittools/actions/gitreleasemanager/publish@v0.17.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           owner: ${{ steps.repo.outputs._0 }}
@@ -362,7 +363,7 @@ jobs:
 
       - name: Close release with GitReleaseManager
         if: ${{ contains(github.ref, 'refs/heads/main') }}
-        uses: gittools/actions/gitreleasemanager/close@v0.10.2
+        uses: gittools/actions/gitreleasemanager/close@v0.17.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           owner: ${{ steps.repo.outputs._0 }}
diff --git a/.gitignore b/.gitignore
index e0e0dd2..e64791b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -351,4 +351,5 @@ MigrationBackup/
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
 
+
 */.idea/*
diff --git a/GitVersion.yml b/GitVersion.yml
index 77eb439..fa44f09 100644
--- a/GitVersion.yml
+++ b/GitVersion.yml
@@ -56,4 +56,9 @@ branches:
 ignore:
   sha: []
 merge-message-formats: {}
-next-version: 0.1.19
+next-version: 2.0.0
+
+major-version-bump-message: '\+semver:\s?(breaking|major)'
+minor-version-bump-message: '\+semver:\s?(feature|minor)'
+patch-version-bump-message: '\+semver:\s?(fix|patch)'
+update-build-number: false
diff --git a/src/Messaging/Events/ExportRequestEvent.cs b/src/Messaging/Events/ExportRequestEvent.cs
index de8bd3a..124c18b 100755
--- a/src/Messaging/Events/ExportRequestEvent.cs
+++ b/src/Messaging/Events/ExportRequestEvent.cs
@@ -87,8 +87,11 @@ public class ExportRequestEvent : EventBase
         [JsonPropertyName("error_messages")]
         public List<string> ErrorMessages { get; private set; }
 
-        [JsonProperty(PropertyName = "file_id")]
-        [JsonPropertyName("file_id")]
+        /// <summary>
+        /// Gets or set the payloadId for external apps sending data back
+        /// </summary>
+        [JsonProperty(PropertyName = "payload_id")]
+        [JsonPropertyName("payload_id")]
         public string? PayloadId { get; set; }
 
         /// <summary>
diff --git a/src/Messaging/Events/WorkflowRequestEvent.cs b/src/Messaging/Events/WorkflowRequestEvent.cs
index 41ba7d2..bbada21 100755
--- a/src/Messaging/Events/WorkflowRequestEvent.cs
+++ b/src/Messaging/Events/WorkflowRequestEvent.cs
@@ -58,6 +58,7 @@ public class DataOrigin
         [JsonPropertyName("artifactType")]
         public ArtifactType ArtifactType { get; set; } = ArtifactType.Unset;
 
+
         public override int GetHashCode()
         {
             return HashCode.Combine(Source, Destination, DataService);
@@ -78,7 +79,7 @@ public enum DataService
         /// Unknown data service
         /// </summary>
         Unknown,
-
+        
         /// <summary>
         /// Data received via DIMSE services
         /// </summary>
diff --git a/src/Messaging/Tests/IServiceCollectionExtensionsTests.cs b/src/Messaging/Tests/IServiceCollectionExtensionsTests.cs
index 2c49f34..5599f66 100644
--- a/src/Messaging/Tests/IServiceCollectionExtensionsTests.cs
+++ b/src/Messaging/Tests/IServiceCollectionExtensionsTests.cs
@@ -207,7 +207,6 @@ internal class GoodSubscriberService : IMessageBrokerSubscriberService
 
         // event used by users of this library
         public event ConnectionErrorHandler? OnConnectionError;
-
 #pragma warning restore CS0067 // The event 'GoodSubscriberService.OnConnectionError' is never used
 
         public void Acknowledge(MessageBase message) => throw new NotImplementedException();
diff --git a/src/Messaging/Tests/WorkflowRequestMessageTest.cs b/src/Messaging/Tests/WorkflowRequestMessageTest.cs
index 0e53bc9..90e4889 100644
--- a/src/Messaging/Tests/WorkflowRequestMessageTest.cs
+++ b/src/Messaging/Tests/WorkflowRequestMessageTest.cs
@@ -49,6 +49,7 @@ public void ConvertsJsonMessageToMessage()
                 DataService = DataService.DicomWeb,
                 Source = Guid.NewGuid().ToString(),
                 Destination = Guid.NewGuid().ToString(),
+
             });
             input.DataOrigins.Add(new DataOrigin
             {