diff --git a/.github/workflows/build-and-upload.yaml b/.github/workflows/build-and-publish-standalone.yaml
similarity index 99%
rename from .github/workflows/build-and-upload.yaml
rename to .github/workflows/build-and-publish-standalone.yaml
index c66afae2..eda93b6f 100644
--- a/.github/workflows/build-and-upload.yaml
+++ b/.github/workflows/build-and-publish-standalone.yaml
@@ -1,4 +1,4 @@
-name: Build Harvester Dashboard and Upload
+name: Build Harvester Dashboard and Publish
 
 on:
   workflow_call:
diff --git a/.github/workflows/build-extension-charts-on-pr-merge.yml b/.github/workflows/build-extension-on-merge.yml
similarity index 100%
rename from .github/workflows/build-extension-charts-on-pr-merge.yml
rename to .github/workflows/build-extension-on-merge.yml
diff --git a/.github/workflows/build-extension-charts-on-release.yml b/.github/workflows/build-extension-on-release.yml
similarity index 100%
rename from .github/workflows/build-extension-charts-on-release.yml
rename to .github/workflows/build-extension-on-release.yml
diff --git a/.github/workflows/build-and-upload-branch.yaml b/.github/workflows/build-standalone-on-merge.yaml
similarity index 81%
rename from .github/workflows/build-and-upload-branch.yaml
rename to .github/workflows/build-standalone-on-merge.yaml
index ad786c66..ac5f0893 100644
--- a/.github/workflows/build-and-upload-branch.yaml
+++ b/.github/workflows/build-standalone-on-merge.yaml
@@ -1,4 +1,4 @@
-name: Build Dashboard (Branch)
+name: Build Standalone on PR Merge
 
 on:
   push:
@@ -11,7 +11,7 @@ on:
       - main
       - 'release-harvester-v*'
       - '*-dev'
-    types: 
+    types:
       - merged
 
 jobs:
@@ -20,7 +20,7 @@ jobs:
     uses: ./.github/workflows/test.yaml
   build:
     name: Build and Upload Package
-    uses: ./.github/workflows/build-and-upload.yaml
+    uses: ./.github/workflows/build-and-publish-standalone.yaml
     needs:
       - build-validation
     permissions:
diff --git a/.github/workflows/build-and-upload-release.yaml b/.github/workflows/build-standalone-on-release.yaml
similarity index 77%
rename from .github/workflows/build-and-upload-release.yaml
rename to .github/workflows/build-standalone-on-release.yaml
index b0829606..ac78a5ad 100644
--- a/.github/workflows/build-and-upload-release.yaml
+++ b/.github/workflows/build-standalone-on-release.yaml
@@ -1,4 +1,4 @@
-name: Build Dashboard (Release)
+name: Build Standalone on Release
 on:
   push:
     tags:
@@ -10,7 +10,7 @@ jobs:
     uses: ./.github/workflows/test.yaml
   build:
     name: Build and Upload Package
-    uses: ./.github/workflows/build-and-upload.yaml
+    uses: ./.github/workflows/build-and-publish-standalone.yaml
     needs:
       - build-validation
     permissions:
diff --git a/.github/workflows/test.yaml b/.github/workflows/run-test-on-merge.yaml
similarity index 100%
rename from .github/workflows/test.yaml
rename to .github/workflows/run-test-on-merge.yaml