diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a93a0f1e0d..a1e40e365d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -37,12 +37,10 @@ stages:
     SSTATE_DIR: $CACHE_DIR/sstate
     DL_DIR: $CACHE_DIR/downloads
     BB_LOGCONFIG: $CI_PROJECT_DIR/ci/logging.yml
-    TOOLCHAIN_DIR: $CACHE_DIR/toolchains
     IMAGE_DIR: $KAS_BUILD_DIR/tmp/deploy/images
-    TOOLCHAIN_LINK_DIR: $KAS_BUILD_DIR/toolchains
   before_script:
     - rm -rf $KAS_WORK_DIR
-    - mkdir --verbose --parents $KAS_WORK_DIR $KAS_REPO_REF_DIR $SSTATE_DIR $DL_DIR $TOOLCHAIN_DIR $TOOLCHAIN_LINK_DIR
+    - mkdir --verbose --parents $KAS_WORK_DIR $KAS_REPO_REF_DIR $SSTATE_DIR $DL_DIR
 
 # Generalised fragment to do a Kas build
 .build:
diff --git a/ci/base.yml b/ci/base.yml
index 87192fba26..cb1fe91439 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -33,7 +33,6 @@ repos:
 
 env:
   BB_LOGCONFIG: ""
-  TOOLCHAIN_DIR: ""
 
 local_conf_header:
   base: |