diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 61d39e0..2b10359 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -10,7 +10,7 @@
       "rollForward": false
     },
     "husky": {
-      "version": "0.8.0",
+      "version": "0.9.1",
       "commands": [
         "husky"
       ],
diff --git a/CreateMatrix/CreateMatrix.csproj b/CreateMatrix/CreateMatrix.csproj
index 83fb552..1ac15f0 100644
--- a/CreateMatrix/CreateMatrix.csproj
+++ b/CreateMatrix/CreateMatrix.csproj
@@ -16,11 +16,11 @@
     <VerifyReferenceAotCompatibility>true</VerifyReferenceAotCompatibility>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="10.4.0" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="4.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="6.1.1" />
     <PackageReference Include="Serilog" Version="4.3.1" />
-    <PackageReference Include="System.CommandLine" Version="2.0.3" />
+    <PackageReference Include="System.CommandLine" Version="2.0.5" />
   </ItemGroup>
   <ItemGroup>
     <InternalsVisibleTo Include="CreateMatrixTests" />
diff --git a/CreateMatrix/Extensions.cs b/CreateMatrix/Extensions.cs
index 2b603e8..850ea96 100644
--- a/CreateMatrix/Extensions.cs
+++ b/CreateMatrix/Extensions.cs
@@ -28,8 +28,6 @@ internal bool LogAndHandle(
 
 internal static class StringBuilderExtensions
 {
-    private const string CrLf = "\r\n";
-
     extension(StringBuilder sb)
     {
         internal StringBuilder AppendLineCrlf(string? value = null)
@@ -39,7 +37,7 @@ internal StringBuilder AppendLineCrlf(string? value = null)
                 _ = sb.Append(value);
             }
 
-            return sb.Append(CrLf);
+            return sb.Append("\r\n");
         }
     }
 }
diff --git a/Docker/DWSpectrum-LSIO.Dockerfile b/Docker/DWSpectrum-LSIO.Dockerfile
index 00a84eb..6fe4e61 100644
--- a/Docker/DWSpectrum-LSIO.Dockerfile
+++ b/Docker/DWSpectrum-LSIO.Dockerfile
@@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base-lsio:ubuntu-noble
 # Labels
 ARG LABEL_NAME="DWSpectrum-LSIO"
 ARG LABEL_DESCRIPTION="DW Spectrum IPVMS"
-ARG LABEL_VERSION="6.1.0.42176"
+ARG LABEL_VERSION="6.1.1.42624"
 
 # Download URL and version
 # Current values are defined by the build pipeline
-ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_x64.zip"
-ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_arm64.zip"
-ARG DOWNLOAD_VERSION="6.1.0.42176"
+ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_x64.zip"
+ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_arm64.zip"
+ARG DOWNLOAD_VERSION="6.1.1.42624"
 
 # Used for ${COMPANY_NAME} setting the server user and install directory
 ARG RUNTIME_NAME="digitalwatchdog"
@@ -34,8 +34,8 @@ ARG \
     # Platform of the node performing the build
     BUILDPLATFORM
 
-# Prevent EULA and confirmation prompts in installers
-ARG DEBIAN_FRONTEND=noninteractive
+# Prevent EULA and confirmation prompts in installers
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Media server user and directory name
 ENV COMPANY_NAME=${RUNTIME_NAME}
@@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
 # Download the installer file
 WORKDIR /temp
 RUN /bin/bash -euo pipefail -c '\
-    DEB_FILE="./vms_server.deb"; \
+    DEB_FILE="./vms_server.deb"; \
     TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
     DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
     if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
diff --git a/Docker/DWSpectrum.Dockerfile b/Docker/DWSpectrum.Dockerfile
index 2542d53..52d66c8 100644
--- a/Docker/DWSpectrum.Dockerfile
+++ b/Docker/DWSpectrum.Dockerfile
@@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base:ubuntu-noble
 # Labels
 ARG LABEL_NAME="DWSpectrum"
 ARG LABEL_DESCRIPTION="DW Spectrum IPVMS"
-ARG LABEL_VERSION="6.1.0.42176"
+ARG LABEL_VERSION="6.1.1.42624"
 
 # Download URL and version
 # Current values are defined by the build pipeline
-ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_x64.zip"
-ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_arm64.zip"
-ARG DOWNLOAD_VERSION="6.1.0.42176"
+ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_x64.zip"
+ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_arm64.zip"
+ARG DOWNLOAD_VERSION="6.1.1.42624"
 
 # Used for ${COMPANY_NAME} setting the server user and install directory
 ARG RUNTIME_NAME="digitalwatchdog"
@@ -34,8 +34,8 @@ ARG \
     # Platform of the node performing the build
     BUILDPLATFORM
 
-# Prevent EULA and confirmation prompts in installers
-ARG DEBIAN_FRONTEND=noninteractive
+# Prevent EULA and confirmation prompts in installers
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Media server user and directory name
 ENV COMPANY_NAME=${RUNTIME_NAME}
@@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
 # Download the installer file
 WORKDIR /temp
 RUN /bin/bash -euo pipefail -c '\
-    DEB_FILE="./vms_server.deb"; \
+    DEB_FILE="./vms_server.deb"; \
     TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
     DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
     if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
diff --git a/Docker/NxGo-LSIO.Dockerfile b/Docker/NxGo-LSIO.Dockerfile
index 75c5634..7d4bd0a 100644
--- a/Docker/NxGo-LSIO.Dockerfile
+++ b/Docker/NxGo-LSIO.Dockerfile
@@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base-lsio:ubuntu-noble
 # Labels
 ARG LABEL_NAME="NxGo-LSIO"
 ARG LABEL_DESCRIPTION="Nx Go VMS"
-ARG LABEL_VERSION="6.1.0.42176"
+ARG LABEL_VERSION="6.1.1.42624"
 
 # Download URL and version
 # Current values are defined by the build pipeline
-ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_x64.zip"
-ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_arm64.zip"
-ARG DOWNLOAD_VERSION="6.1.0.42176"
+ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_x64.zip"
+ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_arm64.zip"
+ARG DOWNLOAD_VERSION="6.1.1.42624"
 
 # Used for ${COMPANY_NAME} setting the server user and install directory
 ARG RUNTIME_NAME="networkoptix"
@@ -34,8 +34,8 @@ ARG \
     # Platform of the node performing the build
     BUILDPLATFORM
 
-# Prevent EULA and confirmation prompts in installers
-ARG DEBIAN_FRONTEND=noninteractive
+# Prevent EULA and confirmation prompts in installers
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Media server user and directory name
 ENV COMPANY_NAME=${RUNTIME_NAME}
@@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
 # Download the installer file
 WORKDIR /temp
 RUN /bin/bash -euo pipefail -c '\
-    DEB_FILE="./vms_server.deb"; \
+    DEB_FILE="./vms_server.deb"; \
     TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
     DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
     if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
diff --git a/Docker/NxGo.Dockerfile b/Docker/NxGo.Dockerfile
index de3a173..c77be6a 100644
--- a/Docker/NxGo.Dockerfile
+++ b/Docker/NxGo.Dockerfile
@@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base:ubuntu-noble
 # Labels
 ARG LABEL_NAME="NxGo"
 ARG LABEL_DESCRIPTION="Nx Go VMS"
-ARG LABEL_VERSION="6.1.0.42176"
+ARG LABEL_VERSION="6.1.1.42624"
 
 # Download URL and version
 # Current values are defined by the build pipeline
-ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_x64.zip"
-ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_arm64.zip"
-ARG DOWNLOAD_VERSION="6.1.0.42176"
+ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_x64.zip"
+ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_arm64.zip"
+ARG DOWNLOAD_VERSION="6.1.1.42624"
 
 # Used for ${COMPANY_NAME} setting the server user and install directory
 ARG RUNTIME_NAME="networkoptix"
@@ -34,8 +34,8 @@ ARG \
     # Platform of the node performing the build
     BUILDPLATFORM
 
-# Prevent EULA and confirmation prompts in installers
-ARG DEBIAN_FRONTEND=noninteractive
+# Prevent EULA and confirmation prompts in installers
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Media server user and directory name
 ENV COMPANY_NAME=${RUNTIME_NAME}
@@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
 # Download the installer file
 WORKDIR /temp
 RUN /bin/bash -euo pipefail -c '\
-    DEB_FILE="./vms_server.deb"; \
+    DEB_FILE="./vms_server.deb"; \
     TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
     DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
     if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
diff --git a/Docker/NxMeta-LSIO.Dockerfile b/Docker/NxMeta-LSIO.Dockerfile
index 8492e1d..2778c7a 100644
--- a/Docker/NxMeta-LSIO.Dockerfile
+++ b/Docker/NxMeta-LSIO.Dockerfile
@@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base-lsio:ubuntu-noble
 # Labels
 ARG LABEL_NAME="NxMeta-LSIO"
 ARG LABEL_DESCRIPTION="Nx Meta VMS"
-ARG LABEL_VERSION="6.1.0.42176"
+ARG LABEL_VERSION="6.1.1.42624"
 
 # Download URL and version
 # Current values are defined by the build pipeline
-ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/42176/metavms-server_update-6.1.0.42176-linux_x64.zip"
-ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/42176/metavms-server_update-6.1.0.42176-linux_arm64.zip"
-ARG DOWNLOAD_VERSION="6.1.0.42176"
+ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_x64.zip"
+ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_arm64.zip"
+ARG DOWNLOAD_VERSION="6.1.1.42624"
 
 # Used for ${COMPANY_NAME} setting the server user and install directory
 ARG RUNTIME_NAME="networkoptix-metavms"
@@ -34,8 +34,8 @@ ARG \
     # Platform of the node performing the build
     BUILDPLATFORM
 
-# Prevent EULA and confirmation prompts in installers
-ARG DEBIAN_FRONTEND=noninteractive
+# Prevent EULA and confirmation prompts in installers
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Media server user and directory name
 ENV COMPANY_NAME=${RUNTIME_NAME}
@@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
 # Download the installer file
 WORKDIR /temp
 RUN /bin/bash -euo pipefail -c '\
-    DEB_FILE="./vms_server.deb"; \
+    DEB_FILE="./vms_server.deb"; \
     TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
     DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
     if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
diff --git a/Docker/NxMeta.Dockerfile b/Docker/NxMeta.Dockerfile
index 41e0baa..d827fa6 100644
--- a/Docker/NxMeta.Dockerfile
+++ b/Docker/NxMeta.Dockerfile
@@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base:ubuntu-noble
 # Labels
 ARG LABEL_NAME="NxMeta"
 ARG LABEL_DESCRIPTION="Nx Meta VMS"
-ARG LABEL_VERSION="6.1.0.42176"
+ARG LABEL_VERSION="6.1.1.42624"
 
 # Download URL and version
 # Current values are defined by the build pipeline
-ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/42176/metavms-server_update-6.1.0.42176-linux_x64.zip"
-ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/42176/metavms-server_update-6.1.0.42176-linux_arm64.zip"
-ARG DOWNLOAD_VERSION="6.1.0.42176"
+ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_x64.zip"
+ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_arm64.zip"
+ARG DOWNLOAD_VERSION="6.1.1.42624"
 
 # Used for ${COMPANY_NAME} setting the server user and install directory
 ARG RUNTIME_NAME="networkoptix-metavms"
@@ -34,8 +34,8 @@ ARG \
     # Platform of the node performing the build
     BUILDPLATFORM
 
-# Prevent EULA and confirmation prompts in installers
-ARG DEBIAN_FRONTEND=noninteractive
+# Prevent EULA and confirmation prompts in installers
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Media server user and directory name
 ENV COMPANY_NAME=${RUNTIME_NAME}
@@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
 # Download the installer file
 WORKDIR /temp
 RUN /bin/bash -euo pipefail -c '\
-    DEB_FILE="./vms_server.deb"; \
+    DEB_FILE="./vms_server.deb"; \
     TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
     DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
     if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
diff --git a/Docker/NxWitness-LSIO.Dockerfile b/Docker/NxWitness-LSIO.Dockerfile
index 50271f9..62e32f0 100644
--- a/Docker/NxWitness-LSIO.Dockerfile
+++ b/Docker/NxWitness-LSIO.Dockerfile
@@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base-lsio:ubuntu-noble
 # Labels
 ARG LABEL_NAME="NxWitness-LSIO"
 ARG LABEL_DESCRIPTION="Nx Witness VMS"
-ARG LABEL_VERSION="6.1.0.42176"
+ARG LABEL_VERSION="6.1.1.42624"
 
 # Download URL and version
 # Current values are defined by the build pipeline
-ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_x64.zip"
-ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_arm64.zip"
-ARG DOWNLOAD_VERSION="6.1.0.42176"
+ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_x64.zip"
+ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_arm64.zip"
+ARG DOWNLOAD_VERSION="6.1.1.42624"
 
 # Used for ${COMPANY_NAME} setting the server user and install directory
 ARG RUNTIME_NAME="networkoptix"
@@ -34,8 +34,8 @@ ARG \
     # Platform of the node performing the build
     BUILDPLATFORM
 
-# Prevent EULA and confirmation prompts in installers
-ARG DEBIAN_FRONTEND=noninteractive
+# Prevent EULA and confirmation prompts in installers
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Media server user and directory name
 ENV COMPANY_NAME=${RUNTIME_NAME}
@@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
 # Download the installer file
 WORKDIR /temp
 RUN /bin/bash -euo pipefail -c '\
-    DEB_FILE="./vms_server.deb"; \
+    DEB_FILE="./vms_server.deb"; \
     TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
     DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
     if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
diff --git a/Docker/NxWitness.Dockerfile b/Docker/NxWitness.Dockerfile
index 4e269f7..f46374b 100644
--- a/Docker/NxWitness.Dockerfile
+++ b/Docker/NxWitness.Dockerfile
@@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base:ubuntu-noble
 # Labels
 ARG LABEL_NAME="NxWitness"
 ARG LABEL_DESCRIPTION="Nx Witness VMS"
-ARG LABEL_VERSION="6.1.0.42176"
+ARG LABEL_VERSION="6.1.1.42624"
 
 # Download URL and version
 # Current values are defined by the build pipeline
-ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_x64.zip"
-ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_arm64.zip"
-ARG DOWNLOAD_VERSION="6.1.0.42176"
+ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_x64.zip"
+ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_arm64.zip"
+ARG DOWNLOAD_VERSION="6.1.1.42624"
 
 # Used for ${COMPANY_NAME} setting the server user and install directory
 ARG RUNTIME_NAME="networkoptix"
@@ -34,8 +34,8 @@ ARG \
     # Platform of the node performing the build
     BUILDPLATFORM
 
-# Prevent EULA and confirmation prompts in installers
-ARG DEBIAN_FRONTEND=noninteractive
+# Prevent EULA and confirmation prompts in installers
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Media server user and directory name
 ENV COMPANY_NAME=${RUNTIME_NAME}
@@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
 # Download the installer file
 WORKDIR /temp
 RUN /bin/bash -euo pipefail -c '\
-    DEB_FILE="./vms_server.deb"; \
+    DEB_FILE="./vms_server.deb"; \
     TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
     DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
     if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
diff --git a/Docker/WisenetWAVE-LSIO.Dockerfile b/Docker/WisenetWAVE-LSIO.Dockerfile
index 18a3cf2..8dd54d3 100644
--- a/Docker/WisenetWAVE-LSIO.Dockerfile
+++ b/Docker/WisenetWAVE-LSIO.Dockerfile
@@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base-lsio:ubuntu-noble
 # Labels
 ARG LABEL_NAME="WisenetWAVE-LSIO"
 ARG LABEL_DESCRIPTION="Wisenet WAVE VMS"
-ARG LABEL_VERSION="6.1.0.42176"
+ARG LABEL_VERSION="6.1.1.42624"
 
 # Download URL and version
 # Current values are defined by the build pipeline
-ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_x64.zip"
-ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_arm64.zip"
-ARG DOWNLOAD_VERSION="6.1.0.42176"
+ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_x64.zip"
+ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_arm64.zip"
+ARG DOWNLOAD_VERSION="6.1.1.42624"
 
 # Used for ${COMPANY_NAME} setting the server user and install directory
 ARG RUNTIME_NAME="hanwha"
@@ -34,8 +34,8 @@ ARG \
     # Platform of the node performing the build
     BUILDPLATFORM
 
-# Prevent EULA and confirmation prompts in installers
-ARG DEBIAN_FRONTEND=noninteractive
+# Prevent EULA and confirmation prompts in installers
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Media server user and directory name
 ENV COMPANY_NAME=${RUNTIME_NAME}
@@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
 # Download the installer file
 WORKDIR /temp
 RUN /bin/bash -euo pipefail -c '\
-    DEB_FILE="./vms_server.deb"; \
+    DEB_FILE="./vms_server.deb"; \
     TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
     DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
     if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
diff --git a/Docker/WisenetWAVE.Dockerfile b/Docker/WisenetWAVE.Dockerfile
index 0233fc1..5c6c7bb 100644
--- a/Docker/WisenetWAVE.Dockerfile
+++ b/Docker/WisenetWAVE.Dockerfile
@@ -13,13 +13,13 @@ FROM docker.io/ptr727/nx-base:ubuntu-noble
 # Labels
 ARG LABEL_NAME="WisenetWAVE"
 ARG LABEL_DESCRIPTION="Wisenet WAVE VMS"
-ARG LABEL_VERSION="6.1.0.42176"
+ARG LABEL_VERSION="6.1.1.42624"
 
 # Download URL and version
 # Current values are defined by the build pipeline
-ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_x64.zip"
-ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_arm64.zip"
-ARG DOWNLOAD_VERSION="6.1.0.42176"
+ARG DOWNLOAD_X64_URL="https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_x64.zip"
+ARG DOWNLOAD_ARM64_URL="https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_arm64.zip"
+ARG DOWNLOAD_VERSION="6.1.1.42624"
 
 # Used for ${COMPANY_NAME} setting the server user and install directory
 ARG RUNTIME_NAME="hanwha"
@@ -34,8 +34,8 @@ ARG \
     # Platform of the node performing the build
     BUILDPLATFORM
 
-# Prevent EULA and confirmation prompts in installers
-ARG DEBIAN_FRONTEND=noninteractive
+# Prevent EULA and confirmation prompts in installers
+ARG DEBIAN_FRONTEND=noninteractive
 
 # Media server user and directory name
 ENV COMPANY_NAME=${RUNTIME_NAME}
@@ -50,7 +50,7 @@ LABEL name=${LABEL_NAME}-${DOWNLOAD_VERSION} \
 # Download the installer file
 WORKDIR /temp
 RUN /bin/bash -euo pipefail -c '\
-    DEB_FILE="./vms_server.deb"; \
+    DEB_FILE="./vms_server.deb"; \
     TARGET_PLATFORM="${TARGETPLATFORM:-}"; \
     DOWNLOAD_URL="${DOWNLOAD_X64_URL:?DOWNLOAD_X64_URL is required}"; \
     if [ "${TARGET_PLATFORM}" = "linux/arm64" ]; then \
diff --git a/Make/Matrix.json b/Make/Matrix.json
index 510e066..3bcc6eb 100644
--- a/Make/Matrix.json
+++ b/Make/Matrix.json
@@ -8,7 +8,6 @@
       "Base": "ubuntu",
       "Tags": [
         "docker.io/ptr727/nxgo:6.1.0.42176",
-        "docker.io/ptr727/nxgo:latest",
         "docker.io/ptr727/nxgo:stable"
       ],
       "Args": [
@@ -17,13 +16,27 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_x64.zip"
       ]
     },
+    {
+      "Name": "NxGo",
+      "Product": "nxgo",
+      "Branch": "main",
+      "Base": "ubuntu",
+      "Tags": [
+        "docker.io/ptr727/nxgo:6.1.1.42624",
+        "docker.io/ptr727/nxgo:latest"
+      ],
+      "Args": [
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_x64.zip"
+      ]
+    },
     {
       "Name": "NxGo",
       "Product": "nxgo",
       "Branch": "develop",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/nxgo:develop",
         "docker.io/ptr727/nxgo:develop-6.1.0.42176",
         "docker.io/ptr727/nxgo:develop-stable"
       ],
@@ -33,6 +46,21 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_x64.zip"
       ]
     },
+    {
+      "Name": "NxGo",
+      "Product": "nxgo",
+      "Branch": "develop",
+      "Base": "ubuntu",
+      "Tags": [
+        "docker.io/ptr727/nxgo:develop",
+        "docker.io/ptr727/nxgo:develop-6.1.1.42624"
+      ],
+      "Args": [
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_x64.zip"
+      ]
+    },
     {
       "Name": "NxGo-LSIO",
       "Product": "nxgo",
@@ -40,7 +68,6 @@
       "Base": "lsio",
       "Tags": [
         "docker.io/ptr727/nxgo-lsio:6.1.0.42176",
-        "docker.io/ptr727/nxgo-lsio:latest",
         "docker.io/ptr727/nxgo-lsio:stable"
       ],
       "Args": [
@@ -49,13 +76,27 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_x64.zip"
       ]
     },
+    {
+      "Name": "NxGo-LSIO",
+      "Product": "nxgo",
+      "Branch": "main",
+      "Base": "lsio",
+      "Tags": [
+        "docker.io/ptr727/nxgo-lsio:6.1.1.42624",
+        "docker.io/ptr727/nxgo-lsio:latest"
+      ],
+      "Args": [
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_x64.zip"
+      ]
+    },
     {
       "Name": "NxGo-LSIO",
       "Product": "nxgo",
       "Branch": "develop",
       "Base": "lsio",
       "Tags": [
-        "docker.io/ptr727/nxgo-lsio:develop",
         "docker.io/ptr727/nxgo-lsio:develop-6.1.0.42176",
         "docker.io/ptr727/nxgo-lsio:develop-stable"
       ],
@@ -65,6 +106,21 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_x64.zip"
       ]
     },
+    {
+      "Name": "NxGo-LSIO",
+      "Product": "nxgo",
+      "Branch": "develop",
+      "Base": "lsio",
+      "Tags": [
+        "docker.io/ptr727/nxgo-lsio:develop",
+        "docker.io/ptr727/nxgo-lsio:develop-6.1.1.42624"
+      ],
+      "Args": [
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_x64.zip"
+      ]
+    },
     {
       "Name": "NxMeta",
       "Product": "nxmeta",
@@ -72,7 +128,6 @@
       "Base": "ubuntu",
       "Tags": [
         "docker.io/ptr727/nxmeta:6.1.0.42176",
-        "docker.io/ptr727/nxmeta:latest",
         "docker.io/ptr727/nxmeta:stable"
       ],
       "Args": [
@@ -87,13 +142,13 @@
       "Branch": "main",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/nxmeta:6.1.1.42471",
-        "docker.io/ptr727/nxmeta:rc"
+        "docker.io/ptr727/nxmeta:6.1.1.42624",
+        "docker.io/ptr727/nxmeta:latest"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/42471/metavms-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/42471/metavms-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -102,7 +157,6 @@
       "Branch": "develop",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/nxmeta:develop",
         "docker.io/ptr727/nxmeta:develop-6.1.0.42176",
         "docker.io/ptr727/nxmeta:develop-stable"
       ],
@@ -118,13 +172,13 @@
       "Branch": "develop",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/nxmeta:develop-6.1.1.42471",
-        "docker.io/ptr727/nxmeta:develop-rc"
+        "docker.io/ptr727/nxmeta:develop",
+        "docker.io/ptr727/nxmeta:develop-6.1.1.42624"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/42471/metavms-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/42471/metavms-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -134,7 +188,6 @@
       "Base": "lsio",
       "Tags": [
         "docker.io/ptr727/nxmeta-lsio:6.1.0.42176",
-        "docker.io/ptr727/nxmeta-lsio:latest",
         "docker.io/ptr727/nxmeta-lsio:stable"
       ],
       "Args": [
@@ -149,13 +202,13 @@
       "Branch": "main",
       "Base": "lsio",
       "Tags": [
-        "docker.io/ptr727/nxmeta-lsio:6.1.1.42471",
-        "docker.io/ptr727/nxmeta-lsio:rc"
+        "docker.io/ptr727/nxmeta-lsio:6.1.1.42624",
+        "docker.io/ptr727/nxmeta-lsio:latest"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/42471/metavms-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/42471/metavms-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -164,7 +217,6 @@
       "Branch": "develop",
       "Base": "lsio",
       "Tags": [
-        "docker.io/ptr727/nxmeta-lsio:develop",
         "docker.io/ptr727/nxmeta-lsio:develop-6.1.0.42176",
         "docker.io/ptr727/nxmeta-lsio:develop-stable"
       ],
@@ -180,13 +232,13 @@
       "Branch": "develop",
       "Base": "lsio",
       "Tags": [
-        "docker.io/ptr727/nxmeta-lsio:develop-6.1.1.42471",
-        "docker.io/ptr727/nxmeta-lsio:develop-rc"
+        "docker.io/ptr727/nxmeta-lsio:develop",
+        "docker.io/ptr727/nxmeta-lsio:develop-6.1.1.42624"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/42471/metavms-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/42471/metavms-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -196,7 +248,6 @@
       "Base": "ubuntu",
       "Tags": [
         "docker.io/ptr727/nxwitness:6.1.0.42176",
-        "docker.io/ptr727/nxwitness:latest",
         "docker.io/ptr727/nxwitness:stable"
       ],
       "Args": [
@@ -211,13 +262,13 @@
       "Branch": "main",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/nxwitness:6.1.1.42471",
-        "docker.io/ptr727/nxwitness:rc"
+        "docker.io/ptr727/nxwitness:6.1.1.42624",
+        "docker.io/ptr727/nxwitness:latest"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/42471/nxwitness-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/42471/nxwitness-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -226,7 +277,6 @@
       "Branch": "develop",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/nxwitness:develop",
         "docker.io/ptr727/nxwitness:develop-6.1.0.42176",
         "docker.io/ptr727/nxwitness:develop-stable"
       ],
@@ -242,13 +292,13 @@
       "Branch": "develop",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/nxwitness:develop-6.1.1.42471",
-        "docker.io/ptr727/nxwitness:develop-rc"
+        "docker.io/ptr727/nxwitness:develop",
+        "docker.io/ptr727/nxwitness:develop-6.1.1.42624"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/42471/nxwitness-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/42471/nxwitness-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -258,7 +308,6 @@
       "Base": "lsio",
       "Tags": [
         "docker.io/ptr727/nxwitness-lsio:6.1.0.42176",
-        "docker.io/ptr727/nxwitness-lsio:latest",
         "docker.io/ptr727/nxwitness-lsio:stable"
       ],
       "Args": [
@@ -273,13 +322,13 @@
       "Branch": "main",
       "Base": "lsio",
       "Tags": [
-        "docker.io/ptr727/nxwitness-lsio:6.1.1.42471",
-        "docker.io/ptr727/nxwitness-lsio:rc"
+        "docker.io/ptr727/nxwitness-lsio:6.1.1.42624",
+        "docker.io/ptr727/nxwitness-lsio:latest"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/42471/nxwitness-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/42471/nxwitness-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -288,7 +337,6 @@
       "Branch": "develop",
       "Base": "lsio",
       "Tags": [
-        "docker.io/ptr727/nxwitness-lsio:develop",
         "docker.io/ptr727/nxwitness-lsio:develop-6.1.0.42176",
         "docker.io/ptr727/nxwitness-lsio:develop-stable"
       ],
@@ -304,13 +352,13 @@
       "Branch": "develop",
       "Base": "lsio",
       "Tags": [
-        "docker.io/ptr727/nxwitness-lsio:develop-6.1.1.42471",
-        "docker.io/ptr727/nxwitness-lsio:develop-rc"
+        "docker.io/ptr727/nxwitness-lsio:develop",
+        "docker.io/ptr727/nxwitness-lsio:develop-6.1.1.42624"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/42471/nxwitness-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/42471/nxwitness-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -319,23 +367,23 @@
       "Branch": "main",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/dwspectrum:6.0.6.41837",
+        "docker.io/ptr727/dwspectrum:6.1.0.42176",
         "docker.io/ptr727/dwspectrum:stable"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/41837/dwspectrum-server_update-6.0.6.41837-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.6.41837",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/41837/dwspectrum-server_update-6.0.6.41837-linux_x64.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
       "Name": "DWSpectrum",
       "Product": "dwspectrum",
-      "Branch": "main",
+      "Branch": "develop",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/dwspectrum:6.1.0.42176",
-        "docker.io/ptr727/dwspectrum:latest"
+        "docker.io/ptr727/dwspectrum:develop-6.1.0.42176",
+        "docker.io/ptr727/dwspectrum:develop-stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_arm64.zip",
@@ -349,13 +397,13 @@
       "Branch": "main",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/dwspectrum:6.1.1.42471",
-        "docker.io/ptr727/dwspectrum:rc"
+        "docker.io/ptr727/dwspectrum:6.1.1.42624",
+        "docker.io/ptr727/dwspectrum:latest"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42471/dwspectrum-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42471/dwspectrum-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -364,24 +412,9 @@
       "Branch": "develop",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/dwspectrum:develop-6.0.6.41837",
+        "docker.io/ptr727/dwspectrum:develop-6.1.0.42176",
         "docker.io/ptr727/dwspectrum:develop-stable"
       ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/41837/dwspectrum-server_update-6.0.6.41837-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.6.41837",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/41837/dwspectrum-server_update-6.0.6.41837-linux_x64.zip"
-      ]
-    },
-    {
-      "Name": "DWSpectrum",
-      "Product": "dwspectrum",
-      "Branch": "develop",
-      "Base": "ubuntu",
-      "Tags": [
-        "docker.io/ptr727/dwspectrum:develop",
-        "docker.io/ptr727/dwspectrum:develop-6.1.0.42176"
-      ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_arm64.zip",
         "DOWNLOAD_VERSION=6.1.0.42176",
@@ -394,13 +427,13 @@
       "Branch": "develop",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/dwspectrum:develop-6.1.1.42471",
-        "docker.io/ptr727/dwspectrum:develop-rc"
+        "docker.io/ptr727/dwspectrum:develop",
+        "docker.io/ptr727/dwspectrum:develop-6.1.1.42624"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42471/dwspectrum-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42471/dwspectrum-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -409,13 +442,13 @@
       "Branch": "main",
       "Base": "lsio",
       "Tags": [
-        "docker.io/ptr727/dwspectrum-lsio:6.0.6.41837",
+        "docker.io/ptr727/dwspectrum-lsio:6.1.0.42176",
         "docker.io/ptr727/dwspectrum-lsio:stable"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/41837/dwspectrum-server_update-6.0.6.41837-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.6.41837",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/41837/dwspectrum-server_update-6.0.6.41837-linux_x64.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -424,28 +457,13 @@
       "Branch": "main",
       "Base": "lsio",
       "Tags": [
-        "docker.io/ptr727/dwspectrum-lsio:6.1.0.42176",
+        "docker.io/ptr727/dwspectrum-lsio:6.1.1.42624",
         "docker.io/ptr727/dwspectrum-lsio:latest"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.1.0.42176",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_x64.zip"
-      ]
-    },
-    {
-      "Name": "DWSpectrum-LSIO",
-      "Product": "dwspectrum",
-      "Branch": "main",
-      "Base": "lsio",
-      "Tags": [
-        "docker.io/ptr727/dwspectrum-lsio:6.1.1.42471",
-        "docker.io/ptr727/dwspectrum-lsio:rc"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42471/dwspectrum-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42471/dwspectrum-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -454,24 +472,9 @@
       "Branch": "develop",
       "Base": "lsio",
       "Tags": [
-        "docker.io/ptr727/dwspectrum-lsio:develop-6.0.6.41837",
+        "docker.io/ptr727/dwspectrum-lsio:develop-6.1.0.42176",
         "docker.io/ptr727/dwspectrum-lsio:develop-stable"
       ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/41837/dwspectrum-server_update-6.0.6.41837-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.6.41837",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/41837/dwspectrum-server_update-6.0.6.41837-linux_x64.zip"
-      ]
-    },
-    {
-      "Name": "DWSpectrum-LSIO",
-      "Product": "dwspectrum",
-      "Branch": "develop",
-      "Base": "lsio",
-      "Tags": [
-        "docker.io/ptr727/dwspectrum-lsio:develop",
-        "docker.io/ptr727/dwspectrum-lsio:develop-6.1.0.42176"
-      ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_arm64.zip",
         "DOWNLOAD_VERSION=6.1.0.42176",
@@ -484,13 +487,13 @@
       "Branch": "develop",
       "Base": "lsio",
       "Tags": [
-        "docker.io/ptr727/dwspectrum-lsio:develop-6.1.1.42471",
-        "docker.io/ptr727/dwspectrum-lsio:develop-rc"
+        "docker.io/ptr727/dwspectrum-lsio:develop",
+        "docker.io/ptr727/dwspectrum-lsio:develop-6.1.1.42624"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42471/dwspectrum-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42471/dwspectrum-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -514,28 +517,13 @@
       "Branch": "main",
       "Base": "ubuntu",
       "Tags": [
-        "docker.io/ptr727/wisenetwave:6.1.0.42176",
+        "docker.io/ptr727/wisenetwave:6.1.1.42624",
         "docker.io/ptr727/wisenetwave:latest"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.1.0.42176",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_x64.zip"
-      ]
-    },
-    {
-      "Name": "WisenetWAVE",
-      "Product": "wisenetwave",
-      "Branch": "main",
-      "Base": "ubuntu",
-      "Tags": [
-        "docker.io/ptr727/wisenetwave:6.1.1.42471",
-        "docker.io/ptr727/wisenetwave:rc"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/hanwha/42471/wave-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/42471/wave-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -560,27 +548,12 @@
       "Base": "ubuntu",
       "Tags": [
         "docker.io/ptr727/wisenetwave:develop",
-        "docker.io/ptr727/wisenetwave:develop-6.1.0.42176"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.1.0.42176",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_x64.zip"
-      ]
-    },
-    {
-      "Name": "WisenetWAVE",
-      "Product": "wisenetwave",
-      "Branch": "develop",
-      "Base": "ubuntu",
-      "Tags": [
-        "docker.io/ptr727/wisenetwave:develop-6.1.1.42471",
-        "docker.io/ptr727/wisenetwave:develop-rc"
+        "docker.io/ptr727/wisenetwave:develop-6.1.1.42624"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/hanwha/42471/wave-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/42471/wave-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -604,28 +577,13 @@
       "Branch": "main",
       "Base": "lsio",
       "Tags": [
-        "docker.io/ptr727/wisenetwave-lsio:6.1.0.42176",
+        "docker.io/ptr727/wisenetwave-lsio:6.1.1.42624",
         "docker.io/ptr727/wisenetwave-lsio:latest"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.1.0.42176",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_x64.zip"
-      ]
-    },
-    {
-      "Name": "WisenetWAVE-LSIO",
-      "Product": "wisenetwave",
-      "Branch": "main",
-      "Base": "lsio",
-      "Tags": [
-        "docker.io/ptr727/wisenetwave-lsio:6.1.1.42471",
-        "docker.io/ptr727/wisenetwave-lsio:rc"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/hanwha/42471/wave-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/42471/wave-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_x64.zip"
       ]
     },
     {
@@ -650,28 +608,13 @@
       "Base": "lsio",
       "Tags": [
         "docker.io/ptr727/wisenetwave-lsio:develop",
-        "docker.io/ptr727/wisenetwave-lsio:develop-6.1.0.42176"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.1.0.42176",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_x64.zip"
-      ]
-    },
-    {
-      "Name": "WisenetWAVE-LSIO",
-      "Product": "wisenetwave",
-      "Branch": "develop",
-      "Base": "lsio",
-      "Tags": [
-        "docker.io/ptr727/wisenetwave-lsio:develop-6.1.1.42471",
-        "docker.io/ptr727/wisenetwave-lsio:develop-rc"
+        "docker.io/ptr727/wisenetwave-lsio:develop-6.1.1.42624"
       ],
       "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/hanwha/42471/wave-server_update-6.1.1.42471-linux_arm64-rc.zip",
-        "DOWNLOAD_VERSION=6.1.1.42471",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/42471/wave-server_update-6.1.1.42471-linux_x64-rc.zip"
+        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_arm64.zip",
+        "DOWNLOAD_VERSION=6.1.1.42624",
+        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_x64.zip"
       ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/Make/Version.json b/Make/Version.json
index b4b593c..6f32ed1 100644
--- a/Make/Version.json
+++ b/Make/Version.json
@@ -9,7 +9,14 @@
           "UriX64": "https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_x64.zip",
           "UriArm64": "https://updates.networkoptix.com/nxgo/42176/nxgo-server_update-6.1.0.42176-linux_arm64.zip",
           "Labels": [
-            "Stable",
+            "Stable"
+          ]
+        },
+        {
+          "Version": "6.1.1.42624",
+          "UriX64": "https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_x64.zip",
+          "UriArm64": "https://updates.networkoptix.com/nxgo/42624/nxgo-server_update-6.1.1.42624-linux_arm64.zip",
+          "Labels": [
             "Latest"
           ]
         }
@@ -23,7 +30,14 @@
           "UriX64": "https://updates.networkoptix.com/metavms/42176/metavms-server_update-6.1.0.42176-linux_x64.zip",
           "UriArm64": "https://updates.networkoptix.com/metavms/42176/metavms-server_update-6.1.0.42176-linux_arm64.zip",
           "Labels": [
-            "Stable",
+            "Stable"
+          ]
+        },
+        {
+          "Version": "6.1.1.42624",
+          "UriX64": "https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_x64.zip",
+          "UriArm64": "https://updates.networkoptix.com/metavms/42624/metavms-server_update-6.1.1.42624-linux_arm64.zip",
+          "Labels": [
             "Latest"
           ]
         },
@@ -45,7 +59,14 @@
           "UriX64": "https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_x64.zip",
           "UriArm64": "https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_arm64.zip",
           "Labels": [
-            "Stable",
+            "Stable"
+          ]
+        },
+        {
+          "Version": "6.1.1.42624",
+          "UriX64": "https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_x64.zip",
+          "UriArm64": "https://updates.networkoptix.com/default/42624/nxwitness-server_update-6.1.1.42624-linux_arm64.zip",
+          "Labels": [
             "Latest"
           ]
         },
@@ -63,17 +84,17 @@
       "Product": "DWSpectrum",
       "Versions": [
         {
-          "Version": "6.0.6.41837",
-          "UriX64": "https://updates.networkoptix.com/digitalwatchdog/41837/dwspectrum-server_update-6.0.6.41837-linux_x64.zip",
-          "UriArm64": "https://updates.networkoptix.com/digitalwatchdog/41837/dwspectrum-server_update-6.0.6.41837-linux_arm64.zip",
+          "Version": "6.1.0.42176",
+          "UriX64": "https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_x64.zip",
+          "UriArm64": "https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_arm64.zip",
           "Labels": [
             "Stable"
           ]
         },
         {
-          "Version": "6.1.0.42176",
-          "UriX64": "https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_x64.zip",
-          "UriArm64": "https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_arm64.zip",
+          "Version": "6.1.1.42624",
+          "UriX64": "https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_x64.zip",
+          "UriArm64": "https://updates.networkoptix.com/digitalwatchdog/42624/dwspectrum-server_update-6.1.1.42624-linux_arm64.zip",
           "Labels": [
             "Latest"
           ]
@@ -100,9 +121,9 @@
           ]
         },
         {
-          "Version": "6.1.0.42176",
-          "UriX64": "https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_x64.zip",
-          "UriArm64": "https://updates.networkoptix.com/hanwha/42176/wave-server_update-6.1.0.42176-linux_arm64.zip",
+          "Version": "6.1.1.42624",
+          "UriX64": "https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_x64.zip",
+          "UriArm64": "https://updates.networkoptix.com/hanwha/42624/wave-server_update-6.1.1.42624-linux_arm64.zip",
           "Labels": [
             "Latest"
           ]