diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 5b7dc79..2a661cc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -25,10 +25,10 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Build Docker Image and Run Tests
-        run: docker build --build-arg NODE_VERSION=${{ matrix.node }} -t hardhat-zkit-test-runner-node${{ matrix.node }} --progress=plain --no-cache .
+        run: docker build --build-arg NODE_VERSION=${{ matrix.node }} -t hardhat-zkit-node${{ matrix.node }} --progress=plain --no-cache .
 
       - name: Cleanup Docker resources
         run: |
-          docker rmi hardhat-zkit-test-runner-node${{ matrix.node }} --force
+          docker rmi hardhat-zkit-node${{ matrix.node }} --force
           docker buildx prune -a -f
           docker system prune -a -f --volumes
diff --git a/package.json b/package.json
index 4b24e1b..ae84b86 100644
--- a/package.json
+++ b/package.json
@@ -38,10 +38,10 @@
     "build": "tsc --build .",
     "prepare-tests": "npm run compile --workspaces",
     "test": "npm run test-docker",
-    "test-docker": "docker build -t hardhat-zkit --progress=plain --no-cache . && docker rmi hardhat-zkit --force",
+    "test-docker": "bash scripts/test-docker.sh",
     "test-local": "mocha --recursive 'test/**/*.ts' --exit",
     "coverage": "npm run coverage-docker",
-    "coverage-docker": "bash scripts/docker-coverage.sh",
+    "coverage-docker": "bash scripts/coverage-docker.sh",
     "coverage-local": "nyc mocha --recursive 'test/**/*.ts' --exit",
     "clean-tests": "npm run clean --workspaces",
     "lint-fix": "prettier --write \"./**/*.ts\" && eslint \"{src,test}/**/*.{js,ts}\" --cache --fix",
diff --git a/scripts/docker-coverage.sh b/scripts/coverage-docker.sh
similarity index 100%
rename from scripts/docker-coverage.sh
rename to scripts/coverage-docker.sh
diff --git a/scripts/test-docker.sh b/scripts/test-docker.sh
new file mode 100644
index 0000000..3058e34
--- /dev/null
+++ b/scripts/test-docker.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+docker build -t hardhat-zkit --progress=plain --no-cache .
+docker rmi hardhat-zkit --force