diff --git a/.circleci/config.yml b/.circleci/config.yml
index ef681dc..e0e3b58 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -21,9 +21,7 @@ jobs:
       # Download and cache dependencies
       - restore_cache:
           keys:
-            - v5-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}-{{ checksum "test/pisa/e2e/bitcoind_snap.sh" }}
-            # fallback to using the latest cache if no exact match is found
-            - v5-dependencies-
+            - v1-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}-{{ checksum "test/pisa/e2e/bitcoind_snap.sh" }}
 
       - run:
           name: Install dependencies
@@ -41,7 +39,7 @@ jobs:
           paths:
             - ./venv
             - /snap
-          key: v5-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}-{{ checksum "test/pisa/e2e/bitcoind_snap.sh" }}
+          key: v1-dependencies-{{ checksum "pisa/requirements.txt" }}-{{ checksum "pisa/requirements-dev.txt" }}-{{ checksum "apps/cli/requirements-dev.txt" }}-{{ checksum "test/pisa/e2e/bitcoind_snap.sh" }}
 
       # Run unit tests
       - run:
diff --git a/test/pisa/e2e/pisa-conf.py b/test/pisa/e2e/pisa-conf.py
index f53a81b..3c219c1 100644
--- a/test/pisa/e2e/pisa-conf.py
+++ b/test/pisa/e2e/pisa-conf.py
@@ -2,13 +2,13 @@
 BTC_RPC_USER = "user"
 BTC_RPC_PASSWD = "passwd"
 BTC_RPC_HOST = "localhost"
-BTC_RPC_PORT = 18445
+BTC_RPC_PORT = 18443
 BTC_NETWORK = "regtest"
 
 # ZMQ
 FEED_PROTOCOL = "tcp"
 FEED_ADDR = "127.0.0.1"
-FEED_PORT = 28335
+FEED_PORT = 28332
 
 # PISA
 DATA_FOLDER = "~/.pisa_btc/"