diff --git a/codebuild_specs/e2e_workflow.yml b/codebuild_specs/e2e_workflow.yml
index 5c06dc13222..0a57b54106f 100644
--- a/codebuild_specs/e2e_workflow.yml
+++ b/codebuild_specs/e2e_workflow.yml
@@ -28,6 +28,10 @@ batch:
       buildspec: codebuild_specs/test.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+    - identifier: lint
+      buildspec: codebuild_specs/lint.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
     - identifier: mock_e2e_tests
       buildspec: codebuild_specs/mock_e2e_tests.yml
       env:
diff --git a/codebuild_specs/e2e_workflow_base.yml b/codebuild_specs/e2e_workflow_base.yml
index 7cb8fa87234..8ab4fcd29f3 100644
--- a/codebuild_specs/e2e_workflow_base.yml
+++ b/codebuild_specs/e2e_workflow_base.yml
@@ -32,6 +32,10 @@ batch:
       buildspec: codebuild_specs/test.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+    - identifier: lint
+      buildspec: codebuild_specs/lint.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
     - identifier: mock_e2e_tests
       buildspec: codebuild_specs/mock_e2e_tests.yml
       env:
diff --git a/codebuild_specs/e2e_workflow_generated.yml b/codebuild_specs/e2e_workflow_generated.yml
index 8710647eb80..b6ce438769f 100644
--- a/codebuild_specs/e2e_workflow_generated.yml
+++ b/codebuild_specs/e2e_workflow_generated.yml
@@ -32,6 +32,10 @@ batch:
       buildspec: codebuild_specs/test.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+    - identifier: lint
+      buildspec: codebuild_specs/lint.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
     - identifier: mock_e2e_tests
       buildspec: codebuild_specs/mock_e2e_tests.yml
       env:
diff --git a/codebuild_specs/lint.yml b/codebuild_specs/lint.yml
index 4dd41678530..e57864c360c 100644
--- a/codebuild_specs/lint.yml
+++ b/codebuild_specs/lint.yml
@@ -4,6 +4,7 @@ env:
 phases:
   build:
     commands:
+      - source ./shared-scripts.sh && _waitForJobs build_linux requirePrevJobsToSucceed
       - source ./shared-scripts.sh && _lint
 artifacts:
   files:
diff --git a/codebuild_specs/pr_workflow.yml b/codebuild_specs/pr_workflow.yml
index 5fc6ab56355..50e57a5d91f 100644
--- a/codebuild_specs/pr_workflow.yml
+++ b/codebuild_specs/pr_workflow.yml
@@ -22,6 +22,10 @@ batch:
       buildspec: codebuild_specs/test.yml
       env:
         compute-type: BUILD_GENERAL1_LARGE
+    - identifier: lint
+      buildspec: codebuild_specs/lint.yml
+      env:
+        compute-type: BUILD_GENERAL1_LARGE
     - identifier: mock_e2e_tests
       buildspec: codebuild_specs/mock_e2e_tests.yml
       env:
diff --git a/shared-scripts.sh b/shared-scripts.sh
index 9df4ca441af..1a543c0a9c7 100644
--- a/shared-scripts.sh
+++ b/shared-scripts.sh
@@ -117,6 +117,8 @@ function _lint {
     loadCache repo $CODEBUILD_SRC_DIR
     loadCache .cache $HOME/.cache
 
+    export NODE_OPTIONS=--max-old-space-size=8096
+
     yarn lint-check
     yarn lint-check-package-json
     yarn prettier-check