diff --git a/SUPPORT_POLICY.rst b/SUPPORT_POLICY.rst
index 71123f3e3..39c96bc20 100644
--- a/SUPPORT_POLICY.rst
+++ b/SUPPORT_POLICY.rst
@@ -22,16 +22,16 @@ This table describes the current support status of each major version of the AWS
       - Next status
       - Next status date
     * - 1.x
-      - Maintenance
       - End of Support
-      - 2022-07-08
+      - 
+      - 
     * - 2.x
-      - General Availability
       - Maintenance
-      - 2021-07-13
+      - End of Support
+      - 2023-03-02
     * - 3.x
-      -
-      - General Availability 
-      - 2021-07-13
+      - General Availability
+      - 
+      - 
 
 .. _AWS SDKs and Tools Maintenance Policy: https://docs.aws.amazon.com/sdkref/latest/guide/maint-policy.html#version-life-cycle
diff --git a/buildspec.yml b/buildspec.yml
index 55b1c87c5..9182609dd 100644
--- a/buildspec.yml
+++ b/buildspec.yml
@@ -9,6 +9,8 @@ batch:
         image: aws/codebuild/standard:5.0
     - identifier: testNodejs12
       buildspec: codebuild/nodejs12.yml
+      env:
+        image: aws/codebuild/standard:5.0
     - identifier: testNodejs14
       buildspec: codebuild/nodejs14.yml
       env:
@@ -23,9 +25,13 @@ batch:
         image: aws/codebuild/standard:5.0
     - identifier: testVectorsNodejs12
       buildspec: codebuild/test_vectors/nodejs12.yml
+      env:
+        image: aws/codebuild/standard:5.0
     - identifier: testVectorsNodejs14
       buildspec: codebuild/test_vectors/nodejs14.yml
       env:
         image: aws/codebuild/standard:5.0
     - identifier: testVectorsBrowser
       buildspec: codebuild/test_vectors/browser.yml
+      env:
+        image: aws/codebuild/standard:5.0