diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33ec93a6f3fcdf5ab6e3fc2e9df1971b50c6d749..60cea25d09a86be011881c20c1923ebdc71a9ac3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -358,9 +358,7 @@ default:
     paths:
       - core/node_modules/
   script:
-    - cd core
-    - corepack enable
-    - yarn install
+    - yarn --cwd ./core install
 
 ################
 # Lint Jobs
@@ -427,10 +425,8 @@ default:
     - when: manual
       allow_failure: true
   script:
-    - cd core
-    - corepack enable
-    - yarn run check:ckeditor5
-    - yarn run lint:core-js-passing --format gitlab
+    - yarn --cwd=./core run -s check:ckeditor5
+    - yarn --cwd=./core run -s lint:core-js-passing --format gitlab
   artifacts:
     reports:
       codequality: eslint-quality-report.json
@@ -453,10 +449,8 @@ default:
     - when: manual
       allow_failure: true
   script:
-    - corepack enable
-    - cd core
-    - yarn run build:css --check
-    - yarn run lint:css --color --custom-formatter=node_modules/stylelint-formatter-gitlab
+    - yarn run --cwd=./core build:css --check
+    - yarn run --cwd=./core lint:css --color --custom-formatter=node_modules/stylelint-formatter-gitlab
   artifacts:
     reports:
       codequality: stylelint-quality-report.json
@@ -473,9 +467,7 @@ default:
         echo "HEAD is $(git rev-parse HEAD). \$CI_MERGE_REQUEST_DIFF_BASE_SHA is ${CI_MERGE_REQUEST_DIFF_BASE_SHA}";
       fi;
     - git diff ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA:-$CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only 2>1 > /dev/null || (echo "Warning, cannot find changed files, converting to full clone." & (git fetch --unshallow --quiet && echo "Fetch successful."))
-    - cd core
-    - corepack enable
-    - git diff ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA:-$CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only | sed "s_^_../_" | yarn run -s spellcheck:core --no-must-find-files --file-list stdin
+    - git diff ${CI_MERGE_REQUEST_TARGET_BRANCH_SHA:-$CI_MERGE_REQUEST_DIFF_BASE_SHA} --name-only | sed "s_^_../_" | yarn --cwd=./core run -s spellcheck:core --no-must-find-files --file-list stdin
 
 '📔 Validatable config':
   <<: [ *default-job-settings-lint ]
diff --git a/.gitlab-ci/pipeline.yml b/.gitlab-ci/pipeline.yml
index 21b0808dca8e35ebd6dc4eab9fe8c278d78789d5..ff74367238035a85481f4fea410a9dd0bcdbe57f 100644
--- a/.gitlab-ci/pipeline.yml
+++ b/.gitlab-ci/pipeline.yml
@@ -195,9 +195,7 @@ variables:
     - echo "DRUPAL_NIGHTWATCH_OUTPUT='"../nightwatch_output"'" >> ./core/.env
     - echo "COLUMNS=1000" >> ./core/.env
     - chown -R www-data:www-data ./sites /var/www
-    - cd core
-    - corepack enable
-    - sudo -u www-data yarn run test:nightwatch --workers=4
+    - sudo -u www-data yarn run --cwd=./core test:nightwatch --workers=4
   after_script:
     - cp /builds/chromedriver.log ./
   artifacts:
diff --git a/core/.cspell.json b/core/.cspell.json
index d01164640904fbd02af102ae3eb3822254317698..daef82b7e885297a18c6867f9ca50472191b6a5b 100644
--- a/core/.cspell.json
+++ b/core/.cspell.json
@@ -39,8 +39,6 @@
       "MAINTAINERS.txt",
       "package.json",
       "yarn.lock",
-      ".yarnrc.yml",
-      ".yarn/*",
       "misc/cspell/dictionary.txt",
       "phpstan*"
     ],
diff --git a/core/misc/cspell/drupal-dictionary.txt b/core/misc/cspell/drupal-dictionary.txt
index 0f2405c2ea2fa225468345b80682a9b35bc04ea5..734ad8e1aaacac6de1b3ca2793753d4cd571d532 100644
--- a/core/misc/cspell/drupal-dictionary.txt
+++ b/core/misc/cspell/drupal-dictionary.txt
@@ -1,5 +1,4 @@
 bartik
-corepack
 dblog
 dependee
 dependee's