diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml
index 806fc0ac..997bd372 100644
--- a/.github/actions/publish/action.yml
+++ b/.github/actions/publish/action.yml
@@ -114,6 +114,10 @@ runs:
       env:
         SM_CLIENT_CERT_FILE_B64: ${{ fromJSON(inputs.secrets).SM_CLIENT_CERT_FILE_B64 }}
 
+    - name: Install DigiCert Client tools from Github Custom Actions marketplace
+      if: runner.os == 'Windows'
+      uses: digicert/ssm-code-signing@v1.0.0
+
     - name: Package release
       shell: bash
       # IMPORTANT: before making changes to this step please consult @engineering in balena's chat.
@@ -138,22 +142,6 @@ runs:
           PLATFORM=Windows
           SHA256SUM_BIN=sha256sum
 
-          # Install DigiCert Signing Manager Tools
-          curl --silent --retry 3 --fail https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download \
-            -H "x-api-key:$SM_API_KEY" \
-            -o smtools-windows-x64.msi
-          msiexec -i smtools-windows-x64.msi -qn
-          PATH="/c/Program Files/DigiCert/DigiCert One Signing Manager Tools:${PATH}"
-          smksp_registrar.exe list
-          smctl.exe keypair ls
-          /c/Windows/System32/certutil.exe -csp "DigiCert Signing Manager KSP" -key -user
-          smksp_cert_sync.exe
-
-          echo "INFO: Certs list"
-          certutil.exe -csp "DigiCert Software Trust Manager KSP" -key -user
-          certutil.exe -store -user My
-          echo "INFO: End certs list"
-
           # (signtool.exe) https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md#installed-windows-sdks
           PATH="/c/Program Files (x86)/Windows Kits/10/bin/${runner_arch}:${PATH}"
 
diff --git a/.github/workflows/flowzone.yml b/.github/workflows/flowzone.yml
index 9c8cc5a3..1a70cf5d 100644
--- a/.github/workflows/flowzone.yml
+++ b/.github/workflows/flowzone.yml
@@ -21,21 +21,15 @@ jobs:
       custom_test_matrix: >
         {
           "os": [
-            ["ubuntu-22.04"],
-            ["windows-2019"],
-            ["macos-13"],
-            ["macos-latest-xlarge"]
+            ["windows-2022"],
           ]
         }
       custom_publish_matrix: >
         {
           "os": [
-            ["ubuntu-22.04"],
-            ["windows-2019"],
-            ["macos-13"],
-            ["macos-latest-xlarge"]
+            ["windows-2022"],
           ]
         }
       restrict_custom_actions: false
       github_prerelease: true
-      cloudflare_website: "etcher"
+      cloudflare_website: 'etcher'