diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index ab37225f..eacabe2f 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -344,7 +344,7 @@ jobs:
           dir
           del build.cjs
           del "./${env:DIST_FILE_NAME}.exe"
-          del "./${{ needs.release-please.outputs.release_version }}-win.zip"
+          del "./${env:DIST_FILE_NAME}-${{ needs.release-please.outputs.release_version }}-win.zip"
 
   release-linux:
     needs: release-please
@@ -403,10 +403,10 @@ jobs:
           # - ./src/config⁄schedule_template.yaml
 
           ls -la
-          zip -9 -r "./${{ needs.release-please.outputs.release_version }}-linux.zip" ${DIST_FILE_NAME} 
+          zip -9 -r "./${DIST_FILE_NAME}-${{ needs.release-please.outputs.release_version }}-linux.zip" ${DIST_FILE_NAME} 
 
           cd src
-          zip -9 -u -r "../${{ needs.release-please.outputs.release_version }}-linux.zip" "./config/email_templates" "./config/slack_templates" "./config/teams_templates" "./config/production_template.yaml" "./config/schedule_template.yaml" "./config/log_appender_xml"
+          zip -9 -u -r "../${DIST_FILE_NAME}-${{ needs.release-please.outputs.release_version }}-linux.zip" "./config/email_templates" "./config/slack_templates" "./config/teams_templates" "./config/production_template.yaml" "./config/schedule_template.yaml" "./config/log_appender_xml"
           cd ..
 
       - name: Debug
@@ -423,7 +423,7 @@ jobs:
           # artifactContentType: application/zip
           draft: true
           tag: ${{ needs.release-please.outputs.release_version }}
-          artifacts: ./${{ needs.release-please.outputs.release_version }}-linux.zip
+          artifacts: ./butler-${{ needs.release-please.outputs.release_version }}-linux.zip
           token: ${{ github.token }}
 
       - name: Tidy up before existing
diff --git a/.github/workflows/docker-image-build.yaml b/.github/workflows/docker-image-build.yaml
index 5fbdeeb2..9a4a09ed 100644
--- a/.github/workflows/docker-image-build.yaml
+++ b/.github/workflows/docker-image-build.yaml
@@ -81,7 +81,7 @@ jobs:
         run: |
           #export TAGTMP1=${{ github.ref }}
           #export TAG=${TAGTMP1##*/}
-          export TAG=$(echo ${{ github.ref }} | grep -oE 'v[0-9]+\.[0-9]+\.[0-9]+' | cut -c 2-)
+          export TAG=$(echo ${{ github.ref }} | grep -oE "[0-9]+\.[0-9]+\.[0-9]+"
           echo "TAG=$TAG" >> $GITHUB_ENV
           #
           # Debug
diff --git a/package-lock.json b/package-lock.json
index c31db634..eb1db13b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -57,7 +57,7 @@
                 "qrs-interact": "^6.3.1",
                 "rate-limiter-flexible": "^5.0.0",
                 "serializeapp": "^3.0.0",
-                "systeminformation": "^5.22.6",
+                "systeminformation": "^5.22.7",
                 "upath": "^2.0.1",
                 "uuid": "^9.0.1",
                 "winston": "^3.13.0",
@@ -71,7 +71,7 @@
                 "eslint-plugin-import": "^2.29.1",
                 "jest": "^29.7.0",
                 "prettier": "^3.2.5",
-                "snyk": "^1.1286.2"
+                "snyk": "^1.1287.0"
             }
         },
         "node_modules/@aashutoshrathi/word-wrap": {
@@ -7587,9 +7587,9 @@
             }
         },
         "node_modules/snyk": {
-            "version": "1.1286.2",
-            "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.1286.2.tgz",
-            "integrity": "sha512-gb7PfujO1uJY7iDkmxq1d32bth/e2CZ1Yw28E620punYyf7rcwzO06BnRB65lbbxqnhfpb8L+pnbH4ZYkyNs5g==",
+            "version": "1.1287.0",
+            "resolved": "https://registry.npmjs.org/snyk/-/snyk-1.1287.0.tgz",
+            "integrity": "sha512-ZpsMjXLy5NPoMk0HbylsSDbhA6S8wSMqWO2DupIlJ7Q1URiv4+dOiL4wUYPViMFFNi9HdoYF00cxJyM1Y5I4QQ==",
             "dev": true,
             "hasInstallScript": true,
             "dependencies": {
@@ -7860,9 +7860,9 @@
             }
         },
         "node_modules/systeminformation": {
-            "version": "5.22.6",
-            "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.22.6.tgz",
-            "integrity": "sha512-hUTQX+bRgIFbv1T/z251NtwGwNIeSyWURnT2BGnsYu6dQNbkiBl4oAwk50acVfITFq1Zvb8KDNgibQK9uGlUGg==",
+            "version": "5.22.7",
+            "resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-5.22.7.tgz",
+            "integrity": "sha512-AWxlP05KeHbpGdgvZkcudJpsmChc2Y5Eo/GvxG/iUA/Aws5LZKHAMSeAo+V+nD+nxWZaxrwpWcnx4SH3oxNL3A==",
             "os": [
                 "darwin",
                 "linux",
diff --git a/package.json b/package.json
index 3c3b2fff..5a8f0c73 100644
--- a/package.json
+++ b/package.json
@@ -97,7 +97,7 @@
         "qrs-interact": "^6.3.1",
         "rate-limiter-flexible": "^5.0.0",
         "serializeapp": "^3.0.0",
-        "systeminformation": "^5.22.6",
+        "systeminformation": "^5.22.7",
         "upath": "^2.0.1",
         "uuid": "^9.0.1",
         "winston": "^3.13.0",
@@ -111,7 +111,7 @@
         "eslint-plugin-import": "^2.29.1",
         "jest": "^29.7.0",
         "prettier": "^3.2.5",
-        "snyk": "^1.1286.2"
+        "snyk": "^1.1287.0"
     },
     "pkg": {
         "assets": [