diff --git a/Make/Matrix.json b/Make/Matrix.json
index 38c2c2a..61ab8d9 100644
--- a/Make/Matrix.json
+++ b/Make/Matrix.json
@@ -145,6 +145,21 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_x64.zip"
       ]
     },
+    {
+      "Name": "NxWitness",
+      "Product": "nxwitness",
+      "Branch": "main",
+      "Base": "ubuntu",
+      "Tags": [
+        "docker.io/ptr727/nxwitness:6.1.1.42471",
+        "docker.io/ptr727/nxwitness:rc"
+      ],
+      "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"
+      ]
+    },
     {
       "Name": "NxWitness",
       "Product": "nxwitness",
@@ -161,6 +176,21 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_x64.zip"
       ]
     },
+    {
+      "Name": "NxWitness",
+      "Product": "nxwitness",
+      "Branch": "develop",
+      "Base": "ubuntu",
+      "Tags": [
+        "docker.io/ptr727/nxwitness:develop-6.1.1.42471",
+        "docker.io/ptr727/nxwitness:develop-rc"
+      ],
+      "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"
+      ]
+    },
     {
       "Name": "NxWitness-LSIO",
       "Product": "nxwitness",
@@ -177,6 +207,21 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_x64.zip"
       ]
     },
+    {
+      "Name": "NxWitness-LSIO",
+      "Product": "nxwitness",
+      "Branch": "main",
+      "Base": "lsio",
+      "Tags": [
+        "docker.io/ptr727/nxwitness-lsio:6.1.1.42471",
+        "docker.io/ptr727/nxwitness-lsio:rc"
+      ],
+      "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"
+      ]
+    },
     {
       "Name": "NxWitness-LSIO",
       "Product": "nxwitness",
@@ -193,6 +238,21 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/42176/nxwitness-server_update-6.1.0.42176-linux_x64.zip"
       ]
     },
+    {
+      "Name": "NxWitness-LSIO",
+      "Product": "nxwitness",
+      "Branch": "develop",
+      "Base": "lsio",
+      "Tags": [
+        "docker.io/ptr727/nxwitness-lsio:develop-6.1.1.42471",
+        "docker.io/ptr727/nxwitness-lsio:develop-rc"
+      ],
+      "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"
+      ]
+    },
     {
       "Name": "DWSpectrum",
       "Product": "dwspectrum",
@@ -223,6 +283,21 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_x64.zip"
       ]
     },
+    {
+      "Name": "DWSpectrum",
+      "Product": "dwspectrum",
+      "Branch": "main",
+      "Base": "ubuntu",
+      "Tags": [
+        "docker.io/ptr727/dwspectrum:6.1.1.42471",
+        "docker.io/ptr727/dwspectrum: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"
+      ]
+    },
     {
       "Name": "DWSpectrum",
       "Product": "dwspectrum",
@@ -253,6 +328,21 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/digitalwatchdog/42176/dwspectrum-server_update-6.1.0.42176-linux_x64.zip"
       ]
     },
+    {
+      "Name": "DWSpectrum",
+      "Product": "dwspectrum",
+      "Branch": "develop",
+      "Base": "ubuntu",
+      "Tags": [
+        "docker.io/ptr727/dwspectrum:develop-6.1.1.42471",
+        "docker.io/ptr727/dwspectrum:develop-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"
+      ]
+    },
     {
       "Name": "DWSpectrum-LSIO",
       "Product": "dwspectrum",
@@ -283,6 +373,21 @@
         "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"
+      ]
+    },
     {
       "Name": "DWSpectrum-LSIO",
       "Product": "dwspectrum",
@@ -313,6 +418,21 @@
         "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": "develop",
+      "Base": "lsio",
+      "Tags": [
+        "docker.io/ptr727/dwspectrum-lsio:develop-6.1.1.42471",
+        "docker.io/ptr727/dwspectrum-lsio:develop-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"
+      ]
+    },
     {
       "Name": "WisenetWAVE",
       "Product": "wisenetwave",
@@ -343,6 +463,21 @@
         "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"
+      ]
+    },
     {
       "Name": "WisenetWAVE",
       "Product": "wisenetwave",
@@ -373,6 +508,21 @@
         "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"
+      ],
+      "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"
+      ]
+    },
     {
       "Name": "WisenetWAVE-LSIO",
       "Product": "wisenetwave",
@@ -403,6 +553,21 @@
         "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"
+      ]
+    },
     {
       "Name": "WisenetWAVE-LSIO",
       "Product": "wisenetwave",
@@ -432,6 +597,21 @@
         "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"
+      ],
+      "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"
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/Make/Version.json b/Make/Version.json
index c6a7756..ef0eba2 100644
--- a/Make/Version.json
+++ b/Make/Version.json
@@ -40,6 +40,14 @@
             "Stable",
             "Latest"
           ]
+        },
+        {
+          "Version": "6.1.1.42471",
+          "UriX64": "https://updates.networkoptix.com/default/42471/nxwitness-server_update-6.1.1.42471-linux_x64-rc.zip",
+          "UriArm64": "https://updates.networkoptix.com/default/42471/nxwitness-server_update-6.1.1.42471-linux_arm64-rc.zip",
+          "Labels": [
+            "RC"
+          ]
         }
       ]
     },
@@ -61,6 +69,14 @@
           "Labels": [
             "Latest"
           ]
+        },
+        {
+          "Version": "6.1.1.42471",
+          "UriX64": "https://updates.networkoptix.com/digitalwatchdog/42471/dwspectrum-server_update-6.1.1.42471-linux_x64-rc.zip",
+          "UriArm64": "https://updates.networkoptix.com/digitalwatchdog/42471/dwspectrum-server_update-6.1.1.42471-linux_arm64-rc.zip",
+          "Labels": [
+            "RC"
+          ]
         }
       ]
     },
@@ -82,6 +98,14 @@
           "Labels": [
             "Latest"
           ]
+        },
+        {
+          "Version": "6.1.1.42471",
+          "UriX64": "https://updates.networkoptix.com/hanwha/42471/wave-server_update-6.1.1.42471-linux_x64-rc.zip",
+          "UriArm64": "https://updates.networkoptix.com/hanwha/42471/wave-server_update-6.1.1.42471-linux_arm64-rc.zip",
+          "Labels": [
+            "RC"
+          ]
         }
       ]
     }