diff --git a/pkg/agent/scripts/pkg-static-build.sh b/pkg/agent/scripts/pkg-static-build.sh
index 00fb9500..935c6cb4 100755
--- a/pkg/agent/scripts/pkg-static-build.sh
+++ b/pkg/agent/scripts/pkg-static-build.sh
@@ -70,24 +70,24 @@ mkdir -p "${pkgoutput}"
 cd "$BUILDDIR"
 for pkgname in *; do
   workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
-  mkdir -p "$workdir/${pkgname}/libexec/docker/cli-plugins" "$workdir/${pkgname}/share/doc/${pkgname}"
+  mkdir -p "$workdir/cli-plugins" "$workdir/doc"
   (
     set -x
-    cp "${pkgname}"/* "$workdir/${pkgname}/libexec/docker/cli-plugins/"
-    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/"
+    cp "${pkgname}"/* "$workdir/cli-plugins/"
+    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
   )
   if [ "$(xx-info os)" = "windows" ]; then
     pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip"
     (
       set -x
       cd "$workdir"
-      zip -r "$pkgfile" "${pkgname}"
+      zip -r "$pkgfile" cli-plugins doc
     )
   else
     pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz"
     (
       set -x
-      tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
+      tar -czf "$pkgfile" -C "$workdir" cli-plugins doc
     )
   fi
   write-sha256sum "$pkgfile"
diff --git a/pkg/agent/verify.Dockerfile b/pkg/agent/verify.Dockerfile
index ec9c49a9..c84b6a17 100644
--- a/pkg/agent/verify.Dockerfile
+++ b/pkg/agent/verify.Dockerfile
@@ -110,7 +110,11 @@ RUN --mount=from=bin,target=/build <<EOT
       set -x
       cd "${package%/*}"
       sha256sum -c "${package##*/}.sha256"
-      tar zxvf "${package##*/}" -C /usr/local --strip-components=1
+      pkgname="${package##*/}"
+      pkgname="${pkgname%%_*}"
+      mkdir -p /usr/local/libexec/docker/cli-plugins "/usr/local/share/doc/${pkgname}"
+      tar zxvf "${package##*/}" -C /usr/local/libexec/docker/cli-plugins --strip-components=1 cli-plugins
+      tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
     )
   done
   set -x
diff --git a/pkg/buildx/scripts/pkg-static-build.sh b/pkg/buildx/scripts/pkg-static-build.sh
index 9c688773..1c41f784 100755
--- a/pkg/buildx/scripts/pkg-static-build.sh
+++ b/pkg/buildx/scripts/pkg-static-build.sh
@@ -67,24 +67,24 @@ mkdir -p "${pkgoutput}"
 cd "$BUILDDIR"
 for pkgname in *; do
   workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
-  mkdir -p "$workdir/${pkgname}/libexec/docker/cli-plugins" "$workdir/${pkgname}/share/doc/${pkgname}"
+  mkdir -p "$workdir/cli-plugins" "$workdir/doc"
   (
     set -x
-    cp "${pkgname}"/* "$workdir/${pkgname}/libexec/docker/cli-plugins/"
-    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/"
+    cp "${pkgname}"/* "$workdir/cli-plugins/"
+    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
   )
   if [ "$(xx-info os)" = "windows" ]; then
     pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip"
     (
       set -x
       cd "$workdir"
-      zip -r "$pkgfile" "${pkgname}"
+      zip -r "$pkgfile" cli-plugins doc
     )
   else
     pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz"
     (
       set -x
-      tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
+      tar -czf "$pkgfile" -C "$workdir" cli-plugins doc
     )
   fi
   write-sha256sum "$pkgfile"
diff --git a/pkg/buildx/verify.Dockerfile b/pkg/buildx/verify.Dockerfile
index 2bb13a56..107cde70 100644
--- a/pkg/buildx/verify.Dockerfile
+++ b/pkg/buildx/verify.Dockerfile
@@ -110,7 +110,11 @@ RUN --mount=from=bin,target=/build <<EOT
       set -x
       cd "${package%/*}"
       sha256sum -c "${package##*/}.sha256"
-      tar zxvf "${package##*/}" -C /usr/local --strip-components=1
+      pkgname="${package##*/}"
+      pkgname="${pkgname%%_*}"
+      mkdir -p /usr/local/libexec/docker/cli-plugins "/usr/local/share/doc/${pkgname}"
+      tar zxvf "${package##*/}" -C /usr/local/libexec/docker/cli-plugins --strip-components=1 cli-plugins
+      tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
     )
   done
   set -x
diff --git a/pkg/compose/scripts/pkg-static-build.sh b/pkg/compose/scripts/pkg-static-build.sh
index 5e377780..9b451882 100755
--- a/pkg/compose/scripts/pkg-static-build.sh
+++ b/pkg/compose/scripts/pkg-static-build.sh
@@ -72,24 +72,24 @@ mkdir -p "${pkgoutput}"
 cd "$BUILDDIR"
 for pkgname in *; do
   workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
-  mkdir -p "$workdir/${pkgname}/libexec/docker/cli-plugins" "$workdir/${pkgname}/share/doc/${pkgname}"
+  mkdir -p "$workdir/cli-plugins" "$workdir/doc"
   (
     set -x
-    cp "${pkgname}"/* "$workdir/${pkgname}/libexec/docker/cli-plugins/"
-    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/"
+    cp "${pkgname}"/* "$workdir/cli-plugins/"
+    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
   )
   if [ "$(xx-info os)" = "windows" ]; then
     pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip"
     (
       set -x
       cd "$workdir"
-      zip -r "$pkgfile" "${pkgname}"
+      zip -r "$pkgfile" cli-plugins doc
     )
   else
     pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz"
     (
       set -x
-      tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
+      tar -czf "$pkgfile" -C "$workdir" cli-plugins doc
     )
   fi
   write-sha256sum "$pkgfile"
diff --git a/pkg/compose/verify.Dockerfile b/pkg/compose/verify.Dockerfile
index 75cc6676..06d3ec75 100644
--- a/pkg/compose/verify.Dockerfile
+++ b/pkg/compose/verify.Dockerfile
@@ -110,7 +110,11 @@ RUN --mount=from=bin,target=/build <<EOT
       set -x
       cd "${package%/*}"
       sha256sum -c "${package##*/}.sha256"
-      tar zxvf "${package##*/}" -C /usr/local --strip-components=1
+      pkgname="${package##*/}"
+      pkgname="${pkgname%%_*}"
+      mkdir -p /usr/local/libexec/docker/cli-plugins "/usr/local/share/doc/${pkgname}"
+      tar zxvf "${package##*/}" -C /usr/local/libexec/docker/cli-plugins --strip-components=1 cli-plugins
+      tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
     )
   done
   set -x
diff --git a/pkg/containerd/scripts/pkg-static-build.sh b/pkg/containerd/scripts/pkg-static-build.sh
index bb280282..7474ab99 100755
--- a/pkg/containerd/scripts/pkg-static-build.sh
+++ b/pkg/containerd/scripts/pkg-static-build.sh
@@ -120,17 +120,17 @@ mkdir -p "${pkgoutput}"
 cd "$BUILDDIR"
 for pkgname in *; do
   workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
-  mkdir -p "$workdir/${pkgname}/bin" "$workdir/${pkgname}/share/doc/${pkgname}"
+  mkdir -p "$workdir/bin" "$workdir/doc"
   (
     set -x
-    cp "${pkgname}"/* "$workdir/${pkgname}/bin/"
-    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/"
+    cp "${pkgname}"/* "$workdir/bin/"
+    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
     if [ "$(xx-info os)" = "windows" ]; then
-      cp "${RUNHCS_SRCDIR}/LICENSE" "$workdir/${pkgname}/share/doc/${pkgname}/runhcs.LICENSE"
-      cp "${RUNHCS_SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/runhcs.README.md"
+      cp "${RUNHCS_SRCDIR}/LICENSE" "$workdir/doc/runhcs.LICENSE"
+      cp "${RUNHCS_SRCDIR}/README.md" "$workdir/doc/runhcs.README.md"
     else
-      cp "${RUNC_SRCDIR}/LICENSE" "$workdir/${pkgname}/share/doc/${pkgname}/runc.LICENSE"
-      cp "${RUNC_SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/runc.README.md"
+      cp "${RUNC_SRCDIR}/LICENSE" "$workdir/doc/runc.LICENSE"
+      cp "${RUNC_SRCDIR}/README.md" "$workdir/doc/runc.README.md"
     fi
   )
   if [ "$(xx-info os)" = "windows" ]; then
@@ -138,13 +138,13 @@ for pkgname in *; do
     (
       set -x
       cd "$workdir"
-      zip -r "$pkgfile" "${pkgname}"
+      zip -r "$pkgfile" bin doc
     )
   else
     pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz"
     (
       set -x
-      tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
+      tar -czf "$pkgfile" -C "$workdir" bin doc
     )
   fi
   write-sha256sum "$pkgfile"
diff --git a/pkg/containerd/verify.Dockerfile b/pkg/containerd/verify.Dockerfile
index 60f67f84..faccacb7 100644
--- a/pkg/containerd/verify.Dockerfile
+++ b/pkg/containerd/verify.Dockerfile
@@ -114,7 +114,11 @@ RUN --mount=from=bin,target=/build <<EOT
       set -x
       cd "${package%/*}"
       sha256sum -c "${package##*/}.sha256"
-      tar zxvf "${package##*/}" -C /usr/local --strip-components=1
+      pkgname="${package##*/}"
+      pkgname="${pkgname%%_*}"
+      mkdir -p "/usr/local/share/doc/${pkgname}"
+      tar zxvf "${package##*/}" -C /usr/local/bin --strip-components=1 bin
+      tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
     )
   done
   set -x
diff --git a/pkg/credential-helpers/scripts/pkg-static-build.sh b/pkg/credential-helpers/scripts/pkg-static-build.sh
index 5e787ed6..d2bcb902 100755
--- a/pkg/credential-helpers/scripts/pkg-static-build.sh
+++ b/pkg/credential-helpers/scripts/pkg-static-build.sh
@@ -94,24 +94,24 @@ mkdir -p "${pkgoutput}"
 cd "$BUILDDIR"
 for pkgname in *; do
   workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
-  mkdir -p "$workdir/${pkgname}/bin" "$workdir/${pkgname}/share/doc/${pkgname}"
+  mkdir -p "$workdir/bin" "$workdir/doc"
   (
     set -x
-    cp "${pkgname}"/* "$workdir/${pkgname}/bin/"
-    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${pkgname}/share/doc/${pkgname}/"
+    cp "${pkgname}"/* "$workdir/bin/"
+    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
   )
   if [ "$(xx-info os)" = "windows" ]; then
     pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip"
     (
       set -x
       cd "$workdir"
-      zip -r "$pkgfile" "${pkgname}"
+      zip -r "$pkgfile" bin doc
     )
   else
     pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz"
     (
       set -x
-      tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
+      tar -czf "$pkgfile" -C "$workdir" bin doc
     )
   fi
   write-sha256sum "$pkgfile"
diff --git a/pkg/credential-helpers/verify.Dockerfile b/pkg/credential-helpers/verify.Dockerfile
index d41d5e2d..7251d78b 100644
--- a/pkg/credential-helpers/verify.Dockerfile
+++ b/pkg/credential-helpers/verify.Dockerfile
@@ -123,7 +123,11 @@ RUN --mount=from=bin,target=/build <<EOT
       set -x
       cd "${package%/*}"
       sha256sum -c "${package##*/}.sha256"
-      tar zxvf "${package##*/}" -C /usr/local --strip-components=1
+      pkgname="${package##*/}"
+      pkgname="${pkgname%%_*}"
+      mkdir -p "/usr/local/share/doc/${pkgname}"
+      tar zxvf "${package##*/}" -C /usr/local/bin --strip-components=1 bin
+      tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
     )
   done
   set -x
diff --git a/pkg/docker-cli/scripts/pkg-static-build.sh b/pkg/docker-cli/scripts/pkg-static-build.sh
index 96800517..61fe8b46 100755
--- a/pkg/docker-cli/scripts/pkg-static-build.sh
+++ b/pkg/docker-cli/scripts/pkg-static-build.sh
@@ -81,24 +81,24 @@ dirname="docker-cli"
 cd "$BUILDDIR"
 for pkgname in *; do
   workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
-  mkdir -p "$workdir/${dirname}/bin" "$workdir/${dirname}/share/doc/${dirname}"
+  mkdir -p "$workdir/bin" "$workdir/doc"
   (
     set -x
-    cp -L "${pkgname}/docker" "$workdir/${dirname}/bin/${clibin}"
-    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${dirname}/share/doc/${dirname}/"
+    cp -L "${pkgname}/docker" "$workdir/bin/${clibin}"
+    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
   )
   if [ "$(xx-info os)" = "windows" ]; then
     pkgfile="${pkgoutput}/${dirname}_${GENVER_VERSION#v}.zip"
     (
       set -x
       cd "$workdir"
-      zip -r "$pkgfile" "${dirname}"
+      zip -r "$pkgfile" bin doc
     )
   else
     pkgfile="${pkgoutput}/${dirname}_${GENVER_VERSION#v}.tgz"
     (
       set -x
-      tar -czf "$pkgfile" -C "$workdir" "${dirname}"
+      tar -czf "$pkgfile" -C "$workdir" bin doc
     )
   fi
   write-sha256sum "$pkgfile"
diff --git a/pkg/docker-cli/verify.Dockerfile b/pkg/docker-cli/verify.Dockerfile
index cc8f55b8..c9790037 100644
--- a/pkg/docker-cli/verify.Dockerfile
+++ b/pkg/docker-cli/verify.Dockerfile
@@ -110,7 +110,11 @@ RUN --mount=from=bin,target=/build <<EOT
       set -x
       cd "${package%/*}"
       sha256sum -c "${package##*/}.sha256"
-      tar zxvf "${package##*/}" -C /usr/local --strip-components=1
+      pkgname="${package##*/}"
+      pkgname="${pkgname%%_*}"
+      mkdir -p "/usr/local/share/doc/${pkgname}"
+      tar zxvf "${package##*/}" -C /usr/local/bin --strip-components=1 bin
+      tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
     )
   done
   set -x
diff --git a/pkg/docker-engine/scripts/pkg-static-build.sh b/pkg/docker-engine/scripts/pkg-static-build.sh
index 2285ce8a..28b869ae 100755
--- a/pkg/docker-engine/scripts/pkg-static-build.sh
+++ b/pkg/docker-engine/scripts/pkg-static-build.sh
@@ -96,24 +96,24 @@ dirname="docker-engine"
 cd "$BUILDDIR"
 for pkgname in *; do
   workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
-  mkdir -p "$workdir/${dirname}/bin" "$workdir/${dirname}/share/doc/${dirname}"
+  mkdir -p "$workdir/bin" "$workdir/doc"
   (
     set -x
-    cp "${pkgname}"/* "$workdir/${dirname}/bin/"
-    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/${dirname}/share/doc/${dirname}/"
+    cp "${pkgname}"/* "$workdir/bin/"
+    cp "${SRCDIR}/LICENSE" "${SRCDIR}/README.md" "$workdir/doc/"
   )
   if [ "$(xx-info os)" = "windows" ]; then
     pkgfile="${pkgoutput}/${dirname}_${GENVER_VERSION#v}.zip"
     (
       set -x
       cd "$workdir"
-      zip -r "$pkgfile" "${dirname}"
+      zip -r "$pkgfile" bin doc
     )
   else
     pkgfile="${pkgoutput}/${dirname}_${GENVER_VERSION#v}.tgz"
     (
       set -x
-      tar -czf "$pkgfile" -C "$workdir" "${dirname}"
+      tar -czf "$pkgfile" -C "$workdir" bin doc
     )
   fi
   write-sha256sum "$pkgfile"
diff --git a/pkg/docker-engine/verify.Dockerfile b/pkg/docker-engine/verify.Dockerfile
index c983113f..15e28245 100644
--- a/pkg/docker-engine/verify.Dockerfile
+++ b/pkg/docker-engine/verify.Dockerfile
@@ -123,7 +123,11 @@ RUN --mount=from=bin,target=/build <<EOT
       set -x
       cd "${package%/*}"
       sha256sum -c "${package##*/}.sha256"
-      tar zxvf "${package##*/}" -C /usr/local --strip-components=1
+      pkgname="${package##*/}"
+      pkgname="${pkgname%%_*}"
+      mkdir -p "/usr/local/share/doc/${pkgname}"
+      tar zxvf "${package##*/}" -C /usr/local/bin --strip-components=1 bin
+      tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
     )
   done
   set -x
diff --git a/pkg/model/scripts/pkg-static-build.sh b/pkg/model/scripts/pkg-static-build.sh
index 67f7fa02..77ae6fb5 100755
--- a/pkg/model/scripts/pkg-static-build.sh
+++ b/pkg/model/scripts/pkg-static-build.sh
@@ -68,24 +68,24 @@ mkdir -p "${pkgoutput}"
 cd "$BUILDDIR"
 for pkgname in *; do
   workdir=$(mktemp -d -t docker-packaging.XXXXXXXXXX)
-  mkdir -p "$workdir/${pkgname}/libexec/docker/cli-plugins" "$workdir/${pkgname}/share/doc/${pkgname}"
+  mkdir -p "$workdir/cli-plugins" "$workdir/doc"
   (
     set -x
-    cp "${pkgname}"/* "$workdir/${pkgname}/libexec/docker/cli-plugins/"
-    cp "${SRCDIR}/LICENSE" "$workdir/${pkgname}/share/doc/${pkgname}/"
+    cp "${pkgname}"/* "$workdir/cli-plugins/"
+    cp "${SRCDIR}/LICENSE" "$workdir/doc/"
   )
   if [ "$(xx-info os)" = "windows" ]; then
     pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.zip"
     (
       set -x
       cd "$workdir"
-      zip -r "$pkgfile" "${pkgname}"
+      zip -r "$pkgfile" cli-plugins doc
     )
   else
     pkgfile="${pkgoutput}/${pkgname}_${GENVER_VERSION#v}.tgz"
     (
       set -x
-      tar -czf "$pkgfile" -C "$workdir" "${pkgname}"
+      tar -czf "$pkgfile" -C "$workdir" cli-plugins doc
     )
   fi
   write-sha256sum "$pkgfile"
diff --git a/pkg/model/verify.Dockerfile b/pkg/model/verify.Dockerfile
index 29672db7..f0fcbd7a 100644
--- a/pkg/model/verify.Dockerfile
+++ b/pkg/model/verify.Dockerfile
@@ -110,7 +110,11 @@ RUN --mount=from=bin,target=/build <<EOT
       set -x
       cd "${package%/*}"
       sha256sum -c "${package##*/}.sha256"
-      tar zxvf "${package##*/}" -C /usr/local --strip-components=1
+      pkgname="${package##*/}"
+      pkgname="${pkgname%%_*}"
+      mkdir -p /usr/local/libexec/docker/cli-plugins "/usr/local/share/doc/${pkgname}"
+      tar zxvf "${package##*/}" -C /usr/local/libexec/docker/cli-plugins --strip-components=1 cli-plugins
+      tar zxvf "${package##*/}" -C "/usr/local/share/doc/${pkgname}" --strip-components=1 doc
     )
   done
   set -x