diff --git a/.circleci/config.yml b/.circleci/config.yml
index bf6d4bb9..53e3b7b4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -47,7 +47,7 @@ aliases:
             steps:
                 - restore_cache:
                       name: "Restore venv Cache"
-                      key: brew-gmp-cache-v1-{{ arch }}
+                      key: brew-gmp-cache-{{ .Environment.CACHE_KEY_INFIX }}-{{ arch }}
     - &save_macos_brew_cache
       # Save only if the executor is a macos one #
       - when:
@@ -57,7 +57,7 @@ aliases:
             steps:
                 - save_cache:
                       name: "Save brew-gmp Cache"
-                      key: brew-gmp-cache-v1-{{ arch }}
+                      key: brew-gmp-cache-{{ .Environment.CACHE_KEY_INFIX }}-{{ arch }}
                       paths:
                           - /usr/local/Cellar/gmp
                           - /usr/local/include
@@ -77,7 +77,7 @@ aliases:
             steps:
                 - restore_cache:
                       name: "Restore venv Cache"
-                      key: venv-cache-{{ arch }}-v1-{{ checksum "/tmp/cairo-lang-version" }}
+                      key: venv-cache-{{ arch }}-{{ .Environment.CACHE_KEY_INFIX }}-{{ checksum "/tmp/cairo-lang-version" }}
     - &save_venv_cache
       # Save only if the test name is "test-venv-tests" #
       - when:
@@ -87,7 +87,7 @@ aliases:
             steps:
                 - save_cache:
                       name: "Save venv Cache"
-                      key: venv-cache-{{ arch }}-v1-{{ checksum "/tmp/cairo-lang-version" }}
+                      key: venv-cache-{{ arch }}-{{ .Environment.CACHE_KEY_INFIX }}-{{ checksum "/tmp/cairo-lang-version" }}
                       paths:
                           - /Users/distiller/project/my-venv
                           - /home/circleci/project/my-venv
@@ -102,7 +102,7 @@ aliases:
             steps:
                 - restore_cache:
                       name: "Restore cairo-lang Cache"
-                      key: cairo-lang-cache-{{ arch }}-v1-{{ checksum "/tmp/cairo-lang-version" }}
+                      key: cairo-lang-cache-{{ arch }}-{{ .Environment.CACHE_KEY_INFIX }}-{{ checksum "/tmp/cairo-lang-version" }}
     - &save_cairo_cache
       # Try to save only if the test name is not "test-venv-tests" #
       - when:
@@ -113,7 +113,7 @@ aliases:
             steps:
                 - save_cache:
                       name: "Save cairo-lang Cache"
-                      key: cairo-lang-cache-{{ arch }}-v1-{{ checksum "/tmp/cairo-lang-version" }}
+                      key: cairo-lang-cache-{{ arch }}-{{ .Environment.CACHE_KEY_INFIX }}-{{ checksum "/tmp/cairo-lang-version" }}
                       paths:
                           - /usr/python3.8/dist-packages/cairo-lang
                           - /usr/python3.9/dist-packages/cairo-lang
@@ -123,11 +123,11 @@ aliases:
     - &restore_devnet_cache
       - restore_cache:
             name: "Restore devnet Cache"
-            key: devnet-cache-{{ arch }}-v1-{{ checksum "/tmp/devnet-version" }}
+            key: devnet-cache-{{ arch }}-{{ .Environment.CACHE_KEY_INFIX }}-{{ checksum "/tmp/devnet-version" }}
     - &save_devnet_cache
       - save_cache:
             name: "Save devnet Cache"
-            key: devnet-cache-{{ arch }}-v1-{{ checksum "/tmp/devnet-version" }}
+            key: devnet-cache-{{ arch }}-{{ .Environment.CACHE_KEY_INFIX }}-{{ checksum "/tmp/devnet-version" }}
             paths:
                 - /opt/circleci/.pyenv/versions
                 - /opt/circleci/.pyenv/shims/starknet-devnet