diff --git a/.github/actions/create-plugin-artifact/action.yml b/.github/actions/create-plugin-artifact/action.yml
index 7c49459e..3014b593 100644
--- a/.github/actions/create-plugin-artifact/action.yml
+++ b/.github/actions/create-plugin-artifact/action.yml
@@ -22,12 +22,16 @@ runs:
       working-directory: plugins/${{ inputs.slug }}
       run: |
         echo "${GITHUB_SHA}" > build-sha.txt
-        rm -f plugin-build/${{ inputs.slug }}-*.zip
+        rm -rf plugin-build/${{ inputs.slug }}*
         composer archive -vvv --format=zip --file="plugin-build/${{ inputs.slug }}" --dir="."
+        # Extract the zip so artifact upload creates proper structure
+        # (avoids double-zip issue where downloaded artifact contains a zip)
+        unzip plugin-build/${{ inputs.slug }}.zip -d plugin-build/${{ inputs.slug }}
+        rm plugin-build/${{ inputs.slug }}.zip
       shell: bash
 
     - name: Upload plugin artifact
       uses: actions/upload-artifact@v4
       with:
         name: ${{ inputs.slug }}
-        path: plugins/${{ inputs.slug }}/plugin-build/*.zip
+        path: plugins/${{ inputs.slug }}/plugin-build/${{ inputs.slug }}
diff --git a/plugins/hwp-previews/composer.json b/plugins/hwp-previews/composer.json
index 966c4bcf..5a936ca4 100644
--- a/plugins/hwp-previews/composer.json
+++ b/plugins/hwp-previews/composer.json
@@ -72,9 +72,8 @@
 	"archive": {
 		"name": "hwp-previews",
 		"exclude": [
-			"/.DS_Store",
-			"/.docker/",
-			"/.env.dist",
+			"/.*",
+			"/build-sha.txt",
 			"/ACTIONS_AND_FILTERS.md",
 			"/TESTING.md",
 			"/Thumbs.db",
diff --git a/plugins/wpgraphql-logging/composer.json b/plugins/wpgraphql-logging/composer.json
index ecd73f52..018533e9 100644
--- a/plugins/wpgraphql-logging/composer.json
+++ b/plugins/wpgraphql-logging/composer.json
@@ -80,9 +80,8 @@
 	"archive": {
 		"name": "wpgraphql-logging",
 		"exclude": [
-			"/.DS_Store",
-			"/.docker/",
-			"/.env.dist",
+			"/.*",
+			"/build-sha.txt",
 			"/docs",
 			"/TESTING.md",
 			"/Thumbs.db",
@@ -93,7 +92,6 @@
 			"/codeception.dist.yml",
 			"/docker",
 			"/docker-compose.yml",
-			"/docs",
 			"/examples",
 			"/node_modules",
 			"/package-lock.json",