diff --git a/Make/Matrix.json b/Make/Matrix.json
index 775c718..76561d8 100644
--- a/Make/Matrix.json
+++ b/Make/Matrix.json
@@ -2,27 +2,14 @@
   "$schema": "https://raw.githubusercontent.com/ptr727/NxWitness/main/CreateMatrix/JSON/Matrix.schema.json",
   "SchemaVersion": 2,
   "Images": [
-    {
-      "Name": "NxGo",
-      "Branch": "main",
-      "CacheScope": "default",
-      "Tags": [
-        "docker.io/ptr727/nxgo:6.0.0.39503",
-        "docker.io/ptr727/nxgo:stable"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/nxgo/39503/nxgo-server_update-6.0.0.39503-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.0.39503",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/39503/nxgo-server_update-6.0.0.39503-linux_x64.zip"
-      ]
-    },
     {
       "Name": "NxGo",
       "Branch": "main",
       "CacheScope": "default",
       "Tags": [
         "docker.io/ptr727/nxgo:6.0.1.39873",
-        "docker.io/ptr727/nxgo:latest"
+        "docker.io/ptr727/nxgo:latest",
+        "docker.io/ptr727/nxgo:stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/nxgo/39873/nxgo-server_update-6.0.1.39873-linux_arm64.zip",
@@ -30,27 +17,14 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/39873/nxgo-server_update-6.0.1.39873-linux_x64.zip"
       ]
     },
-    {
-      "Name": "NxGo-LSIO",
-      "Branch": "main",
-      "CacheScope": "lsio",
-      "Tags": [
-        "docker.io/ptr727/nxgo-lsio:6.0.0.39503",
-        "docker.io/ptr727/nxgo-lsio:stable"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/nxgo/39503/nxgo-server_update-6.0.0.39503-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.0.39503",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/39503/nxgo-server_update-6.0.0.39503-linux_x64.zip"
-      ]
-    },
     {
       "Name": "NxGo-LSIO",
       "Branch": "main",
       "CacheScope": "lsio",
       "Tags": [
         "docker.io/ptr727/nxgo-lsio:6.0.1.39873",
-        "docker.io/ptr727/nxgo-lsio:latest"
+        "docker.io/ptr727/nxgo-lsio:latest",
+        "docker.io/ptr727/nxgo-lsio:stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/nxgo/39873/nxgo-server_update-6.0.1.39873-linux_arm64.zip",
@@ -58,27 +32,14 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/39873/nxgo-server_update-6.0.1.39873-linux_x64.zip"
       ]
     },
-    {
-      "Name": "NxMeta",
-      "Branch": "main",
-      "CacheScope": "default",
-      "Tags": [
-        "docker.io/ptr727/nxmeta:6.0.0.39503",
-        "docker.io/ptr727/nxmeta:stable"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/39503/metavms-server_update-6.0.0.39503-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.0.39503",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/39503/metavms-server_update-6.0.0.39503-linux_x64.zip"
-      ]
-    },
     {
       "Name": "NxMeta",
       "Branch": "main",
       "CacheScope": "default",
       "Tags": [
         "docker.io/ptr727/nxmeta:6.0.1.39873",
-        "docker.io/ptr727/nxmeta:latest"
+        "docker.io/ptr727/nxmeta:latest",
+        "docker.io/ptr727/nxmeta:stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/39873/metavms-server_update-6.0.1.39873-linux_arm64.zip",
@@ -100,27 +61,14 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/39707/metavms-server_update-6.1.0.39707-linux_x64-beta.zip"
       ]
     },
-    {
-      "Name": "NxMeta-LSIO",
-      "Branch": "main",
-      "CacheScope": "lsio",
-      "Tags": [
-        "docker.io/ptr727/nxmeta-lsio:6.0.0.39503",
-        "docker.io/ptr727/nxmeta-lsio:stable"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/39503/metavms-server_update-6.0.0.39503-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.0.39503",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/39503/metavms-server_update-6.0.0.39503-linux_x64.zip"
-      ]
-    },
     {
       "Name": "NxMeta-LSIO",
       "Branch": "main",
       "CacheScope": "lsio",
       "Tags": [
         "docker.io/ptr727/nxmeta-lsio:6.0.1.39873",
-        "docker.io/ptr727/nxmeta-lsio:latest"
+        "docker.io/ptr727/nxmeta-lsio:latest",
+        "docker.io/ptr727/nxmeta-lsio:stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/39873/metavms-server_update-6.0.1.39873-linux_arm64.zip",
@@ -142,27 +90,14 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/39707/metavms-server_update-6.1.0.39707-linux_x64-beta.zip"
       ]
     },
-    {
-      "Name": "NxWitness",
-      "Branch": "main",
-      "CacheScope": "default",
-      "Tags": [
-        "docker.io/ptr727/nxwitness:6.0.0.39503",
-        "docker.io/ptr727/nxwitness:stable"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/39503/nxwitness-server_update-6.0.0.39503-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.0.39503",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/39503/nxwitness-server_update-6.0.0.39503-linux_x64.zip"
-      ]
-    },
     {
       "Name": "NxWitness",
       "Branch": "main",
       "CacheScope": "default",
       "Tags": [
         "docker.io/ptr727/nxwitness:6.0.1.39873",
-        "docker.io/ptr727/nxwitness:latest"
+        "docker.io/ptr727/nxwitness:latest",
+        "docker.io/ptr727/nxwitness:stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/39873/nxwitness-server_update-6.0.1.39873-linux_arm64.zip",
@@ -170,27 +105,14 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/39873/nxwitness-server_update-6.0.1.39873-linux_x64.zip"
       ]
     },
-    {
-      "Name": "NxWitness-LSIO",
-      "Branch": "main",
-      "CacheScope": "lsio",
-      "Tags": [
-        "docker.io/ptr727/nxwitness-lsio:6.0.0.39503",
-        "docker.io/ptr727/nxwitness-lsio:stable"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/39503/nxwitness-server_update-6.0.0.39503-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.0.39503",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/39503/nxwitness-server_update-6.0.0.39503-linux_x64.zip"
-      ]
-    },
     {
       "Name": "NxWitness-LSIO",
       "Branch": "main",
       "CacheScope": "lsio",
       "Tags": [
         "docker.io/ptr727/nxwitness-lsio:6.0.1.39873",
-        "docker.io/ptr727/nxwitness-lsio:latest"
+        "docker.io/ptr727/nxwitness-lsio:latest",
+        "docker.io/ptr727/nxwitness-lsio:stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/39873/nxwitness-server_update-6.0.1.39873-linux_arm64.zip",
@@ -338,20 +260,6 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/hanwha/39719/wave-server_update-6.0.1.39719-linux_x64-rc.zip"
       ]
     },
-    {
-      "Name": "NxGo",
-      "Branch": "develop",
-      "CacheScope": "default",
-      "Tags": [
-        "docker.io/ptr727/nxgo:develop-6.0.0.39503",
-        "docker.io/ptr727/nxgo:develop-stable"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/nxgo/39503/nxgo-server_update-6.0.0.39503-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.0.39503",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/39503/nxgo-server_update-6.0.0.39503-linux_x64.zip"
-      ]
-    },
     {
       "Name": "NxGo",
       "Branch": "develop",
@@ -359,7 +267,8 @@
       "Tags": [
         "docker.io/ptr727/nxgo:develop",
         "docker.io/ptr727/nxgo:develop-6.0.1.39873",
-        "docker.io/ptr727/nxgo:develop-latest"
+        "docker.io/ptr727/nxgo:develop-latest",
+        "docker.io/ptr727/nxgo:develop-stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/nxgo/39873/nxgo-server_update-6.0.1.39873-linux_arm64.zip",
@@ -367,20 +276,6 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/39873/nxgo-server_update-6.0.1.39873-linux_x64.zip"
       ]
     },
-    {
-      "Name": "NxGo-LSIO",
-      "Branch": "develop",
-      "CacheScope": "lsio",
-      "Tags": [
-        "docker.io/ptr727/nxgo-lsio:develop-6.0.0.39503",
-        "docker.io/ptr727/nxgo-lsio:develop-stable"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/nxgo/39503/nxgo-server_update-6.0.0.39503-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.0.39503",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/39503/nxgo-server_update-6.0.0.39503-linux_x64.zip"
-      ]
-    },
     {
       "Name": "NxGo-LSIO",
       "Branch": "develop",
@@ -388,7 +283,8 @@
       "Tags": [
         "docker.io/ptr727/nxgo-lsio:develop",
         "docker.io/ptr727/nxgo-lsio:develop-6.0.1.39873",
-        "docker.io/ptr727/nxgo-lsio:develop-latest"
+        "docker.io/ptr727/nxgo-lsio:develop-latest",
+        "docker.io/ptr727/nxgo-lsio:develop-stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/nxgo/39873/nxgo-server_update-6.0.1.39873-linux_arm64.zip",
@@ -396,20 +292,6 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/nxgo/39873/nxgo-server_update-6.0.1.39873-linux_x64.zip"
       ]
     },
-    {
-      "Name": "NxMeta",
-      "Branch": "develop",
-      "CacheScope": "default",
-      "Tags": [
-        "docker.io/ptr727/nxmeta:develop-6.0.0.39503",
-        "docker.io/ptr727/nxmeta:develop-stable"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/39503/metavms-server_update-6.0.0.39503-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.0.39503",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/39503/metavms-server_update-6.0.0.39503-linux_x64.zip"
-      ]
-    },
     {
       "Name": "NxMeta",
       "Branch": "develop",
@@ -417,7 +299,8 @@
       "Tags": [
         "docker.io/ptr727/nxmeta:develop",
         "docker.io/ptr727/nxmeta:develop-6.0.1.39873",
-        "docker.io/ptr727/nxmeta:develop-latest"
+        "docker.io/ptr727/nxmeta:develop-latest",
+        "docker.io/ptr727/nxmeta:develop-stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/39873/metavms-server_update-6.0.1.39873-linux_arm64.zip",
@@ -439,20 +322,6 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/39707/metavms-server_update-6.1.0.39707-linux_x64-beta.zip"
       ]
     },
-    {
-      "Name": "NxMeta-LSIO",
-      "Branch": "develop",
-      "CacheScope": "lsio",
-      "Tags": [
-        "docker.io/ptr727/nxmeta-lsio:develop-6.0.0.39503",
-        "docker.io/ptr727/nxmeta-lsio:develop-stable"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/39503/metavms-server_update-6.0.0.39503-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.0.39503",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/39503/metavms-server_update-6.0.0.39503-linux_x64.zip"
-      ]
-    },
     {
       "Name": "NxMeta-LSIO",
       "Branch": "develop",
@@ -460,7 +329,8 @@
       "Tags": [
         "docker.io/ptr727/nxmeta-lsio:develop",
         "docker.io/ptr727/nxmeta-lsio:develop-6.0.1.39873",
-        "docker.io/ptr727/nxmeta-lsio:develop-latest"
+        "docker.io/ptr727/nxmeta-lsio:develop-latest",
+        "docker.io/ptr727/nxmeta-lsio:develop-stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/metavms/39873/metavms-server_update-6.0.1.39873-linux_arm64.zip",
@@ -482,20 +352,6 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/metavms/39707/metavms-server_update-6.1.0.39707-linux_x64-beta.zip"
       ]
     },
-    {
-      "Name": "NxWitness",
-      "Branch": "develop",
-      "CacheScope": "default",
-      "Tags": [
-        "docker.io/ptr727/nxwitness:develop-6.0.0.39503",
-        "docker.io/ptr727/nxwitness:develop-stable"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/39503/nxwitness-server_update-6.0.0.39503-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.0.39503",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/39503/nxwitness-server_update-6.0.0.39503-linux_x64.zip"
-      ]
-    },
     {
       "Name": "NxWitness",
       "Branch": "develop",
@@ -503,7 +359,8 @@
       "Tags": [
         "docker.io/ptr727/nxwitness:develop",
         "docker.io/ptr727/nxwitness:develop-6.0.1.39873",
-        "docker.io/ptr727/nxwitness:develop-latest"
+        "docker.io/ptr727/nxwitness:develop-latest",
+        "docker.io/ptr727/nxwitness:develop-stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/39873/nxwitness-server_update-6.0.1.39873-linux_arm64.zip",
@@ -511,20 +368,6 @@
         "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/39873/nxwitness-server_update-6.0.1.39873-linux_x64.zip"
       ]
     },
-    {
-      "Name": "NxWitness-LSIO",
-      "Branch": "develop",
-      "CacheScope": "lsio",
-      "Tags": [
-        "docker.io/ptr727/nxwitness-lsio:develop-6.0.0.39503",
-        "docker.io/ptr727/nxwitness-lsio:develop-stable"
-      ],
-      "Args": [
-        "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/39503/nxwitness-server_update-6.0.0.39503-linux_arm64.zip",
-        "DOWNLOAD_VERSION=6.0.0.39503",
-        "DOWNLOAD_X64_URL=https://updates.networkoptix.com/default/39503/nxwitness-server_update-6.0.0.39503-linux_x64.zip"
-      ]
-    },
     {
       "Name": "NxWitness-LSIO",
       "Branch": "develop",
@@ -532,7 +375,8 @@
       "Tags": [
         "docker.io/ptr727/nxwitness-lsio:develop",
         "docker.io/ptr727/nxwitness-lsio:develop-6.0.1.39873",
-        "docker.io/ptr727/nxwitness-lsio:develop-latest"
+        "docker.io/ptr727/nxwitness-lsio:develop-latest",
+        "docker.io/ptr727/nxwitness-lsio:develop-stable"
       ],
       "Args": [
         "DOWNLOAD_ARM64_URL=https://updates.networkoptix.com/default/39873/nxwitness-server_update-6.0.1.39873-linux_arm64.zip",
diff --git a/Make/Version.json b/Make/Version.json
index 91a4bae..34c303f 100644
--- a/Make/Version.json
+++ b/Make/Version.json
@@ -5,19 +5,12 @@
     {
       "Product": "NxGo",
       "Versions": [
-        {
-          "Version": "6.0.0.39503",
-          "UriX64": "https://updates.networkoptix.com/nxgo/39503/nxgo-server_update-6.0.0.39503-linux_x64.zip",
-          "UriArm64": "https://updates.networkoptix.com/nxgo/39503/nxgo-server_update-6.0.0.39503-linux_arm64.zip",
-          "Labels": [
-            "Stable"
-          ]
-        },
         {
           "Version": "6.0.1.39873",
           "UriX64": "https://updates.networkoptix.com/nxgo/39873/nxgo-server_update-6.0.1.39873-linux_x64.zip",
           "UriArm64": "https://updates.networkoptix.com/nxgo/39873/nxgo-server_update-6.0.1.39873-linux_arm64.zip",
           "Labels": [
+            "Stable",
             "Latest"
           ]
         }
@@ -26,19 +19,12 @@
     {
       "Product": "NxMeta",
       "Versions": [
-        {
-          "Version": "6.0.0.39503",
-          "UriX64": "https://updates.networkoptix.com/metavms/39503/metavms-server_update-6.0.0.39503-linux_x64.zip",
-          "UriArm64": "https://updates.networkoptix.com/metavms/39503/metavms-server_update-6.0.0.39503-linux_arm64.zip",
-          "Labels": [
-            "Stable"
-          ]
-        },
         {
           "Version": "6.0.1.39873",
           "UriX64": "https://updates.networkoptix.com/metavms/39873/metavms-server_update-6.0.1.39873-linux_x64.zip",
           "UriArm64": "https://updates.networkoptix.com/metavms/39873/metavms-server_update-6.0.1.39873-linux_arm64.zip",
           "Labels": [
+            "Stable",
             "Latest"
           ]
         },
@@ -55,19 +41,12 @@
     {
       "Product": "NxWitness",
       "Versions": [
-        {
-          "Version": "6.0.0.39503",
-          "UriX64": "https://updates.networkoptix.com/default/39503/nxwitness-server_update-6.0.0.39503-linux_x64.zip",
-          "UriArm64": "https://updates.networkoptix.com/default/39503/nxwitness-server_update-6.0.0.39503-linux_arm64.zip",
-          "Labels": [
-            "Stable"
-          ]
-        },
         {
           "Version": "6.0.1.39873",
           "UriX64": "https://updates.networkoptix.com/default/39873/nxwitness-server_update-6.0.1.39873-linux_x64.zip",
           "UriArm64": "https://updates.networkoptix.com/default/39873/nxwitness-server_update-6.0.1.39873-linux_arm64.zip",
           "Labels": [
+            "Stable",
             "Latest"
           ]
         }