diff --git a/.github/workflows/e2e-cache.yml b/.github/workflows/e2e-cache.yml
index 76cc34502..ce3366a1f 100644
--- a/.github/workflows/e2e-cache.yml
+++ b/.github/workflows/e2e-cache.yml
@@ -61,7 +61,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: ['3.9', 'pypy-3.7-v7.x']
+        python-version: ['3.9', 'pypy-3.8']
     steps:
       - uses: actions/checkout@v3
       - name: Install poetry
diff --git a/dist/setup/index.js b/dist/setup/index.js
index bef05d7fe..cc8225768 100644
--- a/dist/setup/index.js
+++ b/dist/setup/index.js
@@ -38423,7 +38423,7 @@ class PoetryCache extends cache_distributor_1.default {
             const lines = stdout.trim().split('\n');
             const config = {};
             for (let line of lines) {
-                line = line.replace(/#.*$/, '');
+                line = line.replace(/#.*$/gm, '');
                 const [key, value] = line.split('=').map(part => part.trim());
                 config[key] = JSON.parse(value);
             }
diff --git a/package-lock.json b/package-lock.json
index 46c3dc4c4..5354897b3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21,7 +21,7 @@
         "@types/jest": "^27.0.2",
         "@types/node": "^16.11.25",
         "@types/semver": "^7.1.0",
-        "@zeit/ncc": "^0.22.0",
+        "@vercel/ncc": "^0.33.4",
         "husky": "^7.0.2",
         "jest": "^27.2.5",
         "jest-circus": "^27.2.5",
@@ -3923,11 +3923,10 @@
       "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
       "dev": true
     },
-    "node_modules/@zeit/ncc": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.22.0.tgz",
-      "integrity": "sha512-zaS6chwztGSLSEzsTJw9sLTYxQt57bPFBtsYlVtbqGvmDUsfW7xgXPYofzFa1kB9ur2dRop6IxCwPnWLBVCrbQ==",
-      "deprecated": "@zeit/ncc is no longer maintained. Please use @vercel/ncc instead.",
+    "node_modules/@vercel/ncc": {
+      "version": "0.33.4",
+      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.33.4.tgz",
+      "integrity": "sha512-ln18hs7dMffelP47tpkaR+V5Tj6coykNyxJrlcmCormPqRQjB/Gv4cu2FfBG+PMzIfdZp2CLDsrrB1NPU22Qhg==",
       "dev": true,
       "bin": {
         "ncc": "dist/ncc/cli.js"
@@ -14512,10 +14511,10 @@
       "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==",
       "dev": true
     },
-    "@zeit/ncc": {
-      "version": "0.22.0",
-      "resolved": "https://registry.npmjs.org/@zeit/ncc/-/ncc-0.22.0.tgz",
-      "integrity": "sha512-zaS6chwztGSLSEzsTJw9sLTYxQt57bPFBtsYlVtbqGvmDUsfW7xgXPYofzFa1kB9ur2dRop6IxCwPnWLBVCrbQ==",
+    "@vercel/ncc": {
+      "version": "0.33.4",
+      "resolved": "https://registry.npmjs.org/@vercel/ncc/-/ncc-0.33.4.tgz",
+      "integrity": "sha512-ln18hs7dMffelP47tpkaR+V5Tj6coykNyxJrlcmCormPqRQjB/Gv4cu2FfBG+PMzIfdZp2CLDsrrB1NPU22Qhg==",
       "dev": true
     },
     "abab": {
diff --git a/package.json b/package.json
index 2b2cb2e26..d7d88f24a 100644
--- a/package.json
+++ b/package.json
@@ -35,7 +35,7 @@
     "@types/jest": "^27.0.2",
     "@types/node": "^16.11.25",
     "@types/semver": "^7.1.0",
-    "@zeit/ncc": "^0.22.0",
+    "@vercel/ncc": "^0.33.4",
     "husky": "^7.0.2",
     "jest": "^27.2.5",
     "jest-circus": "^27.2.5",
diff --git a/src/cache-distributions/poetry-cache.ts b/src/cache-distributions/poetry-cache.ts
index 58aa5fd97..5e22b5dd7 100644
--- a/src/cache-distributions/poetry-cache.ts
+++ b/src/cache-distributions/poetry-cache.ts
@@ -58,7 +58,7 @@ class PoetryCache extends CacheDistributor {
     const config: any = {};
 
     for (let line of lines) {
-      line = line.replace(/#.*$/, '');
+      line = line.replace(/#.*$/gm, '');
 
       const [key, value] = line.split('=').map(part => part.trim());