diff --git a/.github/workflows/simorgh-deploy-storybook.yml b/.github/workflows/simorgh-deploy-storybook.yml
index 6942b453731..a3ceec67581 100644
--- a/.github/workflows/simorgh-deploy-storybook.yml
+++ b/.github/workflows/simorgh-deploy-storybook.yml
@@ -18,8 +18,8 @@ jobs:
 
       - name: Install and Build
         run: |
-          yarn run ci
-          npm run build:storybook
+          yarn install --frozen-lockfile
+          yarn run build:storybook
           git config --global user.name "simorgh-bbc"
           git config --global user.email "DENewsSimorghDev@bbc.co.uk"
 
diff --git a/.github/workflows/simorgh-integration-tests.yml b/.github/workflows/simorgh-integration-tests.yml
index f90fe288966..94631ad7ec8 100644
--- a/.github/workflows/simorgh-integration-tests.yml
+++ b/.github/workflows/simorgh-integration-tests.yml
@@ -26,6 +26,7 @@ jobs:
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install Node Modules
-        run: yarn run ci
+        if: steps.yarn-cache.outputs.cache-hit != 'true'
+        run: yarn install --frozen-lockfile
       - name: Integration Tests
-        run: npm run test:integration -- --ci
+        run: yarn run test:integration -- --ci
diff --git a/.github/workflows/simorgh-local-server-tests.yml b/.github/workflows/simorgh-local-server-tests.yml
index 10ed0e109a7..0d4f8f9c413 100644
--- a/.github/workflows/simorgh-local-server-tests.yml
+++ b/.github/workflows/simorgh-local-server-tests.yml
@@ -28,22 +28,22 @@ jobs:
 
       - name: Install & Build Simorgh
         run: |
-          yarn run ci
-          npm run build:local
+          yarn install --frozen-lockfile
+          yarn run build:local
 
       - name: Start Simorgh Server
         run: nohup node build/server.js > /dev/null 2>&1 &
 
       - name: Run AMP Validator
-        run: npm run amp:validate
+        run: yarn run amp:validate
 
       - name: Run bbc-a11y
-        run: npm run bbcA11y:ci
+        run: yarn run bbcA11y:ci
 
       - name: Run Lighthouse
-        run: npm run lighthouse
+        run: yarn run lighthouse
 
       - name: Run Puppeteer Tests
         run: |
           yarn add --no-save puppeteer
-          npm run test:puppeteer
+          yarn run test:puppeteer
diff --git a/.github/workflows/simorgh-misc-checks.yml b/.github/workflows/simorgh-misc-checks.yml
index 167c471d751..b91181ac93e 100644
--- a/.github/workflows/simorgh-misc-checks.yml
+++ b/.github/workflows/simorgh-misc-checks.yml
@@ -29,7 +29,7 @@ jobs:
           node-version: ${{ matrix.node-version }}
 
       - name: Install Node Modules
-        run: yarn run ci
+        run: yarn install --frozen-lockfile
 
       - name: Chromatic UI Tests
         uses: chromaui/action@v1
diff --git a/.github/workflows/simorgh-unit-tests.yml b/.github/workflows/simorgh-unit-tests.yml
index aefc918576b..e4bab52c6ca 100644
--- a/.github/workflows/simorgh-unit-tests.yml
+++ b/.github/workflows/simorgh-unit-tests.yml
@@ -38,11 +38,13 @@ jobs:
         if: ${{ github.event_name == 'pull_request' }}
         run: echo "GIT_BRANCH=${{ github.head_ref }}" >> $GITHUB_ENV
 
-      - name: Install & Build Simorgh
+      - name: Install Node Modules
+        run: yarn install --frozen-lockfile
+
+      - name: Build Simorgh
         run: |
           echo ${GITHUB_REF##*/}
-          yarn run ci
-          npm run build
+          yarn run build
 
       - name: Setup Code Climate Test Coverage
         if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'bbc/simorgh' }} # Only run if PR originates from the Simorgh repo
@@ -54,7 +56,7 @@ jobs:
           ./cc-test-reporter before-build
 
       - name: Unit Tests
-        run: npm run test:unit
+        run: yarn run test:unit
 
       - name: Report Code Climate Test Coverage
         if: ${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'bbc/simorgh' }} # Only run if PR originates from the Simorgh repo
diff --git a/codebuild/e2e_buildspec.yml b/codebuild/e2e_buildspec.yml
index d6ea2da3274..3f083763c44 100644
--- a/codebuild/e2e_buildspec.yml
+++ b/codebuild/e2e_buildspec.yml
@@ -10,11 +10,11 @@ phases:
       nodejs: 12
   pre_build:
     commands:
-      - yarn run ci
-      - npm run build
+      - yarn install --frozen-lockfile
+      - yarn run build
   build:
     commands:
-      - npm run cypress:ci
+      - yarn run cypress:ci
 reports:
   JunitReportsTest:
     files: