diff --git a/.github/.goreleaser.yml b/.github/.goreleaser.yml
index bed8c71424..09d25946b0 100644
--- a/.github/.goreleaser.yml
+++ b/.github/.goreleaser.yml
@@ -40,7 +40,7 @@ archives:
       {{- title .Os }}_
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
-      {{- else }}{{ .Arch }}{{ end }}
+      {{- else }}{{ .Arch }}{{ end }}_{{ .Env.GIT_HASH }}
     format: tar.gz
     format_overrides:
       - goos: windows
diff --git a/.github/workflows/build-and-release-snapshot-plugin.yml b/.github/workflows/build-and-release-snapshot-plugin.yml
index e43de11f6c..d8c2d1bfea 100644
--- a/.github/workflows/build-and-release-snapshot-plugin.yml
+++ b/.github/workflows/build-and-release-snapshot-plugin.yml
@@ -3,6 +3,9 @@ name: Kanvas Snapshot Build & Release
 on:
   release:
     types: [published]
+  pull_request:
+    branches:
+      - master
 
   workflow_dispatch:
 jobs:
@@ -20,6 +23,9 @@ jobs:
         uses: actions/setup-go@v5
         with:
           go-version: "1.21"
+
+      - name: Get Git short hash
+        run: echo "GIT_HASH=$(git rev-parse --short $GITHUB_SHA)" >> $GITHUB_ENV
     
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v6
diff --git a/plugin.yaml b/cmd/kanvas-snapshot/plugin.yaml
similarity index 100%
rename from plugin.yaml
rename to cmd/kanvas-snapshot/plugin.yaml