diff --git a/.github/workflows/v2-build-blog-only.yml b/.github/workflows/build-blog-only.yml
similarity index 94%
rename from .github/workflows/v2-build-blog-only.yml
rename to .github/workflows/build-blog-only.yml
index 88edfdc3b19d..da0ed5d2e783 100644
--- a/.github/workflows/v2-build-blog-only.yml
+++ b/.github/workflows/build-blog-only.yml
@@ -1,4 +1,4 @@
-name: V2 Build Blog-only
+name: Build Blog-only
 
 on:
   pull_request:
diff --git a/.github/workflows/v2-build-size-report.yml b/.github/workflows/build-size-report.yml
similarity index 97%
rename from .github/workflows/v2-build-size-report.yml
rename to .github/workflows/build-size-report.yml
index 5f89eb6ce999..50bbf710c9f6 100644
--- a/.github/workflows/v2-build-size-report.yml
+++ b/.github/workflows/build-size-report.yml
@@ -1,4 +1,4 @@
-name: V2 Build Size Report
+name: Build Size Report
 
 on:
   # Note! you can't safely use "pull_request_target" here
diff --git a/.github/workflows/v2-build-time-perf.yml b/.github/workflows/build-time-perf.yml
similarity index 96%
rename from .github/workflows/v2-build-time-perf.yml
rename to .github/workflows/build-time-perf.yml
index 924c3bfef174..b5e0e08ef9b6 100644
--- a/.github/workflows/v2-build-time-perf.yml
+++ b/.github/workflows/build-time-perf.yml
@@ -1,4 +1,4 @@
-name: V2 Build Time Perf
+name: Build Time Perf
 
 on:
   pull_request:
diff --git a/.github/workflows/v2-lighthouse-report.yml b/.github/workflows/lighthouse-report.yml
similarity index 96%
rename from .github/workflows/v2-lighthouse-report.yml
rename to .github/workflows/lighthouse-report.yml
index f2d2cac98409..71d2c041eced 100644
--- a/.github/workflows/v2-lighthouse-report.yml
+++ b/.github/workflows/lighthouse-report.yml
@@ -1,4 +1,4 @@
-name: V2 Lighthouse Report
+name: Lighthouse Report
 
 on:
   pull_request_target:
@@ -22,7 +22,7 @@ jobs:
         with:
           urls: |
             https://deploy-preview-$PR_NUMBER--docusaurus-2.netlify.app/
-          configPath: ./.github/workflows/v2-lighthousesrc.json
+          configPath: ./.github/workflows/lighthousesrc.json
           uploadArtifacts: true
           temporaryPublicStorage: true
         env:
diff --git a/.github/workflows/v2-lighthousesrc.json b/.github/workflows/lighthousesrc.json
similarity index 100%
rename from .github/workflows/v2-lighthousesrc.json
rename to .github/workflows/lighthousesrc.json
diff --git a/.github/workflows/v2-tests-e2e.yml b/.github/workflows/tests-e2e.yml
similarity index 96%
rename from .github/workflows/v2-tests-e2e.yml
rename to .github/workflows/tests-e2e.yml
index 20b549085915..27d967a6f4a3 100644
--- a/.github/workflows/v2-tests-e2e.yml
+++ b/.github/workflows/tests-e2e.yml
@@ -1,4 +1,4 @@
-name: V2 Tests E2E
+name: Tests E2E
 
 on:
   push:
@@ -29,9 +29,7 @@ jobs:
           KEEP_CONTAINER=true yarn test:build:website -s
           mv test-website ../test-website
       - name: Install test-website project with Yarn v1
-        run: |
-          cd ../test-website
-          yarn install
+        run: cd ../test-website && yarn install
         env:
           npm_config_registry: http://localhost:4873
       - name: Start test-website project
diff --git a/.github/workflows/v2-tests-windows.yml b/.github/workflows/tests-windows.yml
similarity index 94%
rename from .github/workflows/v2-tests-windows.yml
rename to .github/workflows/tests-windows.yml
index 52fce19e924b..871f67a9e661 100644
--- a/.github/workflows/v2-tests-windows.yml
+++ b/.github/workflows/tests-windows.yml
@@ -1,4 +1,4 @@
-name: V2 Windows Tests
+name: Windows Tests
 
 on:
   pull_request:
@@ -20,7 +20,6 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
-          cache: yarn
       - name: Installation
         run: yarn || yarn || yarn # 3 attempts to avoid timeout errors...
       - name: Docusaurus Jest Tests
diff --git a/.github/workflows/v2-tests.yml b/.github/workflows/tests.yml
similarity index 97%
rename from .github/workflows/v2-tests.yml
rename to .github/workflows/tests.yml
index 70eb1317d1b1..35705996cff2 100644
--- a/.github/workflows/v2-tests.yml
+++ b/.github/workflows/tests.yml
@@ -1,4 +1,4 @@
-name: V2 Tests
+name: Tests
 
 on:
   pull_request: