diff --git a/builder/actions/setup_cross_ci_crt_environment.py b/builder/actions/setup_cross_ci_crt_environment.py
index bdd43a074..3f64d2e60 100644
--- a/builder/actions/setup_cross_ci_crt_environment.py
+++ b/builder/actions/setup_cross_ci_crt_environment.py
@@ -223,12 +223,14 @@ def _common_setup(self, env):
                             "s3://aws-crt-test-stuff/unit-test-key-pkcs12.pem")
             self._setenv(env, "AWS_TEST_MQTT5_IOT_CORE_PKCS12_KEY_PASSWORD", "PKCS12_KEY_PASSWORD")
 
+        # TODO: The windows certificate env var is disabled as it is failing in CI. We will bring it back once
+        # it is fixed.
         # Windows Key Cert
-        if (self.is_windows == True):
-            self._setenv_s3(env, "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS",
-                            "s3://aws-crt-test-stuff/unit-test-pfx-no-password.pfx")
-            helpers.create_windows_cert_store(
-                env, "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_CERT_STORE")
+        # if (self.is_windows == True):
+        #     self._setenv_s3(env, "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS",
+        #                     "s3://aws-crt-test-stuff/unit-test-pfx-no-password.pfx")
+        #     helpers.create_windows_cert_store(
+        #         env, "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", "AWS_TEST_MQTT5_IOT_CORE_WINDOWS_CERT_STORE")
 
         # X509
         self._setenv_secret(env, "AWS_TEST_MQTT5_IOT_CORE_X509_ENDPOINT", "ci/mqtt5/us/x509/endpoint")
@@ -311,12 +313,14 @@ def _common_setup(self, env):
                             "s3://aws-crt-test-stuff/unit-test-key-pkcs12.pem")
             self._setenv(env, "AWS_TEST_MQTT311_IOT_CORE_PKCS12_KEY_PASSWORD", "PKCS12_KEY_PASSWORD")
 
+        # TODO: The windows certificate env var is disabled as it is failing in CI. We will bring it back once
+        # it is fixed.
         # Windows Key Cert
-        if (self.is_windows == True):
-            self._setenv_s3(env, "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS",
-                            "s3://aws-crt-test-stuff/unit-test-pfx-no-password.pfx")
-            helpers.create_windows_cert_store(
-                env, "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_CERT_STORE")
+        # if (self.is_windows == True):
+            # self._setenv_s3(env, "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS",
+            #                 "s3://aws-crt-test-stuff/unit-test-pfx-no-password.pfx")
+            # helpers.create_windows_cert_store(
+            #     env, "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_PFX_CERT_NO_PASS", "AWS_TEST_MQTT311_IOT_CORE_WINDOWS_CERT_STORE")
 
         # X509
         self._setenv_secret(env, "AWS_TEST_MQTT311_IOT_CORE_X509_ENDPOINT", "ci/mqtt5/us/x509/endpoint")
diff --git a/builder/actions/setup_cross_ci_helpers.py b/builder/actions/setup_cross_ci_helpers.py
index 84b49d981..3ac09db31 100644
--- a/builder/actions/setup_cross_ci_helpers.py
+++ b/builder/actions/setup_cross_ci_helpers.py
@@ -20,15 +20,6 @@ def create_windows_cert_store(env, certificate_env, location_env):
         return
     pfx_cert_path = env.shell.getenv(certificate_env)
 
-    new_cert_folder_arguments = [
-        "New-Item",
-        windows_certificate_folder,
-        "-Name",
-        "test_folder",
-        "-ItemType",
-        "container"
-    ]
-
     env.shell.exec("powershell.exe", new_cert_folder_arguments, check=True)
 
     # Import the PFX into the Windows Certificate Store