diff --git a/schemas/zowe-yaml-schema.json b/schemas/zowe-yaml-schema.json
index 071b908aaf..4601706c51 100644
--- a/schemas/zowe-yaml-schema.json
+++ b/schemas/zowe-yaml-schema.json
@@ -227,31 +227,31 @@
                       "description": "Certificate distinguish name",
                       "properties": {
                         "caCommonName": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Common name of certificate authority generated by Zowe."
                         },
                         "commonName": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Common name of certificate generated by Zowe."
                         },
                         "orgUnit": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Organization unit of certificate generated by Zowe."
                         },
                         "org": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Organization of certificate generated by Zowe."
                         },
                         "locality": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "Locality of certificate generated by Zowe. This is usually the city name."
                         },
                         "state": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "State of certificate generated by Zowe. You can also put province name here."
                         },
                         "country": {
-                          "type": "string",
+                          "type": [ "string", "null" ],
                           "description": "2 letters country code of certificate generated by Zowe."
                         }
                       }