diff --git a/.github/workflows/cypress-nightly.yml b/.github/workflows/cypress-nightly.yml
index ca7253bf4..65f60f231 100644
--- a/.github/workflows/cypress-nightly.yml
+++ b/.github/workflows/cypress-nightly.yml
@@ -16,15 +16,15 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Use random string for subnet
+        # Use a random string to avoid other providers on the same subnet which might cause tests to fail because it expects only providers named provider-1 and provider-2
         run: echo "YAGNA_SUBNET=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8 ; echo '')" >> $GITHUB_ENV
 
       - name: Build the docker containers
-        # Use a random string to avoid other providers on the same subnet which might cause tests to fail because it expects only providers named provider-1 and provider-2
         run: docker compose -f tests/docker/docker-compose.yml build
 
       - name: Start the docker containers
-        # Use a random string to avoid other providers on the same subnet which might cause tests to fail because it expects only providers named provider-1 and provider-2
-        run: docker compose -f tests/docker/docker-compose.yml down && docker compose -f tests/docker/docker-compose.yml up -d
+        # Restart docker to avoid issues with the docker compose down due to improper cleanup of the previous run.
+        run: sudo service docker restart && docker compose -f tests/docker/docker-compose.yml down && docker compose -f tests/docker/docker-compose.yml up -d
 
       - name: Fund the requestor
         # Use a funding script which will retry funding the requestor 3 times, else it exits with error. The faucet is not reliable and sometimes fails to fund the requestor, thus the retry.
diff --git a/.github/workflows/examples-nightly.yml b/.github/workflows/examples-nightly.yml
index a5daacefd..9ddb33568 100644
--- a/.github/workflows/examples-nightly.yml
+++ b/.github/workflows/examples-nightly.yml
@@ -32,15 +32,15 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Use random string for subnet
+        # Use a random string to avoid other providers on the same subnet which might cause tests to fail because it expects only providers named provider-1 and provider-2
         run: echo "YAGNA_SUBNET=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8 ; echo '')" >> $GITHUB_ENV
 
       - name: Build the docker containers
-        # Use a random string to avoid other providers on the same subnet which might cause tests to fail because it expects only providers named provider-1 and provider-2
         run: docker compose -f tests/docker/docker-compose.yml build
 
       - name: Start the docker containers
-        # Use a random string to avoid other providers on the same subnet which might cause tests to fail because it expects only providers named provider-1 and provider-2
-        run: docker compose -f tests/docker/docker-compose.yml down && docker compose -f tests/docker/docker-compose.yml up -d
+        # Restart docker to avoid issues with the docker compose down due to improper cleanup of the previous run.
+        run: sudo service docker restart && docker compose -f tests/docker/docker-compose.yml down && docker compose -f tests/docker/docker-compose.yml up -d
 
       - name: Fund the requestor
         # Use a funding script which will retry funding the requestor 3 times, else it exits with error. The faucet is not reliable and sometimes fails to fund the requestor, thus the retry.
diff --git a/.github/workflows/goth-nightly.yml b/.github/workflows/goth-nightly.yml
index ca10cb93d..f6c4cd505 100644
--- a/.github/workflows/goth-nightly.yml
+++ b/.github/workflows/goth-nightly.yml
@@ -32,15 +32,15 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Use random string for subnet
+        # Use a random string to avoid other providers on the same subnet which might cause tests to fail because it expects only providers named provider-1 and provider-2
         run: echo "YAGNA_SUBNET=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8 ; echo '')" >> $GITHUB_ENV
 
       - name: Build the docker containers
-        # Use a random string to avoid other providers on the same subnet which might cause tests to fail because it expects only providers named provider-1 and provider-2
         run: docker compose -f tests/docker/docker-compose.yml build
 
       - name: Start the docker containers
-        # Use a random string to avoid other providers on the same subnet which might cause tests to fail because it expects only providers named provider-1 and provider-2
-        run: docker compose -f tests/docker/docker-compose.yml down && docker compose -f tests/docker/docker-compose.yml up -d
+        # Restart docker to avoid issues with the docker compose down due to improper cleanup of the previous run.
+        run: sudo service docker restart && docker compose -f tests/docker/docker-compose.yml down && docker compose -f tests/docker/docker-compose.yml up -d
 
       - name: Fund the requestor
         # Use a funding script which will retry funding the requestor 3 times, else it exits with error. The faucet is not reliable and sometimes fails to fund the requestor, thus the retry.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ef1b52405..3c2d26a74 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -55,15 +55,15 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Use random string for subnet
+        # Use a random string to avoid other providers on the same subnet which might cause tests to fail because it expects only providers named provider-1 and provider-2
         run: echo "YAGNA_SUBNET=$(head /dev/urandom | tr -dc A-Za-z0-9 | head -c 8 ; echo '')" >> $GITHUB_ENV
 
       - name: Build the docker containers
-        # Use a random string to avoid other providers on the same subnet which might cause tests to fail because it expects only providers named provider-1 and provider-2
         run: docker compose -f tests/docker/docker-compose.yml build
 
       - name: Start the docker containers
-        # Use a random string to avoid other providers on the same subnet which might cause tests to fail because it expects only providers named provider-1 and provider-2
-        run: docker compose -f tests/docker/docker-compose.yml down && docker compose -f tests/docker/docker-compose.yml up -d
+        # Restart docker to avoid issues with the docker compose down due to improper cleanup of the previous run.
+        run: sudo service docker restart && docker compose -f tests/docker/docker-compose.yml down && docker compose -f tests/docker/docker-compose.yml up -d
 
       - name: Fund the requestor
         # Use a funding script which will retry funding the requestor 3 times, else it exits with error. The faucet is not reliable and sometimes fails to fund the requestor, thus the retry.
diff --git a/examples/docs-examples/examples/selecting-providers/custom-price.mjs b/examples/docs-examples/examples/selecting-providers/custom-price.mjs
index d4a604006..411bbaa84 100644
--- a/examples/docs-examples/examples/selecting-providers/custom-price.mjs
+++ b/examples/docs-examples/examples/selecting-providers/custom-price.mjs
@@ -12,10 +12,10 @@ const myFilter = async (proposal) => {
   let counterIdx = usageVector.findIndex((ele) => ele === "golem.usage.duration_sec");
   let proposedCost = proposal.properties["golem.com.pricing.model.linear.coeffs"][counterIdx];
   costData.push(proposedCost);
-  if (costData.length < 11) return false;
+  if (costData.length < 6) return false;
   else {
     costData.shift();
-    let averageProposedCost = costData.reduce((part, x) => part + x, 0) / 10;
+    let averageProposedCost = costData.reduce((part, x) => part + x, 0) / 5;
     if (proposedCost <= 1.2 * averageProposedCost) decision = true;
     if (decision) {
       console.log(proposedCost, averageProposedCost);
diff --git a/package.json b/package.json
index 2733d5b46..8f5d57ed1 100644
--- a/package.json
+++ b/package.json
@@ -61,7 +61,7 @@
   },
   "devDependencies": {
     "@commitlint/cli": "^17.7.1",
-    "@commitlint/config-conventional": "^17.7.0",
+    "@commitlint/config-conventional": "^18.1.0",
     "@johanblumenberg/ts-mockito": "^1.0.39",
     "@rollup/plugin-alias": "^5.0.0",
     "@rollup/plugin-commonjs": "^25.0.3",