diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4a941c031..59167bb4f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -57,8 +57,21 @@ jobs:
         uses: gittools/actions/gitversion/execute@v0.10.2
         with:
           useConfigFile: true
+          updateAssemblyInfo: true
+          updateAssemblyInfoFilename: src/AssemblyInfo.cs
           configFilePath: .github/.gitversion.yml
 
+      - name: Print AssemblyInfo
+        run: cat src/AssemblyInfo.cs
+
+      - name: Upload AssemblyInfo
+        uses: actions/upload-artifact@v3.1.2
+        if: always()
+        with:
+          name: assembly-info
+          path: src/AssemblyInfo.cs
+          retention-days: 30
+
   CodeQL-Analyze:
     runs-on: ubuntu-latest
     permissions:
@@ -330,6 +343,16 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-nuget
 
+      - name: Download AssemblyInfo.cs
+        id: download
+        uses: actions/download-artifact@v3
+        with:
+          name: assembly-info
+          path: src/
+          
+      - name: Print AssemblyInfo
+        run: cat src/AssemblyInfo.cs
+
       - name: Restore dependencies
         run: dotnet restore
         working-directory: ./src
diff --git a/doc/dependency_decisions.yml b/doc/dependency_decisions.yml
index a1538aefa..3c8235479 100644
--- a/doc/dependency_decisions.yml
+++ b/doc/dependency_decisions.yml
@@ -2401,21 +2401,21 @@
   - :who: mocsharp
     :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
     :versions:
-    - 2.19.0
+    - 2.19.1
     :when: 2022-11-16 23:38:53.891380809 Z
 - - :approve
   - MongoDB.Driver
   - :who: mocsharp
     :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
     :versions:
-    - 2.19.0
+    - 2.19.1
     :when: 2022-11-16 23:38:54.213853364 Z
 - - :approve
   - MongoDB.Driver.Core
   - :who: mocsharp
     :why: Apache-2.0 (https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
     :versions:
-    - 2.19.0
+    - 2.19.1
     :when: 2022-11-16 23:38:54.553730219 Z
 - - :approve
   - MongoDB.Libmongocrypt
diff --git a/docs/api/rest/config.md b/docs/api/rest/config.md
index 874b9bebe..12657d94a 100644
--- a/docs/api/rest/config.md
+++ b/docs/api/rest/config.md
@@ -168,6 +168,65 @@ curl --location --request POST 'http://localhost:5000/config/ae/' \
 
 ---
 
+## PUT /config/ae
+
+Updates an existing MONAI SCP Application Entity.
+
+> [!Note]
+> The MONAI SCP AE Title cannot be changed.
+
+> [!Note]
+> The DICOM tag used for `grouping` can be either a Study Instance UID (0020,000D) or Series Instance UID (0020,000E).
+> The default is set to a Study Instance UID (0020,000D) if not specified.
+
+> [!Note]
+> `timeout` is the number of seconds the AE Title will wait between each instance before assembling a payload and publishing
+> a workflow request. We recommend calculating this value based on the network speed and the maximum size of each
+> DICOM instance.
+
+### Parameters
+
+See the [MonaiApplicationEntity](xref:Monai.Deploy.InformaticsGateway.Api.MonaiApplicationEntity)
+class definition for details.
+
+### Responses
+
+Response Content Type: JSON - [MonaiApplicationEntity](xref:Monai.Deploy.InformaticsGateway.Api.MonaiApplicationEntity).
+
+| Code | Description                                                                                                                                 |
+| ---- | ------------------------------------------------------------------------------------------------------------------------------------------- |
+| 200  | AE Title updated successfully.                                                                                                              |
+| 400  | Validation error. The response will be a [Problem details](https://datatracker.ietf.org/doc/html/rfc7807) object with server error details. |
+| 404  | Named MONAI AE not found.                                                                                                                      |
+| 500  | Server error. The response will be a [Problem details](https://datatracker.ietf.org/doc/html/rfc7807) object with server error details.     |
+
+### Example Request
+
+```bash
+curl --location --request PUT 'http://localhost:5000/config/ae/' \
+    --header 'Content-Type: application/json' \
+    --data-raw '{
+            "name": "breast-tumor",
+            "timeout": 3,
+            "workflows": [
+                "3f6a08a1-0dea-44e9-ab82-1ff1adf43a8e"
+            ]
+        }
+    }'
+```
+
+### Example Response
+
+```json
+{
+  "name": "breast-tumor",
+  "aeTitle": "BREASTV1",
+  "workflows": ["3f6a08a1-0dea-44e9-ab82-1ff1adf43a8e"],
+  "timeout": 3
+}
+```
+
+---
 ## DELETE /config/ae/{name}
 
 Deletes the specified MONAI SCP Application Entity.
diff --git a/docs/changelog.md b/docs/changelog.md
index 63ee8e9f7..df31695e6 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2021-2022 MONAI Consortium
+  ~ Copyright 2021-2023 MONAI Consortium
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -17,6 +17,43 @@
 
 # Changelog
 
+## 0.3.15
+
+[GitHub Milestone 0.3.15](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/20)
+
+- New APIs for managing SCP AE Titles
+  - `PUT /config/ae`: [Update SCP AE TItle](./api/rest/config.md#put-configae)
+
+## 0.3.14
+
+[GitHub Milestone 0.3.14](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/19)
+
+- Fixes RabbitMQ startup issues.
+
+## 0.3.13
+
+[GitHub Milestone 0.3.13](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/18)
+
+- Fixes an issue where failure uploads caused payload to stuck in the queue and stops processing any incoming data.
+
+## 0.3.12
+
+[GitHub Milestone 0.3.12](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/17)
+
+- Fixes exception handling for unavailable previously created dead-letter queues
+
+## 0.3.11
+
+[GitHub Milestone 0.3.11](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/16)
+
+- Adds exception handling for unavailable previously created dead-letter queues
+
+## 0.3.10
+
+[GitHub Milestone 0.3.10](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/15)
+
+- Fixes payload assembler not respecting user configured timeout window
+
 ## 0.3.8
 
 [GitHub Milestone 0.3.8](https://github.com/Project-MONAI/monai-deploy-informatics-gateway/milestone/14)
diff --git a/docs/compliance/third-party-licenses.md b/docs/compliance/third-party-licenses.md
index bacc0c190..9fa2ebdd9 100644
--- a/docs/compliance/third-party-licenses.md
+++ b/docs/compliance/third-party-licenses.md
@@ -8672,14 +8672,14 @@ By downloading this software, you agree to the license terms & all licenses list
 
 
 <details>
-<summary>MongoDB.Bson 2.19.0</summary>
+<summary>MongoDB.Bson 2.19.1</summary>
 
 ## MongoDB.Bson
 
-- Version: 2.19.0
+- Version: 2.19.1
 - Authors: MongoDB Inc.
 - Project URL: https://www.mongodb.com/docs/drivers/csharp/
-- Source: [NuGet](https://www.nuget.org/packages/MongoDB.Bson/2.19.0)
+- Source: [NuGet](https://www.nuget.org/packages/MongoDB.Bson/2.19.1)
 - License: [Apache-2.0](https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
 
 
@@ -8704,14 +8704,14 @@ By downloading this software, you agree to the license terms & all licenses list
 
 
 <details>
-<summary>MongoDB.Driver 2.19.0</summary>
+<summary>MongoDB.Driver 2.19.1</summary>
 
 ## MongoDB.Driver
 
-- Version: 2.19.0
+- Version: 2.19.1
 - Authors: MongoDB Inc.
 - Project URL: https://www.mongodb.com/docs/drivers/csharp/
-- Source: [NuGet](https://www.nuget.org/packages/MongoDB.Driver/2.19.0)
+- Source: [NuGet](https://www.nuget.org/packages/MongoDB.Driver/2.19.1)
 - License: [Apache-2.0](https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
 
 
@@ -8736,14 +8736,14 @@ By downloading this software, you agree to the license terms & all licenses list
 
 
 <details>
-<summary>MongoDB.Driver.Core 2.19.0</summary>
+<summary>MongoDB.Driver.Core 2.19.1</summary>
 
 ## MongoDB.Driver.Core
 
-- Version: 2.19.0
+- Version: 2.19.1
 - Authors: MongoDB Inc.
 - Project URL: https://www.mongodb.com/docs/drivers/csharp/
-- Source: [NuGet](https://www.nuget.org/packages/MongoDB.Driver.Core/2.19.0)
+- Source: [NuGet](https://www.nuget.org/packages/MongoDB.Driver.Core/2.19.1)
 - License: [Apache-2.0](https://github.com/mongodb/mongo-csharp-driver/raw/master/License.txt)
 
 
diff --git a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj
index 683eaf15f..2c63eb9f8 100644
--- a/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj
+++ b/src/Api/Monai.Deploy.InformaticsGateway.Api.csproj
@@ -24,12 +24,10 @@
     <CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <Nullable>enable</Nullable>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.15" />
     <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.22" />
@@ -46,6 +44,10 @@
     <AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-informatics-gateway\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Common\Monai.Deploy.InformaticsGateway.Common.csproj" />
   </ItemGroup>
diff --git a/src/Api/MonaiApplicationEntity.cs b/src/Api/MonaiApplicationEntity.cs
index 9512ba64c..f250d1f9d 100644
--- a/src/Api/MonaiApplicationEntity.cs
+++ b/src/Api/MonaiApplicationEntity.cs
@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+using System;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
@@ -95,6 +96,16 @@ public class MonaiApplicationEntity : MongoDBEntityBase
         /// </summary>
         public string? CreatedBy { get; set; }
 
+        /// <summary>
+        /// Gets or set the most recent user who updated the DICOM entity.
+        /// </summary>
+        public string? UpdatedBy { get; set; }
+
+        /// <summary>
+        /// Gets or set the most recent date time the DICOM entity was updated.
+        /// </summary>
+        public DateTime? DateTimeUpdated { get; set; }
+
         public MonaiApplicationEntity()
         {
             SetDefaultValues();
@@ -124,9 +135,21 @@ public override string ToString()
             return $"Name: {Name}/AET: {AeTitle}";
         }
 
-        public void SetAuthor(ClaimsPrincipal user)
+        public void SetAuthor(ClaimsPrincipal user, EditMode editMode)
         {
-            CreatedBy = user.Identity?.Name;
+            if (editMode == EditMode.Update)
+            {
+                DateTimeUpdated = DateTime.UtcNow;
+            }
+
+            if (editMode == EditMode.Create)
+            {
+                CreatedBy = user.Identity?.Name;
+            }
+            else if (editMode == EditMode.Update)
+            {
+                UpdatedBy = user.Identity?.Name;
+            }
         }
     }
 }
diff --git a/src/Api/Storage/Payload.cs b/src/Api/Storage/Payload.cs
index 279d3d7ab..14e9f58db 100644
--- a/src/Api/Storage/Payload.cs
+++ b/src/Api/Storage/Payload.cs
@@ -75,6 +75,9 @@ public TimeSpan Elapsed
 
         public string? CalledAeTitle { get => Files.OfType<DicomFileStorageMetadata>().Select(p => p.CalledAeTitle).FirstOrDefault(); }
 
+        public int FilesUploaded { get => Files.Count(p => p.IsUploaded); }
+        public int FilesFailedToUpload { get => Files.Count(p => p.IsUploadFailed); }
+
         public Payload(string key, string correlationId, uint timeout)
         {
             Guard.Against.NullOrWhiteSpace(key);
diff --git a/src/Api/packages.lock.json b/src/Api/packages.lock.json
index 105a91def..17d64e4ac 100644
--- a/src/Api/packages.lock.json
+++ b/src/Api/packages.lock.json
@@ -2,12 +2,6 @@
   "version": 1,
   "dependencies": {
     "net6.0": {
-      "GitVersion.MsBuild": {
-        "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
-      },
       "Macross.Json.Extensions": {
         "type": "Direct",
         "requested": "[3.0.0, )",
diff --git a/src/AssemblyInfo.cs b/src/AssemblyInfo.cs
new file mode 100644
index 000000000..739ae2c87
--- /dev/null
+++ b/src/AssemblyInfo.cs
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2023 MONAI Consortium
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Reflection;
+
+[assembly: AssemblyVersion("0.0.0.0")]
+[assembly: AssemblyFileVersion("0.0.0.0")]
+[assembly: AssemblyInformationalVersion("0.0.0")]
+
diff --git a/src/CLI/Commands/AetCommand.cs b/src/CLI/Commands/AetCommand.cs
index dcaa01b65..66d29d582 100644
--- a/src/CLI/Commands/AetCommand.cs
+++ b/src/CLI/Commands/AetCommand.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 MONAI Consortium
+ * Copyright 2021-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +40,7 @@ public AetCommand() : base("aet", "Configure SCP Application Entities")
             AddAlias("aetitle");
 
             SetupAddAetCommand();
+            SetupEditAetCommand();
             SetupRemoveAetCommand();
             SetupListAetCommand();
         }
@@ -100,6 +101,39 @@ private void SetupAddAetCommand()
             addCommand.Handler = CommandHandler.Create<MonaiApplicationEntity, IHost, bool, CancellationToken>(AddAeTitlehandlerAsync);
         }
 
+        private void SetupEditAetCommand()
+        {
+            var addCommand = new Command("update", "Update a SCP Application Entities");
+            AddCommand(addCommand);
+
+            var nameOption = new Option<string>(new string[] { "-n", "--name" }, "Name of the SCP Application Entity") { IsRequired = false };
+            addCommand.AddOption(nameOption);
+            var groupingOption = new Option<string>(new string[] { "-g", "--grouping" }, getDefaultValue: () => "0020,000D", "DICOM tag used to group instances") { IsRequired = false };
+            addCommand.AddOption(groupingOption);
+            var timeoutOption = new Option<uint>(new string[] { "-t", "--timeout" }, getDefaultValue: () => 5, "Timeout, in seconds, to wait for instances") { IsRequired = false };
+            addCommand.AddOption(timeoutOption);
+            var workflowsOption = new Option<List<string>>(new string[] { "-w", "--workflows" }, description: "A space separated list of workflow names or IDs to be associated with the SCP AE Title")
+            {
+                AllowMultipleArgumentsPerToken = true,
+                IsRequired = false,
+            };
+            addCommand.AddOption(workflowsOption);
+            var ignoredSopsOption = new Option<List<string>>(new string[] { "-i", "--ignored-sop-classes" }, description: "A space separated list of SOP Class UIDs to be ignored")
+            {
+                AllowMultipleArgumentsPerToken = true,
+                IsRequired = false,
+            };
+            addCommand.AddOption(ignoredSopsOption);
+            var allowedSopsOption = new Option<List<string>>(new string[] { "-s", "--allowed-sop-classes" }, description: "A space separated list of SOP Class UIDs to be accepted")
+            {
+                AllowMultipleArgumentsPerToken = true,
+                IsRequired = false,
+            };
+            addCommand.AddOption(allowedSopsOption);
+
+            addCommand.Handler = CommandHandler.Create<MonaiApplicationEntity, IHost, bool, CancellationToken>(EditAeTitleHandlerAsync);
+        }
+
         private async Task<int> ListAeTitlehandlerAsync(IHost host, bool verbose, CancellationToken cancellationToken)
         {
             Guard.Against.Null(host);
@@ -256,5 +290,58 @@ private async Task<int> AddAeTitlehandlerAsync(MonaiApplicationEntity entity, IH
             }
             return ExitCodes.Success;
         }
+
+        private async Task<int> EditAeTitleHandlerAsync(MonaiApplicationEntity entity, IHost host, bool verbose, CancellationToken cancellationToken)
+        {
+            Guard.Against.Null(entity);
+            Guard.Against.Null(host);
+
+            LogVerbose(verbose, host, "Configuring services...");
+            var configService = host.Services.GetRequiredService<IConfigurationService>();
+            var client = host.Services.GetRequiredService<IInformaticsGatewayClient>();
+            var logger = CreateLogger<DestinationCommand>(host);
+
+            Guard.Against.Null(logger, nameof(logger), "Logger is unavailable.");
+            Guard.Against.Null(configService, nameof(configService), "Configuration service is unavailable.");
+            Guard.Against.Null(client, nameof(client), $"{Strings.ApplicationName} client is unavailable.");
+
+            try
+            {
+                CheckConfiguration(configService);
+                client.ConfigureServiceUris(configService.Configurations.InformaticsGatewayServerUri);
+
+                LogVerbose(verbose, host, $"Connecting to {Strings.ApplicationName} at {configService.Configurations.InformaticsGatewayServerEndpoint}...");
+                LogVerbose(verbose, host, $"Updating SCP AE Title {entity.AeTitle}...");
+                var result = await client.MonaiScpAeTitle.Update(entity, cancellationToken).ConfigureAwait(false);
+
+                logger.MonaiAeTitleUpdated(result.Name, result.AeTitle, result.Grouping, result.Timeout);
+                if (result.Workflows.Any())
+                {
+                    logger.MonaiAeWorkflows(string.Join(',', result.Workflows));
+                    logger.WorkflowWarning();
+                }
+                if (result.IgnoredSopClasses.Any())
+                {
+                    logger.MonaiAeIgnoredSops(string.Join(',', result.IgnoredSopClasses));
+                    logger.IgnoredSopClassesWarning();
+                }
+                if (result.AllowedSopClasses.Any())
+                {
+                    logger.MonaiAeAllowedSops(string.Join(',', result.AllowedSopClasses));
+                    logger.AcceptedSopClassesWarning();
+                }
+            }
+            catch (ConfigurationException ex)
+            {
+                logger.ConfigurationException(ex.Message);
+                return ExitCodes.Config_NotConfigured;
+            }
+            catch (Exception ex)
+            {
+                logger.ErrorUpdatingMonaiApplicationEntity(entity.AeTitle, ex.Message);
+                return ExitCodes.MonaiScp_ErrorUpdate;
+            }
+            return ExitCodes.Success;
+        }
     }
 }
diff --git a/src/CLI/ExitCodes.cs b/src/CLI/ExitCodes.cs
index 52679a7b9..1c3fe80b0 100644
--- a/src/CLI/ExitCodes.cs
+++ b/src/CLI/ExitCodes.cs
@@ -28,6 +28,7 @@ public static class ExitCodes
         public const int MonaiScp_ErrorList = 200;
         public const int MonaiScp_ErrorDelete = 201;
         public const int MonaiScp_ErrorCreate = 202;
+        public const int MonaiScp_ErrorUpdate = 203;
 
         public const int DestinationAe_ErrorList = 300;
         public const int DestinationAe_ErrorDelete = 301;
diff --git a/src/CLI/AssemblyInfo.cs b/src/CLI/InternalVIsibleTo.cs
similarity index 100%
rename from src/CLI/AssemblyInfo.cs
rename to src/CLI/InternalVIsibleTo.cs
diff --git a/src/CLI/Logging/Log.cs b/src/CLI/Logging/Log.cs
index 58b2b9598..156d7d761 100644
--- a/src/CLI/Logging/Log.cs
+++ b/src/CLI/Logging/Log.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 MONAI Consortium
+ * Copyright 2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -181,6 +181,12 @@ public static partial class Log
         [LoggerMessage(EventId = 30059, Level = LogLevel.Critical, Message = "Error updating DICOM source {aeTitle}: {message}")]
         public static partial void ErrorUpdatingDicomSource(this ILogger logger, string aeTitle, string message);
 
+        [LoggerMessage(EventId = 30060, Level = LogLevel.Information, Message = "MONAI Deploy SCP Application Entity updated:\r\n\tName:     {name}\r\n\tAE Title:     {aeTitle}\r\n\tGrouping:     {grouping}\r\n\tTimeout:     {timeout}")]
+        public static partial void MonaiAeTitleUpdated(this ILogger logger, string name, string aeTitle, string grouping, uint timeout);
+
+        [LoggerMessage(EventId = 30061, Level = LogLevel.Critical, Message = "Error updating SCP Application Entity {aeTitle}: {message}")]
+        public static partial void ErrorUpdatingMonaiApplicationEntity(this ILogger logger, string aeTitle, string message);
+
         // Docker Runner
         [LoggerMessage(EventId = 31000, Level = LogLevel.Debug, Message = "Checking for existing {applicationName} ({version}) containers...")]
         public static partial void CheckingExistingAppContainer(this ILogger logger, string applicationName, string version);
diff --git a/src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj b/src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj
index 127f121ee..26e3dc377 100644
--- a/src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj
+++ b/src/CLI/Monai.Deploy.InformaticsGateway.CLI.csproj
@@ -1,4 +1,4 @@
-<!--
+<!--
   ~ Copyright 2021-2022 MONAI Consortium
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,6 +26,7 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
@@ -38,6 +39,10 @@
     <AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-informatics-gateway\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Api\Monai.Deploy.InformaticsGateway.Api.csproj" />
     <ProjectReference Include="..\Client\Monai.Deploy.InformaticsGateway.Client.csproj" />
@@ -51,9 +56,6 @@
   <ItemGroup>
     <PackageReference Include="Crayon" Version="2.0.69" />
     <PackageReference Include="Docker.DotNet" Version="3.125.13" />
-    <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
-        <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
diff --git a/src/CLI/Test/AetCommandTest.cs b/src/CLI/Test/AetCommandTest.cs
index b90c73b9e..86154ba71 100644
--- a/src/CLI/Test/AetCommandTest.cs
+++ b/src/CLI/Test/AetCommandTest.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 MONAI Consortium
+ * Copyright 2021-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -331,5 +331,88 @@ public async Task AetList_Command_Empty()
 
             _logger.VerifyLogging("No MONAI SCP Application Entities configured.", LogLevel.Warning, Times.Once());
         }
+
+        [Fact(DisplayName = "aet update command")]
+        public async Task AetUpdate_Command()
+        {
+            var command = "aet update -n MyName --workflows App MyCoolApp TheApp -i A B C -s D E F";
+            var result = _paser.Parse(command);
+            Assert.Equal(ExitCodes.Success, result.Errors.Count);
+
+            var entity = new MonaiApplicationEntity()
+            {
+                Name = result.CommandResult.Children[0].Tokens[0].Value,
+                AeTitle = "MyAET",
+                Workflows = result.CommandResult.Children[1].Tokens.Select(p => p.Value).ToList(),
+                IgnoredSopClasses = result.CommandResult.Children[2].Tokens.Select(p => p.Value).ToList(),
+                AllowedSopClasses = result.CommandResult.Children[3].Tokens.Select(p => p.Value).ToList(),
+            };
+
+            Assert.Equal("MyName", entity.Name);
+            Assert.Equal("MyAET", entity.AeTitle);
+            Assert.Collection(entity.Workflows,
+                item => item.Equals("App"),
+                item => item.Equals("MyCoolApp"),
+                item => item.Equals("TheApp"));
+            Assert.Collection(entity.AllowedSopClasses,
+                item => item.Equals("D"),
+                item => item.Equals("E"),
+                item => item.Equals("F"));
+            Assert.Collection(entity.IgnoredSopClasses,
+                item => item.Equals("A"),
+                item => item.Equals("B"),
+                item => item.Equals("C"));
+
+            _informaticsGatewayClient.Setup(p => p.MonaiScpAeTitle.Update(It.IsAny<MonaiApplicationEntity>(), It.IsAny<CancellationToken>()))
+                .ReturnsAsync(entity);
+
+            int exitCode = await _paser.InvokeAsync(command);
+
+            Assert.Equal(ExitCodes.Success, exitCode);
+
+            _informaticsGatewayClient.Verify(p => p.ConfigureServiceUris(It.IsAny<Uri>()), Times.Once());
+            _informaticsGatewayClient.Verify(
+                p => p.MonaiScpAeTitle.Update(
+                    It.Is<MonaiApplicationEntity>(o => o.Name == entity.Name &&
+                                                       o.Timeout == entity.Timeout &&
+                                                       o.Grouping == entity.Grouping &&
+                                                       Enumerable.SequenceEqual(o.Workflows, entity.Workflows) &&
+                                                       Enumerable.SequenceEqual(o.AllowedSopClasses, entity.AllowedSopClasses) &&
+                                                       Enumerable.SequenceEqual(o.IgnoredSopClasses, entity.IgnoredSopClasses)),
+                    It.IsAny<CancellationToken>()), Times.Once());
+        }
+
+        [Fact(DisplayName = "aet update command exception")]
+        public async Task AetUpdate_Command_Exception()
+        {
+            var command = "aet update -n MyName --workflows App MyCoolApp TheApp -i A B C -s D E F";
+            _informaticsGatewayClient.Setup(p => p.MonaiScpAeTitle.Update(It.IsAny<MonaiApplicationEntity>(), It.IsAny<CancellationToken>()))
+                .Throws(new Exception("error"));
+
+            int exitCode = await _paser.InvokeAsync(command);
+
+            Assert.Equal(ExitCodes.MonaiScp_ErrorUpdate, exitCode);
+
+            _informaticsGatewayClient.Verify(p => p.ConfigureServiceUris(It.IsAny<Uri>()), Times.Once());
+            _informaticsGatewayClient.Verify(p => p.MonaiScpAeTitle.Update(It.IsAny<MonaiApplicationEntity>(), It.IsAny<CancellationToken>()), Times.Once());
+
+            _logger.VerifyLoggingMessageBeginsWith("Error updating SCP Application Entity", LogLevel.Critical, Times.Once());
+        }
+
+        [Fact(DisplayName = "aet update command configuration exception")]
+        public async Task AetUpdate_Command_ConfigurationException()
+        {
+            var command = "aet update -n MyName --workflows App MyCoolApp TheApp -i A B C -s D E F";
+            _configurationService.SetupGet(p => p.IsInitialized).Returns(false);
+
+            int exitCode = await _paser.InvokeAsync(command);
+
+            Assert.Equal(ExitCodes.Config_NotConfigured, exitCode);
+
+            _informaticsGatewayClient.Verify(p => p.ConfigureServiceUris(It.IsAny<Uri>()), Times.Never());
+            _informaticsGatewayClient.Verify(p => p.DicomDestinations.List(It.IsAny<CancellationToken>()), Times.Never());
+
+            _logger.VerifyLoggingMessageBeginsWith("Please execute `testhost config init` to intialize Informatics Gateway.", LogLevel.Critical, Times.Once());
+        }
     }
 }
diff --git a/src/CLI/packages.lock.json b/src/CLI/packages.lock.json
index ebde1b742..12a72bf98 100644
--- a/src/CLI/packages.lock.json
+++ b/src/CLI/packages.lock.json
@@ -19,12 +19,6 @@
           "System.Threading.Tasks.Extensions": "4.5.4"
         }
       },
-      "GitVersion.MsBuild": {
-        "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
-      },
       "Microsoft.Extensions.Hosting": {
         "type": "Direct",
         "requested": "[6.0.1, )",
diff --git a/src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj b/src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj
index 4d47d403b..feae9df5a 100644
--- a/src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj
+++ b/src/Client.Common/Monai.Deploy.InformaticsGateway.Client.Common.csproj
@@ -24,13 +24,11 @@
     <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
     <CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
-    <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="System.Text.Json" Version="6.0.7" />
   </ItemGroup>
 
@@ -44,4 +42,8 @@
     <AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-informatics-gateway\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Client.Common/packages.lock.json b/src/Client.Common/packages.lock.json
index 8f3d6535a..e3b5be2b0 100644
--- a/src/Client.Common/packages.lock.json
+++ b/src/Client.Common/packages.lock.json
@@ -11,12 +11,6 @@
           "JetBrains.Annotations": "2021.3.0"
         }
       },
-      "GitVersion.MsBuild": {
-        "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
-      },
       "System.Text.Json": {
         "type": "Direct",
         "requested": "[6.0.7, )",
diff --git a/src/Client/AssemblyInfo.cs b/src/Client/InternalVisibleTo.cs
similarity index 100%
rename from src/Client/AssemblyInfo.cs
rename to src/Client/InternalVisibleTo.cs
diff --git a/src/Client/Monai.Deploy.InformaticsGateway.Client.csproj b/src/Client/Monai.Deploy.InformaticsGateway.Client.csproj
index ec8adbd0f..a1121f75b 100644
--- a/src/Client/Monai.Deploy.InformaticsGateway.Client.csproj
+++ b/src/Client/Monai.Deploy.InformaticsGateway.Client.csproj
@@ -22,12 +22,10 @@
     <PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
     <CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
-        <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
   </ItemGroup>
@@ -42,6 +40,10 @@
     <AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-informatics-gateway\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Api\Monai.Deploy.InformaticsGateway.Api.csproj" />
     <ProjectReference Include="..\Client.Common\Monai.Deploy.InformaticsGateway.Client.Common.csproj" />
diff --git a/src/Client/Test/packages.lock.json b/src/Client/Test/packages.lock.json
index caab8b8da..4201ee472 100644
--- a/src/Client/Test/packages.lock.json
+++ b/src/Client/Test/packages.lock.json
@@ -784,32 +784,32 @@
       },
       "MongoDB.Bson": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==",
+        "resolved": "2.19.1",
+        "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==",
         "dependencies": {
           "System.Runtime.CompilerServices.Unsafe": "5.0.0"
         }
       },
       "MongoDB.Driver": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==",
+        "resolved": "2.19.1",
+        "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
-          "MongoDB.Driver.Core": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
+          "MongoDB.Driver.Core": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0"
         }
       },
       "MongoDB.Driver.Core": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==",
+        "resolved": "2.19.1",
+        "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==",
         "dependencies": {
           "AWSSDK.SecurityToken": "3.7.100.14",
           "DnsClient": "1.6.1",
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0",
           "SharpCompress": "0.30.1",
           "Snappier": "1.0.0",
@@ -1789,8 +1789,8 @@
         "type": "Project",
         "dependencies": {
           "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
-          "MongoDB.Driver": "[2.19.0, )",
-          "MongoDB.Driver.Core": "[2.19.0, )"
+          "MongoDB.Driver": "[2.19.1, )",
+          "MongoDB.Driver.Core": "[2.19.1, )"
         }
       },
       "monai.deploy.informaticsgateway.dicomweb.client": {
diff --git a/src/Client/packages.lock.json b/src/Client/packages.lock.json
index 9d38f6c3d..c05865ed2 100644
--- a/src/Client/packages.lock.json
+++ b/src/Client/packages.lock.json
@@ -2,12 +2,6 @@
   "version": 1,
   "dependencies": {
     "net6.0": {
-      "GitVersion.MsBuild": {
-        "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
-      },
       "Microsoft.AspNet.WebApi.Client": {
         "type": "Direct",
         "requested": "[5.2.9, )",
diff --git a/src/Common/Monai.Deploy.InformaticsGateway.Common.csproj b/src/Common/Monai.Deploy.InformaticsGateway.Common.csproj
index 5f6b10313..d3215d280 100644
--- a/src/Common/Monai.Deploy.InformaticsGateway.Common.csproj
+++ b/src/Common/Monai.Deploy.InformaticsGateway.Common.csproj
@@ -1,4 +1,4 @@
-<!--
+<!--
   ~ Copyright 2021-2022 MONAI Consortium
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,14 +25,12 @@
     <ProduceReferenceAssembly>True</ProduceReferenceAssembly>
     <CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
     <PackageReference Include="fo-dicom" Version="5.0.3" />
-    <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="System.IO.Abstractions" Version="17.2.3" />
     <PackageReference Include="System.Threading.Tasks.Dataflow" Version="6.0.0" />
   </ItemGroup>
@@ -47,4 +45,8 @@
     <AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-informatics-gateway\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Common/packages.lock.json b/src/Common/packages.lock.json
index 2f146e49d..b25f865a0 100644
--- a/src/Common/packages.lock.json
+++ b/src/Common/packages.lock.json
@@ -28,12 +28,6 @@
           "System.Threading.Channels": "6.0.0"
         }
       },
-      "GitVersion.MsBuild": {
-        "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
-      },
       "System.IO.Abstractions": {
         "type": "Direct",
         "requested": "[17.2.3, )",
diff --git a/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj b/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj
index 9a5694d3b..60af37d7f 100644
--- a/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj
+++ b/src/Configuration/Monai.Deploy.InformaticsGateway.Configuration.csproj
@@ -23,12 +23,10 @@
     <IsTrimmable>true</IsTrimmable>
     <CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
-        <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.3" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="Monai.Deploy.Messaging" Version="0.1.22" />
@@ -46,6 +44,10 @@
     <AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-informatics-gateway\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Api\Monai.Deploy.InformaticsGateway.Api.csproj" />
     <ProjectReference Include="..\Common\Monai.Deploy.InformaticsGateway.Common.csproj" />
diff --git a/src/Configuration/packages.lock.json b/src/Configuration/packages.lock.json
index c3d3338be..ed42e7206 100644
--- a/src/Configuration/packages.lock.json
+++ b/src/Configuration/packages.lock.json
@@ -2,12 +2,6 @@
   "version": 1,
   "dependencies": {
     "net6.0": {
-      "GitVersion.MsBuild": {
-        "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
-      },
       "Microsoft.Extensions.Logging.Abstractions": {
         "type": "Direct",
         "requested": "[6.0.3, )",
diff --git a/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj b/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj
index 345b6558d..f59211b03 100644
--- a/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj
+++ b/src/Database/Api/Monai.Deploy.InformaticsGateway.Database.Api.csproj
@@ -22,6 +22,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
@@ -30,6 +31,10 @@
     <None Remove="Test\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.15" />
     <PackageReference Include="Polly" Version="7.2.3" />
diff --git a/src/Database/EntityFramework/Configuration/MonaiApplicationEntityConfiguration.cs b/src/Database/EntityFramework/Configuration/MonaiApplicationEntityConfiguration.cs
index 2b2877b53..ecd8edc7b 100644
--- a/src/Database/EntityFramework/Configuration/MonaiApplicationEntityConfiguration.cs
+++ b/src/Database/EntityFramework/Configuration/MonaiApplicationEntityConfiguration.cs
@@ -15,9 +15,6 @@
  * limitations under the License.
  */
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.EntityFrameworkCore;
diff --git a/src/Database/EntityFramework/Migrations/20221215010255_R3_0.3.6.cs b/src/Database/EntityFramework/Migrations/20221215010255_R3_0.3.6.cs
index 2e628e3d9..25e948b29 100644
--- a/src/Database/EntityFramework/Migrations/20221215010255_R3_0.3.6.cs
+++ b/src/Database/EntityFramework/Migrations/20221215010255_R3_0.3.6.cs
@@ -1,5 +1,4 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Migrations;
 
 #nullable disable
 
diff --git a/src/Database/EntityFramework/Migrations/20230327190827_R3_0.3.15.Designer.cs b/src/Database/EntityFramework/Migrations/20230327190827_R3_0.3.15.Designer.cs
new file mode 100644
index 000000000..15035eb70
--- /dev/null
+++ b/src/Database/EntityFramework/Migrations/20230327190827_R3_0.3.15.Designer.cs
@@ -0,0 +1,322 @@
+// <auto-generated />
+using System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+using Monai.Deploy.InformaticsGateway.Database.EntityFramework;
+
+#nullable disable
+
+namespace Monai.Deploy.InformaticsGateway.Database.Migrations
+{
+    [DbContext(typeof(InformaticsGatewayContext))]
+    [Migration("20230327190827_R3_0.3.15")]
+    partial class R3_0315
+    {
+        protected override void BuildTargetModel(ModelBuilder modelBuilder)
+        {
+#pragma warning disable 612, 618
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.15");
+
+            modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.DestinationApplicationEntity", b =>
+                {
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AeTitle")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateTimeCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateTimeUpdated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("HostIp")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("Port")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UpdatedBy")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Name");
+
+                    b.HasIndex(new[] { "Name" }, "idx_destination_name")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "Name", "AeTitle", "HostIp", "Port" }, "idx_source_all")
+                        .IsUnique();
+
+                    b.ToTable("DestinationApplicationEntities");
+                });
+
+            modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.DicomAssociationInfo", b =>
+                {
+                    b.Property<Guid>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CalledAeTitle")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CallingAeTitle")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CorrelationId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateTimeCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateTimeDisconnected")
+                        .HasColumnType("TEXT");
+
+                    b.Property<TimeSpan>("Duration")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Errors")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("FileCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("RemoteHost")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RemotePort")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("DicomAssociationHistories");
+                });
+
+            modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.MonaiApplicationEntity", b =>
+                {
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT")
+                        .HasColumnOrder(0);
+
+                    b.Property<string>("AeTitle")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AllowedSopClasses")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateTimeCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateTimeUpdated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Grouping")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("IgnoredSopClasses")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<uint>("Timeout")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("UpdatedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Workflows")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Name");
+
+                    b.HasIndex(new[] { "Name" }, "idx_monaiae_name")
+                        .IsUnique();
+
+                    b.ToTable("MonaiApplicationEntities");
+                });
+
+            modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Rest.InferenceRequest", b =>
+                {
+                    b.Property<Guid>("InferenceRequestId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateTimeCreated")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InputMetadata")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("InputResources")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("OutputResources")
+                        .HasColumnType("TEXT");
+
+                    b.Property<byte>("Priority")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("State")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("Status")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TransactionId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("TryCount")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("InferenceRequestId");
+
+                    b.HasIndex(new[] { "InferenceRequestId" }, "idx_inferencerequest_inferencerequestid")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "State" }, "idx_inferencerequest_state");
+
+                    b.HasIndex(new[] { "TransactionId" }, "idx_inferencerequest_transactionid")
+                        .IsUnique();
+
+                    b.ToTable("InferenceRequests");
+                });
+
+            modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.SourceApplicationEntity", b =>
+                {
+                    b.Property<string>("Name")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("AeTitle")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CreatedBy")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateTimeCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime?>("DateTimeUpdated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("HostIp")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("UpdatedBy")
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("Name");
+
+                    b.HasIndex(new[] { "Name", "AeTitle", "HostIp" }, "idx_source_all")
+                        .IsUnique()
+                        .HasDatabaseName("idx_source_all1");
+
+                    b.HasIndex(new[] { "Name" }, "idx_source_name")
+                        .IsUnique();
+
+                    b.ToTable("SourceApplicationEntities");
+                });
+
+            modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.Storage.Payload", b =>
+                {
+                    b.Property<Guid>("PayloadId")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("CorrelationId")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateTimeCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Files")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Key")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("MachineName")
+                        .HasColumnType("TEXT");
+
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<int>("State")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<uint>("Timeout")
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("PayloadId");
+
+                    b.HasIndex(new[] { "CorrelationId", "PayloadId" }, "idx_payload_ids")
+                        .IsUnique();
+
+                    b.HasIndex(new[] { "State" }, "idx_payload_state");
+
+                    b.ToTable("Payloads");
+                });
+
+            modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Database.Api.StorageMetadataWrapper", b =>
+                {
+                    b.Property<string>("CorrelationId")
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Identity")
+                        .HasColumnType("TEXT");
+
+                    b.Property<DateTime>("DateTimeCreated")
+                        .HasColumnType("TEXT");
+
+                    b.Property<bool>("IsUploaded")
+                        .HasColumnType("INTEGER");
+
+                    b.Property<string>("TypeName")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.Property<string>("Value")
+                        .IsRequired()
+                        .HasColumnType("TEXT");
+
+                    b.HasKey("CorrelationId", "Identity");
+
+                    b.HasIndex(new[] { "CorrelationId" }, "idx_storagemetadata_correlation");
+
+                    b.HasIndex(new[] { "CorrelationId", "Identity" }, "idx_storagemetadata_ids");
+
+                    b.HasIndex(new[] { "IsUploaded" }, "idx_storagemetadata_uploaded");
+
+                    b.ToTable("StorageMetadataWrapperEntities");
+                });
+#pragma warning restore 612, 618
+        }
+    }
+}
diff --git a/src/Database/EntityFramework/Migrations/20230327190827_R3_0.3.15.cs b/src/Database/EntityFramework/Migrations/20230327190827_R3_0.3.15.cs
new file mode 100644
index 000000000..21919bc5d
--- /dev/null
+++ b/src/Database/EntityFramework/Migrations/20230327190827_R3_0.3.15.cs
@@ -0,0 +1,36 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Monai.Deploy.InformaticsGateway.Database.Migrations
+{
+    public partial class R3_0315 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<DateTime>(
+                name: "DateTimeUpdated",
+                table: "MonaiApplicationEntities",
+                type: "TEXT",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "UpdatedBy",
+                table: "MonaiApplicationEntities",
+                type: "TEXT",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "DateTimeUpdated",
+                table: "MonaiApplicationEntities");
+
+            migrationBuilder.DropColumn(
+                name: "UpdatedBy",
+                table: "MonaiApplicationEntities");
+        }
+    }
+}
diff --git a/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs b/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs
index dcce1e068..cc545bd79 100644
--- a/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs
+++ b/src/Database/EntityFramework/Migrations/InformaticsGatewayContextModelSnapshot.cs
@@ -15,7 +15,7 @@ partial class InformaticsGatewayContextModelSnapshot : ModelSnapshot
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder.HasAnnotation("ProductVersion", "6.0.13");
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.15");
 
             modelBuilder.Entity("Monai.Deploy.InformaticsGateway.Api.DestinationApplicationEntity", b =>
                 {
@@ -122,6 +122,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTime>("DateTimeCreated")
                         .HasColumnType("TEXT");
 
+                    b.Property<DateTime?>("DateTimeUpdated")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("Grouping")
                         .IsRequired()
                         .HasColumnType("TEXT");
@@ -133,6 +136,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<uint>("Timeout")
                         .HasColumnType("INTEGER");
 
+                    b.Property<string>("UpdatedBy")
+                        .HasColumnType("TEXT");
+
                     b.Property<string>("Workflows")
                         .IsRequired()
                         .HasColumnType("TEXT");
diff --git a/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj b/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj
index c6ecf38f8..c4a8d4f04 100644
--- a/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj
+++ b/src/Database/EntityFramework/Monai.Deploy.InformaticsGateway.Database.EntityFramework.csproj
@@ -1,4 +1,4 @@
-<!--
+<!--
   ~ Copyright 2021-2022 MONAI Consortium
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,6 +24,7 @@
     <CodeAnalysisRuleSet>..\..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
     <Nullable>enable</Nullable>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
@@ -36,6 +37,10 @@
     <AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-informatics-gateway\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.15" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.15">
diff --git a/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj b/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj
index 1c65f86d2..fc64c2873 100644
--- a/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj
+++ b/src/Database/Monai.Deploy.InformaticsGateway.Database.csproj
@@ -23,6 +23,7 @@
     <CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <Nullable>enable</Nullable>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
@@ -61,11 +62,12 @@
     <AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-informatics-gateway\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="AspNetCore.HealthChecks.MongoDb" Version="6.0.2" />
-    <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
-        <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.15" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
diff --git a/src/Database/MongoDB/Integration.Test/packages.lock.json b/src/Database/MongoDB/Integration.Test/packages.lock.json
index 67aeb4ed3..e849a980d 100644
--- a/src/Database/MongoDB/Integration.Test/packages.lock.json
+++ b/src/Database/MongoDB/Integration.Test/packages.lock.json
@@ -360,32 +360,32 @@
       },
       "MongoDB.Bson": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==",
+        "resolved": "2.19.1",
+        "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==",
         "dependencies": {
           "System.Runtime.CompilerServices.Unsafe": "5.0.0"
         }
       },
       "MongoDB.Driver": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==",
+        "resolved": "2.19.1",
+        "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
-          "MongoDB.Driver.Core": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
+          "MongoDB.Driver.Core": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0"
         }
       },
       "MongoDB.Driver.Core": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==",
+        "resolved": "2.19.1",
+        "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==",
         "dependencies": {
           "AWSSDK.SecurityToken": "3.7.100.14",
           "DnsClient": "1.6.1",
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0",
           "SharpCompress": "0.30.1",
           "Snappier": "1.0.0",
@@ -1472,8 +1472,8 @@
         "type": "Project",
         "dependencies": {
           "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
-          "MongoDB.Driver": "[2.19.0, )",
-          "MongoDB.Driver.Core": "[2.19.0, )"
+          "MongoDB.Driver": "[2.19.1, )",
+          "MongoDB.Driver.Core": "[2.19.1, )"
         }
       }
     }
diff --git a/src/Database/MongoDB/Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj b/src/Database/MongoDB/Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj
index 61d9a8158..73a94a27f 100644
--- a/src/Database/MongoDB/Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj
+++ b/src/Database/MongoDB/Monai.Deploy.InformaticsGateway.Database.MongoDB.csproj
@@ -24,6 +24,7 @@
     <CodeAnalysisRuleSet>..\..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
     <Nullable>enable</Nullable>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
@@ -37,8 +38,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.19.0" />
-    <PackageReference Include="MongoDB.Driver.Core" Version="2.19.0" />
+    <Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="MongoDB.Driver" Version="2.19.1" />
+    <PackageReference Include="MongoDB.Driver.Core" Version="2.19.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Database/MongoDB/packages.lock.json b/src/Database/MongoDB/packages.lock.json
index 69ffca502..09b6a78e4 100644
--- a/src/Database/MongoDB/packages.lock.json
+++ b/src/Database/MongoDB/packages.lock.json
@@ -4,26 +4,26 @@
     "net6.0": {
       "MongoDB.Driver": {
         "type": "Direct",
-        "requested": "[2.19.0, )",
-        "resolved": "2.19.0",
-        "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==",
+        "requested": "[2.19.1, )",
+        "resolved": "2.19.1",
+        "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
-          "MongoDB.Driver.Core": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
+          "MongoDB.Driver.Core": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0"
         }
       },
       "MongoDB.Driver.Core": {
         "type": "Direct",
-        "requested": "[2.19.0, )",
-        "resolved": "2.19.0",
-        "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==",
+        "requested": "[2.19.1, )",
+        "resolved": "2.19.1",
+        "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==",
         "dependencies": {
           "AWSSDK.SecurityToken": "3.7.100.14",
           "DnsClient": "1.6.1",
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0",
           "SharpCompress": "0.30.1",
           "Snappier": "1.0.0",
@@ -292,8 +292,8 @@
       },
       "MongoDB.Bson": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==",
+        "resolved": "2.19.1",
+        "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==",
         "dependencies": {
           "System.Runtime.CompilerServices.Unsafe": "5.0.0"
         }
diff --git a/src/Database/packages.lock.json b/src/Database/packages.lock.json
index 433474189..2627faa1c 100644
--- a/src/Database/packages.lock.json
+++ b/src/Database/packages.lock.json
@@ -12,12 +12,6 @@
           "MongoDB.Driver": "2.14.1"
         }
       },
-      "GitVersion.MsBuild": {
-        "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
-      },
       "Microsoft.EntityFrameworkCore": {
         "type": "Direct",
         "requested": "[6.0.15, )",
@@ -402,32 +396,32 @@
       },
       "MongoDB.Bson": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==",
+        "resolved": "2.19.1",
+        "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==",
         "dependencies": {
           "System.Runtime.CompilerServices.Unsafe": "5.0.0"
         }
       },
       "MongoDB.Driver": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==",
+        "resolved": "2.19.1",
+        "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
-          "MongoDB.Driver.Core": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
+          "MongoDB.Driver.Core": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0"
         }
       },
       "MongoDB.Driver.Core": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==",
+        "resolved": "2.19.1",
+        "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==",
         "dependencies": {
           "AWSSDK.SecurityToken": "3.7.100.14",
           "DnsClient": "1.6.1",
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0",
           "SharpCompress": "0.30.1",
           "Snappier": "1.0.0",
@@ -642,8 +636,8 @@
         "type": "Project",
         "dependencies": {
           "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
-          "MongoDB.Driver": "[2.19.0, )",
-          "MongoDB.Driver.Core": "[2.19.0, )"
+          "MongoDB.Driver": "[2.19.1, )",
+          "MongoDB.Driver.Core": "[2.19.1, )"
         }
       }
     }
diff --git a/src/DicomWebClient/CLI/Monai.Deploy.InformaticsGateway.DicomWeb.Client.CLI.csproj b/src/DicomWebClient/CLI/Monai.Deploy.InformaticsGateway.DicomWeb.Client.CLI.csproj
index c9daddab8..ef693bdf8 100644
--- a/src/DicomWebClient/CLI/Monai.Deploy.InformaticsGateway.DicomWeb.Client.CLI.csproj
+++ b/src/DicomWebClient/CLI/Monai.Deploy.InformaticsGateway.DicomWeb.Client.CLI.csproj
@@ -18,12 +18,17 @@
     <PublishReadyToRun>true</PublishReadyToRun>
     <CodeAnalysisRuleSet>..\..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
     <AdditionalFiles Include="..\..\.sonarlint\project-monai_monai-deploy-informatics-gateway\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\Client.Common\Monai.Deploy.InformaticsGateway.Client.Common.csproj" />
     <ProjectReference Include="..\Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj" />
diff --git a/src/DicomWebClient/AssemblyInfo.cs b/src/DicomWebClient/InternalVisibleTo.cs
similarity index 100%
rename from src/DicomWebClient/AssemblyInfo.cs
rename to src/DicomWebClient/InternalVisibleTo.cs
diff --git a/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj b/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj
index 8174123d1..8aeb062df 100644
--- a/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj
+++ b/src/DicomWebClient/Monai.Deploy.InformaticsGateway.DicomWeb.Client.csproj
@@ -24,6 +24,7 @@
     <IsTrimmable>true</IsTrimmable>
     <CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
@@ -42,12 +43,13 @@
     <AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-informatics-gateway\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Ardalis.GuardClauses" Version="4.0.1" />
     <PackageReference Include="fo-dicom" Version="5.0.3" />
-    <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
     <PackageReference Include="Microsoft.Net.Http.Headers" Version="2.2.8" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
diff --git a/src/DicomWebClient/packages.lock.json b/src/DicomWebClient/packages.lock.json
index f5518ba5f..de6c58765 100644
--- a/src/DicomWebClient/packages.lock.json
+++ b/src/DicomWebClient/packages.lock.json
@@ -28,12 +28,6 @@
           "System.Threading.Channels": "6.0.0"
         }
       },
-      "GitVersion.MsBuild": {
-        "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
-      },
       "Microsoft.AspNet.WebApi.Client": {
         "type": "Direct",
         "requested": "[5.2.9, )",
diff --git a/src/InformaticsGateway/AssemblyInfo.cs b/src/InformaticsGateway/InternalVisibleTo.cs
similarity index 100%
rename from src/InformaticsGateway/AssemblyInfo.cs
rename to src/InformaticsGateway/InternalVisibleTo.cs
diff --git a/src/InformaticsGateway/Logging/Log.100.200.ScpService.cs b/src/InformaticsGateway/Logging/Log.100.200.ScpService.cs
index fd183f978..a2f6937cf 100644
--- a/src/InformaticsGateway/Logging/Log.100.200.ScpService.cs
+++ b/src/InformaticsGateway/Logging/Log.100.200.ScpService.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 MONAI Consortium
+ * Copyright 2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,6 +58,9 @@ public static partial class Log
         [LoggerMessage(EventId = 112, Level = LogLevel.Information, Message = "Notifying {count} observers of MONAI Application Entity {eventType}.")]
         public static partial void NotifyAeChanged(this ILogger logger, int count, ChangedEventType eventType);
 
+        [LoggerMessage(EventId = 113, Level = LogLevel.Error, Message = "Failed to update Application Entity Handler with updated AE Title {aeTitle}.")]
+        public static partial void FailedToUpdateAppliationEntityHandlerWithUpdatedAEChange(this ILogger logger, string aeTitle, Exception ex = null);
+
         // SCP Service
         [LoggerMessage(EventId = 200, Level = LogLevel.Information, Message = "Initializing SCP Service at port {port}...")]
         public static partial void ScpServiceLoading(this ILogger logger, int port);
diff --git a/src/InformaticsGateway/Logging/Log.3000.PayloadAssembler.cs b/src/InformaticsGateway/Logging/Log.3000.PayloadAssembler.cs
index 678ba4245..4a0aff069 100644
--- a/src/InformaticsGateway/Logging/Log.3000.PayloadAssembler.cs
+++ b/src/InformaticsGateway/Logging/Log.3000.PayloadAssembler.cs
@@ -33,8 +33,8 @@ public static partial class Log
         [LoggerMessage(EventId = 3004, Level = LogLevel.Trace, Message = "Number of incomplete payloads waiting for processing: {count}.")]
         public static partial void BucketsActive(this ILogger logger, int count);
 
-        [LoggerMessage(EventId = 3005, Level = LogLevel.Trace, Message = "Checking elapsed time for bucket: {key}.")]
-        public static partial void BucketElapsedTime(this ILogger logger, string key);
+        [LoggerMessage(EventId = 3005, Level = LogLevel.Trace, Message = "Checking elapsed time for bucket: {key} with timeout set to {timeout}s. Elapsed {elapsed}s with {failedFiles} failures out of {totalNumberOfFiles}.")]
+        public static partial void BucketElapsedTime(this ILogger logger, string key, uint timeout, double elapsed, int totalNumberOfFiles, int failedFiles);
 
         [LoggerMessage(EventId = 3007, Level = LogLevel.Information, Message = "Bucket {key} sent to processing queue with {count} files.")]
         public static partial void BucketReady(this ILogger logger, string key, int count);
diff --git a/src/InformaticsGateway/Logging/Log.4000.ObjectUploadService.cs b/src/InformaticsGateway/Logging/Log.4000.ObjectUploadService.cs
index 316e941bd..e75d85a44 100644
--- a/src/InformaticsGateway/Logging/Log.4000.ObjectUploadService.cs
+++ b/src/InformaticsGateway/Logging/Log.4000.ObjectUploadService.cs
@@ -36,7 +36,7 @@ public static partial class Log
         [LoggerMessage(EventId = 4004, Level = LogLevel.Debug, Message = "Error removing objects that are pending upload during startup.")]
         public static partial void ErrorRemovingPendingUploadObjects(this ILogger logger, Exception ex);
 
-        [LoggerMessage(EventId = 4005, Level = LogLevel.Debug, Message = "Error uploading temporary store. Waiting {timeSpan} before next retry. Retry attempt {retryCount}.")]
+        [LoggerMessage(EventId = 4005, Level = LogLevel.Error, Message = "Error uploading temporary store. Waiting {timeSpan} before next retry. Retry attempt {retryCount}.")]
         public static partial void ErrorUploadingFileToTemporaryStore(this ILogger logger, TimeSpan timespan, int retryCount, Exception ex);
 
         [LoggerMessage(EventId = 4006, Level = LogLevel.Information, Message = "File uploaded to temporary store at {filePath}.")]
diff --git a/src/InformaticsGateway/Logging/Log.8000.HttpServices.cs b/src/InformaticsGateway/Logging/Log.8000.HttpServices.cs
index b52f0eb9e..9976813d5 100644
--- a/src/InformaticsGateway/Logging/Log.8000.HttpServices.cs
+++ b/src/InformaticsGateway/Logging/Log.8000.HttpServices.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 MONAI Consortium
+ * Copyright 2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -39,6 +39,10 @@ public static partial class Log
         [LoggerMessage(EventId = 8004, Level = LogLevel.Information, Message = "MONAI SCP Application Entity deleted {name}.")]
         public static partial void MonaiApplicationEntityDeleted(this ILogger logger, string name);
 
+        [LoggerMessage(EventId = 8005, Level = LogLevel.Information, Message = "MONAI SCP AE Title {name} updated AE Title={aeTitle}.")]
+        public static partial void MonaiApplicationEntityUpdated(this ILogger logger, string name, string aeTitle);
+
+
         // Destination AE Title Controller
         [LoggerMessage(EventId = 8010, Level = LogLevel.Information, Message = "DICOM destination added AE Title={aeTitle}, Host/IP={hostIp}.")]
         public static partial void DestinationApplicationEntityAdded(this ILogger logger, string aeTitle, string hostIp);
diff --git a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj
index 7c3e666eb..a687f2cf0 100644
--- a/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj
+++ b/src/InformaticsGateway/Monai.Deploy.InformaticsGateway.csproj
@@ -1,4 +1,4 @@
-<!--
+<!--
   ~ Copyright 2022 MONAI Consortium
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -27,6 +27,7 @@
     <CodeAnalysisRuleSet>..\.sonarlint\project-monai_monai-deploy-informatics-gatewaycsharp.ruleset</CodeAnalysisRuleSet>
     <RestorePackagesWithLockFile>true</RestorePackagesWithLockFile>
     <UserSecretsId>be0fffc8-bebb-4509-a2c0-3c981e5415ab</UserSecretsId>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
   <ItemGroup>
@@ -40,9 +41,6 @@
     <PackageReference Include="fo-dicom.NLog" Version="5.0.3" />
     <PackageReference Include="Karambolo.Extensions.Logging.File" Version="3.4.0" />
     <PackageReference Include="HL7-dotnetcore" Version="2.35.0" />
-    <PackageReference Include="GitVersion.MsBuild" Version="5.12.0">
-      <PrivateAssets>All</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.15" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions" Version="6.0.15" />
@@ -77,6 +75,10 @@
     <AdditionalFiles Include="..\.sonarlint\project-monai_monai-deploy-informatics-gateway\CSharp\SonarLint.xml" Link="SonarLint.xml" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Include="..\AssemblyInfo.cs" Link="AssemblyInfo.cs" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Api\Monai.Deploy.InformaticsGateway.Api.csproj" />
     <ProjectReference Include="..\Common\Monai.Deploy.InformaticsGateway.Common.csproj" />
diff --git a/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs b/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs
index 92609997e..e3d0b0153 100644
--- a/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs
+++ b/src/InformaticsGateway/Services/Connectors/PayloadAssembler.cs
@@ -132,10 +132,10 @@ private async void OnTimedEvent(Object source, System.Timers.ElapsedEventArgs e)
                 }
                 foreach (var key in _payloads.Keys)
                 {
-                    _logger.BucketElapsedTime(key);
                     var payload = await _payloads[key].Task.ConfigureAwait(false);
                     using var loggerScope = _logger.BeginScope(new LoggingDataDictionary<string, object> { { "CorrelationId", payload.CorrelationId } });
 
+                    _logger.BucketElapsedTime(key, payload.Timeout, payload.ElapsedTime().TotalSeconds, payload.Files.Count, payload.FilesFailedToUpload);
                     // Wait for timer window closes before sending payload for processing
                     if (payload.HasTimedOut)
                     {
diff --git a/src/InformaticsGateway/Services/Connectors/PayloadExtensions.cs b/src/InformaticsGateway/Services/Connectors/PayloadExtensions.cs
index b6ac12e4e..0a22006a8 100644
--- a/src/InformaticsGateway/Services/Connectors/PayloadExtensions.cs
+++ b/src/InformaticsGateway/Services/Connectors/PayloadExtensions.cs
@@ -30,7 +30,7 @@ public static bool IsUploadCompleted(this Payload payload)
 
         public static bool IsUploadCompletedWithFailures(this Payload payload)
         {
-            return payload.Files.Count(p => p.IsUploadFailed) + payload.Files.Count(p => p.IsUploaded) == payload.Count; ;
+            return (payload.FilesFailedToUpload + payload.FilesUploaded) == payload.Count; ;
         }
 
         public static bool IsMoveCompleted(this Payload payload)
diff --git a/src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs b/src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs
index 03b6c6e88..dd74bd426 100644
--- a/src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs
+++ b/src/InformaticsGateway/Services/Http/MonaiAeTitleController.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 MONAI Consortium
+ * Copyright 2021-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -104,10 +104,10 @@ public async Task<ActionResult<MonaiApplicationEntity>> Create(MonaiApplicationE
         {
             try
             {
-                await ValidateAsync(item).ConfigureAwait(false);
+                await ValidateCreateAsync(item).ConfigureAwait(false);
 
                 item.SetDefaultValues();
-                item.SetAuthor(User);
+                item.SetAuthor(User, EditMode.Create);
 
                 await _repository.AddAsync(item, HttpContext.RequestAborted).ConfigureAwait(false);
                 _monaiAeChangedNotificationService.Notify(new MonaiApplicationentityChangedEvent(item, ChangedEventType.Added));
@@ -129,6 +129,53 @@ public async Task<ActionResult<MonaiApplicationEntity>> Create(MonaiApplicationE
             }
         }
 
+        [HttpPut]
+        [Produces("application/json")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesResponseType(StatusCodes.Status500InternalServerError)]
+        public async Task<ActionResult<MonaiApplicationEntity>> Edit(MonaiApplicationEntity item)
+        {
+            try
+            {
+                if (item is null)
+                {
+                    return NotFound();
+                }
+
+                var applicationEntity = await _repository.FindByNameAsync(item.Name, HttpContext.RequestAborted).ConfigureAwait(false);
+                if (applicationEntity is null)
+                {
+                    return NotFound();
+                }
+
+                item.SetDefaultValues();
+
+                applicationEntity.AllowedSopClasses = item.AllowedSopClasses;
+                applicationEntity.Grouping = item.Grouping;
+                applicationEntity.Timeout = item.Timeout;
+                applicationEntity.IgnoredSopClasses = item.IgnoredSopClasses ?? new List<string>();
+                applicationEntity.Workflows = item.Workflows ?? new List<string>();
+                applicationEntity.SetAuthor(User, EditMode.Update);
+
+                await ValidateUpdateAsync(applicationEntity).ConfigureAwait(false);
+
+                _ = _repository.UpdateAsync(applicationEntity, HttpContext.RequestAborted);
+                _monaiAeChangedNotificationService.Notify(new MonaiApplicationentityChangedEvent(applicationEntity, ChangedEventType.Updated));
+                _logger.MonaiApplicationEntityUpdated(item.Name, item.AeTitle);
+                return Ok(applicationEntity);
+            }
+            catch (ConfigurationException ex)
+            {
+                return Problem(title: "Validation error.", statusCode: (int)System.Net.HttpStatusCode.BadRequest, detail: ex.Message);
+            }
+            catch (Exception ex)
+            {
+                _logger.ErrorDeletingMonaiApplicationEntity(ex);
+                return Problem(title: "Error updating MONAI Application Entity.", statusCode: StatusCodes.Status500InternalServerError, detail: ex.Message);
+            }
+        }
+
         [HttpDelete("{name}")]
         [Produces("application/json")]
         [ProducesResponseType(StatusCodes.Status200OK)]
@@ -157,7 +204,7 @@ public async Task<ActionResult<MonaiApplicationEntity>> Delete(string name)
             }
         }
 
-        private async Task ValidateAsync(MonaiApplicationEntity item)
+        private async Task ValidateCreateAsync(MonaiApplicationEntity item)
         {
             Guard.Against.Null(item);
 
@@ -178,5 +225,17 @@ private async Task ValidateAsync(MonaiApplicationEntity item)
                 throw new ConfigurationException(string.Join(Environment.NewLine, validationErrors));
             }
         }
+
+        private async Task ValidateUpdateAsync(MonaiApplicationEntity item)
+        {
+            if (await _repository.ContainsAsync(p => !p.Name.Equals(item.Name) && p.AeTitle.Equals(item.AeTitle), HttpContext.RequestAborted).ConfigureAwait(false))
+            {
+                throw new ObjectExistsException($"A MONAI Application Entity with the same AE Title '{item.AeTitle}' already exists.");
+            }
+            if (!item.IsValid(out var validationErrors))
+            {
+                throw new ConfigurationException(string.Join(Environment.NewLine, validationErrors));
+            }
+        }
     }
 }
diff --git a/src/InformaticsGateway/Services/Scp/ApplicationEntityHandler.cs b/src/InformaticsGateway/Services/Scp/ApplicationEntityHandler.cs
index 52f803eee..34d7337ff 100644
--- a/src/InformaticsGateway/Services/Scp/ApplicationEntityHandler.cs
+++ b/src/InformaticsGateway/Services/Scp/ApplicationEntityHandler.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 MONAI Consortium
+ * Copyright 2021-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -35,6 +35,7 @@ namespace Monai.Deploy.InformaticsGateway.Services.Scp
 {
     internal class ApplicationEntityHandler : IDisposable, IApplicationEntityHandler
     {
+        private readonly object _lock = new object();
         private readonly ILogger<ApplicationEntityHandler> _logger;
         private readonly IOptions<InformaticsGatewayConfiguration> _options;
 
@@ -66,9 +67,19 @@ public void Configure(MonaiApplicationEntity monaiApplicationEntity, DicomJsonOp
         {
             Guard.Against.Null(monaiApplicationEntity);
 
-            _configuration = monaiApplicationEntity;
-            _dicomJsonOptions = dicomJsonOptions;
-            _validateDicomValueOnJsonSerialization = validateDicomValuesOnJsonSerialization;
+            if (_configuration is not null &&
+                (_configuration.Name != monaiApplicationEntity.Name ||
+                 _configuration.AeTitle != monaiApplicationEntity.AeTitle))
+            {
+                throw new InvalidOperationException("Cannot update existing Application Entity Handler with different AE Title");
+            }
+
+            lock (_lock)
+            {
+                _configuration = monaiApplicationEntity;
+                _dicomJsonOptions = dicomJsonOptions;
+                _validateDicomValueOnJsonSerialization = validateDicomValuesOnJsonSerialization;
+            }
         }
 
         public async Task HandleInstanceAsync(DicomCStoreRequest request, string calledAeTitle, string callingAeTitle, Guid associationId, StudySerieSopUids uids)
diff --git a/src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs b/src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs
index 8d7c37e44..1e6c777de 100644
--- a/src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs
+++ b/src/InformaticsGateway/Services/Scp/ApplicationEntityManager.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 MONAI Consortium
+ * Copyright 2021-2023 MONAI Consortium
  * Copyright 2019-2021 NVIDIA Corporation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -171,6 +171,25 @@ private void AddNewAeTitle(MonaiApplicationEntity entity)
             }
         }
 
+        private void UpdateAeTitle(MonaiApplicationEntity applicationEntity)
+        {
+            if (_aeTitles.TryGetValue(applicationEntity.AeTitle, out var aeHandler))
+            {
+                try
+                {
+                    aeHandler.Configure(applicationEntity, Configuration.Value.Dicom.WriteDicomJson, Configuration.Value.Dicom.ValidateDicomOnSerialization);
+                }
+                catch (Exception ex)
+                {
+                    _logger.FailedToUpdateAppliationEntityHandlerWithUpdatedAEChange(applicationEntity.AeTitle, ex);
+                }
+            }
+            else
+            {
+                _logger.FailedToUpdateAppliationEntityHandlerWithUpdatedAEChange(applicationEntity.AeTitle);
+            }
+        }
+
         public void OnCompleted()
         {
             // noop
@@ -191,6 +210,10 @@ public void OnNext(MonaiApplicationentityChangedEvent applicationChangedEvent)
                     AddNewAeTitle(applicationChangedEvent.ApplicationEntity);
                     break;
 
+                case ChangedEventType.Updated:
+                    UpdateAeTitle(applicationChangedEvent.ApplicationEntity);
+                    break;
+
                 case ChangedEventType.Deleted:
                     _ = _aeTitles.TryRemove(applicationChangedEvent.ApplicationEntity.AeTitle, out _);
                     _logger.AeTitleRemoved(applicationChangedEvent.ApplicationEntity.AeTitle);
diff --git a/src/InformaticsGateway/Test/Services/Http/MonaiAeTitleControllerTest.cs b/src/InformaticsGateway/Test/Services/Http/MonaiAeTitleControllerTest.cs
index 230e192eb..3f97efea1 100644
--- a/src/InformaticsGateway/Test/Services/Http/MonaiAeTitleControllerTest.cs
+++ b/src/InformaticsGateway/Test/Services/Http/MonaiAeTitleControllerTest.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 MONAI Consortium
+ * Copyright 2021-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -184,7 +184,7 @@ public async Task GetAeTitle_ShallReturnProblemOnFailure()
 
         #region Create
 
-        [Fact(DisplayName = "Create - Shall return Conflict if entity already exists")]
+        [RetryFact(DisplayName = "Create - Shall return Conflict if entity already exists")]
         public async Task Create_ShallReturnConflictIfIEntityAlreadyExists()
         {
             _repository.Setup(p => p.ContainsAsync(It.IsAny<Expression<Func<MonaiApplicationEntity, bool>>>(), It.IsAny<CancellationToken>())).ReturnsAsync(true);
@@ -230,7 +230,7 @@ public async Task Create_ShallReturnBadRequestOnValidationFailure()
             Assert.Equal((int)HttpStatusCode.BadRequest, problem.Status);
         }
 
-        [RetryFact(DisplayName = "Create - Shall return BadRequest when both allowed & ignored SOP classes are defined")]
+        [Fact(DisplayName = "Create - Shall return BadRequest when both allowed & ignored SOP classes are defined")]
         public async Task Create_ShallReturnBadRequestWhenBothAllowedAndIgnoredSopsAreDefined()
         {
             _repository.Setup(p => p.ContainsAsync(It.IsAny<Expression<Func<MonaiApplicationEntity, bool>>>(), It.IsAny<CancellationToken>())).ReturnsAsync(false);
@@ -300,12 +300,186 @@ public async Task Create_ShallReturnCreatedAtAction()
 
             Assert.IsType<CreatedAtActionResult>(result.Result);
 
-            _aeChangedNotificationService.Verify(p => p.Notify(It.Is<MonaiApplicationentityChangedEvent>(x => x.ApplicationEntity == monaiAeTitle)), Times.Once());
+            _aeChangedNotificationService.Verify(p => p.Notify(It.Is<MonaiApplicationentityChangedEvent>(x => x.ApplicationEntity == monaiAeTitle && x.Event == ChangedEventType.Added)), Times.Once());
             _repository.Verify(p => p.AddAsync(It.Is<MonaiApplicationEntity>(p => p.CreatedBy == TestUsername), It.IsAny<CancellationToken>()), Times.Once());
         }
 
         #endregion Create
 
+        #region Update
+        [RetryFact(DisplayName = "Update - Shall return updated")]
+        public async Task Update_ReturnsUpdated()
+        {
+            var entity = new MonaiApplicationEntity
+            {
+                AeTitle = "AET",
+                Name = "AET",
+                Grouping = "0020,000E",
+                Timeout = 100,
+                Workflows = new List<string> { "1", "2", "3" },
+                AllowedSopClasses = new List<string> { "1.2.3" },
+                IgnoredSopClasses = new List<string> { "a.b.c" },
+            };
+
+            _repository.Setup(p => p.FindByNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(entity));
+            _repository.Setup(p => p.UpdateAsync(It.IsAny<MonaiApplicationEntity>(), It.IsAny<CancellationToken>()));
+
+            var result = await _controller.Edit(entity);
+            var okResult = result.Result as OkObjectResult;
+            Assert.Equal(StatusCodes.Status200OK, okResult.StatusCode);
+            var updatedEntity = okResult.Value as MonaiApplicationEntity;
+
+            Assert.Equal(entity.AeTitle, updatedEntity.AeTitle);
+            Assert.Equal(entity.Name, updatedEntity.Name);
+            Assert.Equal(entity.Grouping, updatedEntity.Grouping);
+            Assert.Equal(entity.Timeout, updatedEntity.Timeout);
+            Assert.Equal(entity.Workflows, updatedEntity.Workflows);
+            Assert.Equal(entity.AllowedSopClasses, updatedEntity.AllowedSopClasses);
+            Assert.Equal(entity.IgnoredSopClasses, updatedEntity.IgnoredSopClasses);
+            Assert.NotNull(updatedEntity.DateTimeUpdated);
+            Assert.Equal(TestUsername, updatedEntity.UpdatedBy);
+
+            _aeChangedNotificationService.Verify(p => p.Notify(It.Is<MonaiApplicationentityChangedEvent>(x => x.ApplicationEntity == updatedEntity && x.Event == ChangedEventType.Updated)), Times.Once());
+            _repository.Verify(p => p.FindByNameAsync(entity.Name, It.IsAny<CancellationToken>()), Times.Once());
+            _repository.Verify(p => p.UpdateAsync(entity, It.IsAny<CancellationToken>()), Times.Once());
+        }
+
+        [RetryFact(DisplayName = "Update - Shall return updated without updating AE Title")]
+        public async Task Update_ReturnsUpdated_WithoutUpdatingAET()
+        {
+            var originalEntity = new MonaiApplicationEntity
+            {
+                AeTitle = "AET",
+                Name = "AET",
+                Grouping = "0020,000E",
+                Timeout = 100,
+                Workflows = new List<string> { "1", "2", "3" },
+                AllowedSopClasses = new List<string> { "1.2.3" },
+                IgnoredSopClasses = new List<string> { "a.b.c" },
+            };
+
+            var entity = new MonaiApplicationEntity
+            {
+                AeTitle = "SHOUD-NOT-CHANGE",
+                Name = "AET",
+                Grouping = "0020,000D",
+                Timeout = 10,
+                Workflows = new List<string> { "1", "2" },
+                AllowedSopClasses = new List<string> { "1.2" },
+                IgnoredSopClasses = new List<string> { "a.b" },
+            };
+
+            _repository.Setup(p => p.FindByNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(originalEntity));
+            _repository.Setup(p => p.UpdateAsync(It.IsAny<MonaiApplicationEntity>(), It.IsAny<CancellationToken>()));
+
+            var result = await _controller.Edit(entity);
+            var okResult = result.Result as OkObjectResult;
+            Assert.Equal(StatusCodes.Status200OK, okResult.StatusCode);
+            var updatedEntity = okResult.Value as MonaiApplicationEntity;
+
+            Assert.NotEqual(entity.AeTitle, updatedEntity.AeTitle);
+            Assert.Equal(originalEntity.AeTitle, updatedEntity.AeTitle);
+            Assert.Equal(entity.Name, updatedEntity.Name);
+            Assert.Equal(entity.Grouping, updatedEntity.Grouping);
+            Assert.Equal(entity.Timeout, updatedEntity.Timeout);
+            Assert.Equal(entity.Workflows, updatedEntity.Workflows);
+            Assert.Equal(entity.AllowedSopClasses, updatedEntity.AllowedSopClasses);
+            Assert.Equal(entity.IgnoredSopClasses, updatedEntity.IgnoredSopClasses);
+            Assert.NotNull(updatedEntity.DateTimeUpdated);
+            Assert.Equal(TestUsername, updatedEntity.UpdatedBy);
+
+            _aeChangedNotificationService.Verify(p => p.Notify(It.Is<MonaiApplicationentityChangedEvent>(x => x.ApplicationEntity == updatedEntity && x.Event == ChangedEventType.Updated)), Times.Once());
+            _repository.Verify(p => p.FindByNameAsync(entity.Name, It.IsAny<CancellationToken>()), Times.Once());
+            _repository.Verify(p => p.UpdateAsync(updatedEntity, It.IsAny<CancellationToken>()), Times.Once());
+        }
+
+        [RetryFact(5, 250, DisplayName = "Update - Shall return 404 if input is null")]
+        public async Task Update_Returns404IfInputIsNull()
+        {
+            var result = await _controller.Edit(null);
+
+            Assert.IsType<NotFoundResult>(result.Result);
+        }
+
+        [RetryFact(5, 250, DisplayName = "Update - Shall return 404 if not found")]
+        public async Task Update_Returns404IfNotFound()
+        {
+            var entity = new MonaiApplicationEntity
+            {
+                AeTitle = "AET",
+                Name = "AET",
+                Grouping = "ABC",
+                Timeout = 100,
+                Workflows = new List<string> { "1", "2", "3" },
+                AllowedSopClasses = new List<string> { "1.2.3" },
+                IgnoredSopClasses = new List<string> { "a.b.c" },
+            };
+            _repository.Setup(p => p.FindByNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(default(MonaiApplicationEntity)));
+
+            var result = await _controller.Edit(entity);
+
+            Assert.IsType<NotFoundResult>(result.Result);
+            _repository.Verify(p => p.FindByNameAsync(entity.Name, It.IsAny<CancellationToken>()), Times.Once());
+        }
+
+        [RetryFact(5, 250, DisplayName = "Update - Shall return problem on failure")]
+        public async Task Update_ShallReturnProblemOnFailure()
+        {
+            var value = "AET";
+            var entity = new MonaiApplicationEntity
+            {
+                AeTitle = value,
+                Name = "AET",
+                Grouping = "0020,000E",
+                Timeout = 100,
+                Workflows = new List<string> { "1", "2", "3" },
+                AllowedSopClasses = new List<string> { "1.2.3" },
+                IgnoredSopClasses = new List<string> { "a.b.c" },
+            };
+            _repository.Setup(p => p.FindByNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(entity));
+            _repository.Setup(p => p.UpdateAsync(It.IsAny<MonaiApplicationEntity>(), It.IsAny<CancellationToken>())).Throws(new Exception("error"));
+
+            var result = await _controller.Edit(entity);
+
+            var objectResult = result.Result as ObjectResult;
+            Assert.NotNull(objectResult);
+            var problem = objectResult.Value as ProblemDetails;
+            Assert.NotNull(problem);
+            Assert.Equal("Error updating MONAI Application Entity.", problem.Title);
+            Assert.Equal("error", problem.Detail);
+            Assert.Equal((int)HttpStatusCode.InternalServerError, problem.Status);
+            _repository.Verify(p => p.FindByNameAsync(value, It.IsAny<CancellationToken>()), Times.Once());
+        }
+
+        [RetryFact(5, 250, DisplayName = "Update - Shall return problem on validation failure")]
+        public async Task Update_ShallReturnBadRequestWithBadAeTitle()
+        {
+            var aeTitle = "TOOOOOOOOOOOOOOOOOOOOOOOLONG";
+            var entity = new MonaiApplicationEntity
+            {
+                AeTitle = aeTitle,
+                Name = "AET",
+                Grouping = "0020,000E",
+                Timeout = 100,
+                Workflows = new List<string> { "1", "2", "3" },
+                AllowedSopClasses = new List<string> { "1.2.3" },
+                IgnoredSopClasses = new List<string> { "a.b.c" },
+            };
+
+            _repository.Setup(p => p.FindByNameAsync(It.IsAny<string>(), It.IsAny<CancellationToken>())).Returns(Task.FromResult(entity));
+            var result = await _controller.Edit(entity);
+
+            var objectResult = result.Result as ObjectResult;
+            Assert.NotNull(objectResult);
+            var problem = objectResult.Value as ProblemDetails;
+            Assert.NotNull(problem);
+            Assert.Equal("Validation error.", problem.Title);
+            Assert.Equal($"'{aeTitle}' is not a valid AE Title (source: MonaiApplicationEntity).", problem.Detail);
+            Assert.Equal((int)HttpStatusCode.BadRequest, problem.Status);
+        }
+
+        #endregion Update
+
         #region Delete
 
         [RetryFact(5, 250, DisplayName = "Delete - Shall return deleted object")]
@@ -326,6 +500,8 @@ public async Task Delete_ReturnsDeleted()
             var response = okObjectResult.Value as MonaiApplicationEntity;
             Assert.NotNull(response);
             Assert.Equal(value, response.AeTitle);
+
+            _aeChangedNotificationService.Verify(p => p.Notify(It.Is<MonaiApplicationentityChangedEvent>(x => x.ApplicationEntity == response && x.Event == ChangedEventType.Deleted)), Times.Once());
             _repository.Verify(p => p.FindByNameAsync(value, It.IsAny<CancellationToken>()), Times.Once());
             _repository.Verify(p => p.RemoveAsync(entity, It.IsAny<CancellationToken>()), Times.Once());
         }
diff --git a/src/InformaticsGateway/Test/Services/Scp/ApplicationEntityHandlerTest.cs b/src/InformaticsGateway/Test/Services/Scp/ApplicationEntityHandlerTest.cs
index 808726a3f..96e465187 100644
--- a/src/InformaticsGateway/Test/Services/Scp/ApplicationEntityHandlerTest.cs
+++ b/src/InformaticsGateway/Test/Services/Scp/ApplicationEntityHandlerTest.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 MONAI Consortium
+ * Copyright 2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -173,6 +173,33 @@ public async Task GivenACStoreRequest_WhenHandleInstanceAsyncIsCalled_ExpectADic
             _payloadAssembler.Verify(p => p.Queue(It.IsAny<string>(), It.IsAny<FileStorageMetadata>(), It.IsAny<uint>()), Times.Once());
         }
 
+        [RetryFact(5, 250)]
+        public void GivenAConfiguredAETitle_WhenConfiguringAgainWithDifferentAETitle_ExpectAnExceptionToBeThrown()
+        {
+            var aet = new MonaiApplicationEntity()
+            {
+                AeTitle = "TESTAET",
+                Name = "TESTAET",
+                Workflows = new List<string>() { "AppA", "AppB", Guid.NewGuid().ToString() }
+            };
+
+            var newAet = new MonaiApplicationEntity()
+            {
+                AeTitle = "TESTAET",
+                Name = "TESTAET",
+                Workflows = new List<string>() { "AppA", "AppB", Guid.NewGuid().ToString() }
+            };
+            var handler = new ApplicationEntityHandler(_serviceScopeFactory.Object, _logger.Object, _options);
+            handler.Configure(aet, Configuration.DicomJsonOptions.Complete, true);
+
+            newAet.AeTitle = "NewAETitle";
+            Assert.Throws<InvalidOperationException>(() => handler.Configure(newAet, Configuration.DicomJsonOptions.Complete, true));
+
+            newAet.AeTitle = "TESTAET";
+            newAet.Name = "NewName";
+            Assert.Throws<InvalidOperationException>(() => handler.Configure(newAet, Configuration.DicomJsonOptions.Complete, true));
+        }
+
         private static DicomCStoreRequest GenerateRequest()
         {
             var dataset = new DicomDataset
diff --git a/src/InformaticsGateway/Test/Services/Scp/ApplicationEntityManagerTest.cs b/src/InformaticsGateway/Test/Services/Scp/ApplicationEntityManagerTest.cs
index c9e010a0a..8f90693bb 100644
--- a/src/InformaticsGateway/Test/Services/Scp/ApplicationEntityManagerTest.cs
+++ b/src/InformaticsGateway/Test/Services/Scp/ApplicationEntityManagerTest.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright 2021-2022 MONAI Consortium
+ * Copyright 2021-2023 MONAI Consortium
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -233,6 +233,14 @@ public async Task ShallHandleAEChangeEventsAsync()
                 }, ChangedEventType.Added));
             Assert.True(await manager.IsAeTitleConfiguredAsync("AE1").ConfigureAwait(false));
 
+            _monaiAeChangedNotificationService.Notify(new MonaiApplicationentityChangedEvent(
+                new MonaiApplicationEntity
+                {
+                    AeTitle = "AE1",
+                    Name = "AE1"
+                }, ChangedEventType.Updated));
+            Assert.True(await manager.IsAeTitleConfiguredAsync("AE1").ConfigureAwait(false));
+
             _monaiAeChangedNotificationService.Notify(new MonaiApplicationentityChangedEvent(
                 new MonaiApplicationEntity
                 {
@@ -242,6 +250,34 @@ public async Task ShallHandleAEChangeEventsAsync()
             Assert.False(await manager.IsAeTitleConfiguredAsync("AE1").ConfigureAwait(false));
         }
 
+        [RetryFact(5, 250, DisplayName = "Shall prevent AE update when AE Title do not match")]
+        public async Task ShallPreventAEUpdateWHenAETDoNotMatchAsync()
+        {
+            _applicationEntityRepository.Setup(p => p.ToListAsync(It.IsAny<CancellationToken>())).ReturnsAsync(new List<MonaiApplicationEntity>());
+            var manager = new ApplicationEntityManager(_hostApplicationLifetime.Object,
+                                                       _serviceScopeFactory.Object,
+                                                       _monaiAeChangedNotificationService,
+                                                       _connfiguration);
+
+            _monaiAeChangedNotificationService.Notify(new MonaiApplicationentityChangedEvent(
+                new MonaiApplicationEntity
+                {
+                    AeTitle = "AE1",
+                    Name = "AE1"
+                }, ChangedEventType.Added));
+            Assert.True(await manager.IsAeTitleConfiguredAsync("AE1").ConfigureAwait(false));
+
+            _monaiAeChangedNotificationService.Notify(new MonaiApplicationentityChangedEvent(
+                new MonaiApplicationEntity
+                {
+                    AeTitle = "AE2",
+                    Name = "AE1"
+                }, ChangedEventType.Updated));
+
+            Assert.True(await manager.IsAeTitleConfiguredAsync("AE1").ConfigureAwait(false));
+            Assert.False(await manager.IsAeTitleConfiguredAsync("AE2").ConfigureAwait(false));
+        }
+
         [RetryFact(5, 250, DisplayName = "Shall handle CS Store Request")]
         public async Task ShallHandleCStoreRequest()
         {
diff --git a/src/InformaticsGateway/Test/packages.lock.json b/src/InformaticsGateway/Test/packages.lock.json
index a07ed5eee..26d8cc094 100644
--- a/src/InformaticsGateway/Test/packages.lock.json
+++ b/src/InformaticsGateway/Test/packages.lock.json
@@ -1023,32 +1023,32 @@
       },
       "MongoDB.Bson": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==",
+        "resolved": "2.19.1",
+        "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==",
         "dependencies": {
           "System.Runtime.CompilerServices.Unsafe": "5.0.0"
         }
       },
       "MongoDB.Driver": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==",
+        "resolved": "2.19.1",
+        "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
-          "MongoDB.Driver.Core": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
+          "MongoDB.Driver.Core": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0"
         }
       },
       "MongoDB.Driver.Core": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==",
+        "resolved": "2.19.1",
+        "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==",
         "dependencies": {
           "AWSSDK.SecurityToken": "3.7.100.14",
           "DnsClient": "1.6.1",
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0",
           "SharpCompress": "0.30.1",
           "Snappier": "1.0.0",
@@ -2008,8 +2008,8 @@
         "type": "Project",
         "dependencies": {
           "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
-          "MongoDB.Driver": "[2.19.0, )",
-          "MongoDB.Driver.Core": "[2.19.0, )"
+          "MongoDB.Driver": "[2.19.1, )",
+          "MongoDB.Driver.Core": "[2.19.1, )"
         }
       },
       "monai.deploy.informaticsgateway.dicomweb.client": {
diff --git a/src/InformaticsGateway/packages.lock.json b/src/InformaticsGateway/packages.lock.json
index 68a34bc65..cfd8553d2 100644
--- a/src/InformaticsGateway/packages.lock.json
+++ b/src/InformaticsGateway/packages.lock.json
@@ -48,12 +48,6 @@
           "fo-dicom": "5.0.3"
         }
       },
-      "GitVersion.MsBuild": {
-        "type": "Direct",
-        "requested": "[5.12.0, )",
-        "resolved": "5.12.0",
-        "contentHash": "dJuigXycpJNOiLT9or7mkHSkGFHgGW3/p6cNNYEKZBa7Hhp1FdX/cvqYWWYhRLpfoZOedeA7aRbYiOB3vW/dvA=="
-      },
       "HL7-dotnetcore": {
         "type": "Direct",
         "requested": "[2.35.0, )",
@@ -768,32 +762,32 @@
       },
       "MongoDB.Bson": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==",
+        "resolved": "2.19.1",
+        "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==",
         "dependencies": {
           "System.Runtime.CompilerServices.Unsafe": "5.0.0"
         }
       },
       "MongoDB.Driver": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==",
+        "resolved": "2.19.1",
+        "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
-          "MongoDB.Driver.Core": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
+          "MongoDB.Driver.Core": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0"
         }
       },
       "MongoDB.Driver.Core": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==",
+        "resolved": "2.19.1",
+        "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==",
         "dependencies": {
           "AWSSDK.SecurityToken": "3.7.100.14",
           "DnsClient": "1.6.1",
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0",
           "SharpCompress": "0.30.1",
           "Snappier": "1.0.0",
@@ -1647,8 +1641,8 @@
         "type": "Project",
         "dependencies": {
           "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
-          "MongoDB.Driver": "[2.19.0, )",
-          "MongoDB.Driver.Core": "[2.19.0, )"
+          "MongoDB.Driver": "[2.19.1, )",
+          "MongoDB.Driver.Core": "[2.19.1, )"
         }
       },
       "monai.deploy.informaticsgateway.dicomweb.client": {
diff --git a/src/Shared/Test/TestStorageInfo.cs b/src/Shared/Test/TestStorageInfo.cs
index 96ab71bfc..b326c0715 100644
--- a/src/Shared/Test/TestStorageInfo.cs
+++ b/src/Shared/Test/TestStorageInfo.cs
@@ -15,7 +15,6 @@
  */
 
 using Monai.Deploy.InformaticsGateway.Api.Storage;
-using Monai.Deploy.Messaging;
 
 namespace Monai.Deploy.InformaticsGateway.SharedTest;
 
diff --git a/tests/Integration.Test/packages.lock.json b/tests/Integration.Test/packages.lock.json
index 82d85a29a..2a7ea4b36 100644
--- a/tests/Integration.Test/packages.lock.json
+++ b/tests/Integration.Test/packages.lock.json
@@ -856,32 +856,32 @@
       },
       "MongoDB.Bson": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "pGp9F2PWU3Dj54PiXKibuaQ5rphWkfp8/Nsy5jLp2dWZGRGlr3r/Lfwnr0PvfihFfxieUcJZ2z3VeO8RctXcvA==",
+        "resolved": "2.19.1",
+        "contentHash": "4FSR3eAbJEYMmvQ1pNFImUpFGtGHT+kEw/Yw/KZjxC9iFMj1XcZC08wMbezgRga2F9tNNFG2vDqh9zt01GinMA==",
         "dependencies": {
           "System.Runtime.CompilerServices.Unsafe": "5.0.0"
         }
       },
       "MongoDB.Driver": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "W/1YByn5gNGfHBe8AyDURXWKn1Z9xJ9IUjplFcvk8B/jlTlDOkmXgmwjlToIdqr0l8rX594kksjGx3a9if3dsg==",
+        "resolved": "2.19.1",
+        "contentHash": "EeQnUCIzRmXg20jwHSM9uvw67nrEMpINKsJDF9Y8xFh/8WFWD9QjZyyJLZgUoFUSz9pUAbyLfQj+ctJYbn8gxg==",
         "dependencies": {
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
-          "MongoDB.Driver.Core": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
+          "MongoDB.Driver.Core": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0"
         }
       },
       "MongoDB.Driver.Core": {
         "type": "Transitive",
-        "resolved": "2.19.0",
-        "contentHash": "KbzJJJc4EsUZ+YQoe7zZL1OxHVC9RjgQMso2LjhZWnlP+IHSON63vKNt7jGarXrOVXK0DqIUrRwQyXMgmqTX5g==",
+        "resolved": "2.19.1",
+        "contentHash": "+T4+vNZHCjp7qoOoNE8hf8VjnwxZttTOHTqv0jibJ4WSnM6lnXZBP4wBOjIKDF3J4aQffvtaZtIt4UWDOV+yAw==",
         "dependencies": {
           "AWSSDK.SecurityToken": "3.7.100.14",
           "DnsClient": "1.6.1",
           "Microsoft.Extensions.Logging.Abstractions": "2.0.0",
-          "MongoDB.Bson": "2.19.0",
+          "MongoDB.Bson": "2.19.1",
           "MongoDB.Libmongocrypt": "1.7.0",
           "SharpCompress": "0.30.1",
           "Snappier": "1.0.0",
@@ -1912,8 +1912,8 @@
         "type": "Project",
         "dependencies": {
           "Monai.Deploy.InformaticsGateway.Database.Api": "[1.0.0, )",
-          "MongoDB.Driver": "[2.19.0, )",
-          "MongoDB.Driver.Core": "[2.19.0, )"
+          "MongoDB.Driver": "[2.19.1, )",
+          "MongoDB.Driver.Core": "[2.19.1, )"
         }
       },
       "monai.deploy.informaticsgateway.dicomweb.client": {