diff --git a/ci/stack_env.sh b/ci/stack_env.sh
index 33357208f01cea944ade25b2968db11bda3c746d..d992e13913c8e8edea1fbc3c8a301b2b2f5c8f14 100644
--- a/ci/stack_env.sh
+++ b/ci/stack_env.sh
@@ -5,7 +5,8 @@ export STACK_CONFIG=${STACK_CONFIG_PATH}/config.json
 
 export SPACK_VERSION=$(jq -r .spack.version ${STACK_CONFIG})
 export MOUNT_POINT=$(jq -r .stack.mount_point ${STACK_CONFIG})
-export STACK_LOCATION=${MOUNT_POINT}/${stack}
+export STACK_VERSION=$(jq -r .stack.version ${STACK_CONFIG})
+export STACK_LOCATION=${MOUNT_POINT}/${stack}/${environment}/${STACK_VERSION}
 
 export SPACK_SYSTEM_CONFIG_PATH=${STACK_LOCATION}/spack/var/spack/environments/${environment}
 
diff --git a/stacks/pinot-noir/config.json b/stacks/pinot-noir/config.json
index 1e12024adaac5e909916f5f0fddeddfb6d3d2b67..545a5c2832944784fca92d4c8b0aae433b01538d 100644
--- a/stacks/pinot-noir/config.json
+++ b/stacks/pinot-noir/config.json
@@ -23,6 +23,7 @@
         }
     },
     "stack": {
+        "version": "v1",
         "mount_point": "/stack",
         "system_arch": "target=x86_64_v3",
         "system_compiler": {