diff --git a/.circleci/config.yml b/.circleci/config.yml
index 35643c2..05cd851 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -24,7 +24,6 @@ jobs:
       - checkout
       - node/install:
           node-version: << parameters.node-version >>
-          with-cache: false
       - setup-npm
       - run: npm ci
       - run:
@@ -41,7 +40,6 @@ jobs:
       - checkout
       - node/install:
           node-version: "20"
-          with-cache: false
       - setup-npm
       - run: npm ci
       - run: npm run build
@@ -54,7 +52,6 @@ jobs:
       - checkout
       - node/install:
           node-version: "20"
-          with-cache: false
       - setup-npm
       - run: npm ci
 
@@ -69,11 +66,10 @@ jobs:
       - run: echo "@contentful:registry=https://npm.pkg.github.com" >> ~/.npmrc
       - node/install:
           node-version: "20"
-          with-cache: false
       - run: npm ci
       - run:
           name: Releasing
-          command: npm run semantic-release
+          command: npm run publish
 
 workflows:
   lint-build-release:
diff --git a/package.json b/package.json
index 9da0662..173d43c 100644
--- a/package.json
+++ b/package.json
@@ -37,16 +37,16 @@
     "prepare": "husky install",
     "lint": "eslint --ext .ts ./src",
     "lint:fix": "npm run lint -- --fix",
-    "pretest": "echo ' 🔑 Creating valid keypair for testing' && bash test/make-private-keys.sh",
+    "generate:key": "echo ' 🔑 Creating valid keypair for testing' && bash test/make-private-keys.sh",
     "test:unit": "vitest run src",
     "test:integration": "vitest run test",
-    "test": "npm run test:unit && npm run test:integration",
-    "build": "rm -rf lib && tsup",
-    "postbuild": "cp ./lib/index.d.ts ./lib/index.d.cts",
+    "test": "npm run generate:key && npm run test:unit && npm run test:integration",
+    "build": "rm -rf lib && tsup && cp ./lib/index.d.ts ./lib/index.d.cts",
     "build:docs": "typedoc --options .typedocrc.json src",
     "start:docs": "serve ./docs",
-    "prepublishOnly": "npm run build && npm run build:docs",
+    "build:all": "npm run build && npm run build:docs",
     "semantic-release": "semantic-release",
+    "publish": "npm run build:all && npm run semantic-release",
     "format": "prettier --write ./{src,test}/**/*.ts"
   },
   "author": "Contentful GmbH",