diff --git a/.github/workflows/ci-deploy.yaml b/.github/workflows/ci-deploy.yaml
index 52343d773a..3f4b8f56ae 100644
--- a/.github/workflows/ci-deploy.yaml
+++ b/.github/workflows/ci-deploy.yaml
@@ -77,10 +77,14 @@ jobs:
           tags: ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPO_NAME }}:${{ env.ENVIRONMENT }}-contracts-latest,${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPO_NAME }}:${{ env.ENVIRONMENT }}-contracts-${{ steps.autotag.outputs.tag }}
           labels: ${{ steps.metadata.outputs.labels }}
 
+      - name: Stop Geth Devnet
+        run: |
+          docker compose down 
+
       - name: Start Contracts Geth Devnet
         run: |
           docker run -d \
-            -p 8546:8545 \
+            -p 8545:8545 \
             -p 30303:30303 \
             ${{ secrets.DOCKERHUB_USERNAME }}/${{ env.REPO_NAME }}:${{ env.ENVIRONMENT }}-contracts-latest \
             --dev \
@@ -91,8 +95,8 @@ jobs:
       - name: Wait for Contracts Geth JSON-RPC
         run: |
           echo "Waiting for Contracts Geth to be ready..."
-          until curl -s http://localhost:8546; do sleep 1; done
+          until curl -s http://localhost:8545; do sleep 1; done
 
       - name: Test Contracts
         working-directory: ./hardhat
-        run: npx hardhat test test/Lock.ts --network localcontracts
+        run: npx hardhat test test/Lock.ts --network local
diff --git a/hardhat/hardhat.config.ts b/hardhat/hardhat.config.ts
index 2e68ec164b..cea05b3b7c 100644
--- a/hardhat/hardhat.config.ts
+++ b/hardhat/hardhat.config.ts
@@ -8,10 +8,6 @@ const config: HardhatUserConfig = {
       url: "http://127.0.0.1:8545",
       chainId: 1337
     },
-    localcontracts: {
-      url: "http://127.0.0.1:8546",
-      chainId: 1337
-    },
     node: {
       url: "http:127.0.0.1:8545",
       chainId: 31337