diff --git a/goss/goss-linux.yaml b/goss/goss-linux.yaml
index a35921d6e..a7db3c2ad 100644
--- a/goss/goss-linux.yaml
+++ b/goss/goss-linux.yaml
@@ -13,6 +13,11 @@ command:
   chromium-browser:
     exec: chromium-browser --version
     exit-status: 0
+  container-structure-test:
+    exec: container-structure-test version
+    exit-status: 0
+    stdout:
+      - 1.16.0
   datadog-agent:
     exec: datadog-agent version
     exit-status: 0
diff --git a/provisioning/windows-provision.ps1 b/provisioning/windows-provision.ps1
index 013324845..4350c2540 100644
--- a/provisioning/windows-provision.ps1
+++ b/provisioning/windows-provision.ps1
@@ -174,7 +174,7 @@ $downloads = [ordered]@{
         'cleanupLocal' = 'true';
     };
     'jq' = @{
-        'url' = 'https://github.com/stedolan/jq/releases/download/jq-{0}/jq-win64.exe'  -f $env:JQ_VERSION;
+        'url' = 'https://github.com/jqlang/jq/releases/download/jq-{0}/jq-win64.exe'  -f $env:JQ_VERSION;
         'local' = "$baseDir\jq.exe"
     };
     'az' = @{
diff --git a/updatecli/updatecli.d/awscli.yml b/updatecli/updatecli.d/awscli.yml
index 54c4c255a..4ef25a3fa 100644
--- a/updatecli/updatecli.d/awscli.yml
+++ b/updatecli/updatecli.d/awscli.yml
@@ -48,8 +48,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.awscli.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/azure-cli.yml b/updatecli/updatecli.d/azure-cli.yml
index ff83539eb..ae51a2151 100644
--- a/updatecli/updatecli.d/azure-cli.yml
+++ b/updatecli/updatecli.d/azure-cli.yml
@@ -43,8 +43,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.azurecli.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/container-structure-test.yml b/updatecli/updatecli.d/container-structure-test.yml
index ebcdaff5a..2fe672768 100644
--- a/updatecli/updatecli.d/container-structure-test.yml
+++ b/updatecli/updatecli.d/container-structure-test.yml
@@ -41,11 +41,8 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.container-structure-test.stdout[0]
-    transformers:
-      - addprefix: "v"
     scmid: default
 
 actions:
diff --git a/updatecli/updatecli.d/docker-compose.yml b/updatecli/updatecli.d/docker-compose.yml
index 61d2d706a..329a737dd 100644
--- a/updatecli/updatecli.d/docker-compose.yml
+++ b/updatecli/updatecli.d/docker-compose.yml
@@ -40,8 +40,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.docker_compose.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/git-lfs.yml b/updatecli/updatecli.d/git-lfs.yml
index cec3613fe..1190dcab8 100644
--- a/updatecli/updatecli.d/git-lfs.yml
+++ b/updatecli/updatecli.d/git-lfs.yml
@@ -40,8 +40,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.git_lfs.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/github-cli.yml b/updatecli/updatecli.d/github-cli.yml
index e5fd2700e..348c4aad7 100644
--- a/updatecli/updatecli.d/github-cli.yml
+++ b/updatecli/updatecli.d/github-cli.yml
@@ -41,8 +41,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.gh_cli.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/goss.yml b/updatecli/updatecli.d/goss.yml
index cd3ae395c..d3e810d69 100644
--- a/updatecli/updatecli.d/goss.yml
+++ b/updatecli/updatecli.d/goss.yml
@@ -40,8 +40,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.goss.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/hadolint.yml b/updatecli/updatecli.d/hadolint.yml
index 9d205f6b6..bb39473a2 100644
--- a/updatecli/updatecli.d/hadolint.yml
+++ b/updatecli/updatecli.d/hadolint.yml
@@ -41,8 +41,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.hadolint.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/jdk11.yml b/updatecli/updatecli.d/jdk11.yml
index 69392ce4a..a893cd479 100644
--- a/updatecli/updatecli.d/jdk11.yml
+++ b/updatecli/updatecli.d/jdk11.yml
@@ -60,8 +60,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.default_java.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/jq.yml.disabled b/updatecli/updatecli.d/jq.yml
similarity index 76%
rename from updatecli/updatecli.d/jq.yml.disabled
rename to updatecli/updatecli.d/jq.yml
index 86896eb8a..44fc78d91 100644
--- a/updatecli/updatecli.d/jq.yml.disabled
+++ b/updatecli/updatecli.d/jq.yml
@@ -18,17 +18,24 @@ sources:
     kind: githubrelease
     name: Get the latest jq release version
     spec:
-      owner: "stedolan"
+      owner: "jqlang"
       repository: "jq"
       token: "{{ requiredEnv .github.token }}"
       username: "{{ .github.username }}"
       versionfilter:
         kind: regex
         ## Latest stable x.y.z version
-        pattern: 'jq-(\d*)\.(\d*)$'
+        pattern: 'jq-(\d*)\.(\d*)\.(\d*)$'
     transformers:
       - trimprefix: "jq-"
 
+conditions:
+  checkwindowsversion:
+    disablesourceinput: true
+    kind: shell
+    spec:
+      command: curl --connect-timeout 5 --verbose --silent --show-error --location --fail --head --output /dev/null "https://github.com/jqlang/jq/releases/download/jq-{{ source "lastReleaseVersion" }}/jq-win64.exe"
+
 targets:
   updateVersion:
     name: "Update the jq version in the tools-versions.yml file"
@@ -43,8 +50,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.jq.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/jx-release-version.yml b/updatecli/updatecli.d/jx-release-version.yml
index 0e81db34d..6f4f487f7 100644
--- a/updatecli/updatecli.d/jx-release-version.yml
+++ b/updatecli/updatecli.d/jx-release-version.yml
@@ -41,8 +41,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.jx-release-version.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/launchable.yml b/updatecli/updatecli.d/launchable.yml
index d2d7dd7e9..8168fe7c4 100644
--- a/updatecli/updatecli.d/launchable.yml
+++ b/updatecli/updatecli.d/launchable.yml
@@ -41,8 +41,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.launchable.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/nodejs.yml b/updatecli/updatecli.d/nodejs.yml
index b3b36168e..973577bc2 100644
--- a/updatecli/updatecli.d/nodejs.yml
+++ b/updatecli/updatecli.d/nodejs.yml
@@ -55,8 +55,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.nodejs.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/packer.yml b/updatecli/updatecli.d/packer.yml
index 16b4b05ca..458a1ae1a 100644
--- a/updatecli/updatecli.d/packer.yml
+++ b/updatecli/updatecli.d/packer.yml
@@ -49,8 +49,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.packer.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/terraform.yml b/updatecli/updatecli.d/terraform.yml
index a8e92280a..4ccdec2c2 100644
--- a/updatecli/updatecli.d/terraform.yml
+++ b/updatecli/updatecli.d/terraform.yml
@@ -48,8 +48,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.terraform.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/trivy.yaml b/updatecli/updatecli.d/trivy.yaml
index f455f1aa9..56764852c 100644
--- a/updatecli/updatecli.d/trivy.yaml
+++ b/updatecli/updatecli.d/trivy.yaml
@@ -51,8 +51,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.trivy.stdout[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/updatecli.yml b/updatecli/updatecli.d/updatecli.yml
index e1d93e9b9..27b1f5641 100644
--- a/updatecli/updatecli.d/updatecli.yml
+++ b/updatecli/updatecli.d/updatecli.yml
@@ -41,8 +41,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.updatecli.stderr[0]
     scmid: default
 
diff --git a/updatecli/updatecli.d/yq.yml b/updatecli/updatecli.d/yq.yml
index edc0ef89d..097b1361b 100644
--- a/updatecli/updatecli.d/yq.yml
+++ b/updatecli/updatecli.d/yq.yml
@@ -49,8 +49,7 @@ targets:
     kind: yaml
     spec:
       files:
-        - goss/goss-linux.yaml
-        - goss/goss-windows.yaml
+        - goss/goss-common.yaml
       key: $.command.yq.stdout[0]
     scmid: default