diff --git a/.dockerignore b/.dockerignore
index ffdf587e3..0f8b42a97 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,7 @@
 **/.git
 .github/
 .vscode/
-.deno/
\ No newline at end of file
+.deno/
+test/
+docs/
+contrib/
diff --git a/.github/workflows/dockertests.yml b/.github/workflows/dockertests.yml
index cdbe57fc3..4fed53f88 100644
--- a/.github/workflows/dockertests.yml
+++ b/.github/workflows/dockertests.yml
@@ -39,7 +39,7 @@ jobs:
       - name: npm install, build and test
         run: |
           corepack enable
-          corepack pnpm install
+          corepack pnpm install --package-import-method copy
           corepack pnpm test
           mkdir -p bomresults repotests
         env:
@@ -105,7 +105,7 @@ jobs:
       - name: npm install, build and test
         run: |
           corepack enable
-          corepack pnpm install
+          corepack pnpm install --package-import-method copy
           corepack pnpm test
           mkdir -p bomresults repotests
         env:
@@ -152,7 +152,7 @@ jobs:
       - name: npm install, build and test
         run: |
           corepack enable
-          corepack pnpm install
+          corepack pnpm install --package-import-method copy
           mkdir -p bomresults
         env:
           CI: true
@@ -191,7 +191,7 @@ jobs:
       - name: npm install, build
         run: |
           corepack enable
-          corepack pnpm install
+          corepack pnpm install --package-import-method copy
           mkdir bomresults
         env:
           CI: true
diff --git a/.github/workflows/repotests.yml b/.github/workflows/repotests.yml
index 5e54f9d61..0076a02f1 100644
--- a/.github/workflows/repotests.yml
+++ b/.github/workflows/repotests.yml
@@ -48,7 +48,7 @@ jobs:
       - name: npm install, build and test
         run: |
           corepack enable
-          corepack pnpm install
+          corepack pnpm install --package-import-method copy
           corepack pnpm test
           mkdir -p repotests
           mkdir -p bomresults
@@ -531,7 +531,6 @@ jobs:
         shell: bash
       - name: denotests
         run: |
-          rm -rf node_modules
           deno info bin/cdxgen.js
           deno info bin/evinse.js
           deno run --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write --allow-net bin/cdxgen.js -p -t java repotests/java-sec-code -o bomresults/bom-java-sec-code-deno.json --deep
diff --git a/ci/Dockerfile b/ci/Dockerfile
index ef72a3003..80e5fb026 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -146,7 +146,7 @@ RUN set -e; \
     && gem install bundler \
     && gem --version \
     && bundler --version \
-    && cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method clone \
+    && cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method copy \
     && mkdir -p /opt/cdxgen-node-cache \
     && chown -R cyclonedx:cyclonedx /opt/cdxgen /opt/cdxgen-node-cache \
     && chmod a-w -R /opt \
diff --git a/ci/Dockerfile-ppc64 b/ci/Dockerfile-ppc64
index ed70c5ad3..465a9dbb8 100644
--- a/ci/Dockerfile-ppc64
+++ b/ci/Dockerfile-ppc64
@@ -106,7 +106,7 @@ RUN set -e; \
     && gem --version \
     && bundler --version
 COPY . /opt/cdxgen
-RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method clone \
+RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --prod --package-import-method copy \
     && chown -R cyclonedx:cyclonedx /opt/cdxgen \
     && chmod a-w -R /opt \
     && rm -rf /root/.cache /var/cache/yum /root/.cargo \