diff --git a/common-dev-assets b/common-dev-assets
index 30404d6e5..191c3ec32 160000
--- a/common-dev-assets
+++ b/common-dev-assets
@@ -1 +1 @@
-Subproject commit 30404d6e5c384e6683e15842eb82c829e672fc1d
+Subproject commit 191c3ec328a8bc402b28104c9ed5249ee5fafab3
diff --git a/ibm_catalog.json b/ibm_catalog.json
index 600c83044..c6f76c2e4 100644
--- a/ibm_catalog.json
+++ b/ibm_catalog.json
@@ -1164,7 +1164,20 @@
               }
             },
             {
-              "key": "entitlement"
+              "key": "entitlement",
+              "type_metadata": "string",
+              "options": [
+                {
+                  "description": "Use Cloud Pak with OCP License entitlement to create the OpenShift cluster. Select this option only if you use the cluster with a Cloud Pak that has an OpenShift entitlement.",
+                  "displayname": "Cloud Pak",
+                  "value": "cloud_pak"
+                },
+                {
+                  "description": "Purchase an OCP license for your worker pool. The license will be provided by IBM Cloud and there is no need to handle OpenShift licensing separately.",
+                  "displayname": "None",
+                  "value": "__NULL__"
+                }
+              ]
             }
           ],
           "iam_permissions": [
@@ -1399,13 +1412,44 @@
               "key": "workers_per_zone"
             },
             {
-              "key": "wait_till"
+              "key": "wait_till",
+              "type_metadata": "string",
+              "options": [
+                {
+                  "description": "Wait for ingress controller to be operational.",
+                  "displayname": "Ingress Ready",
+                  "value": "IngressReady"
+                },
+                {
+                  "description": "At least one worker node is fully ready.",
+                  "displayname": "One Worker Ready",
+                  "value": "OneWorkerNodeReady"
+                },
+                {
+                  "description": "Master node components are operational.",
+                  "displayname": "Master Ready",
+                  "value": "MasterNodeReady"
+                }
+              ]
             },
             {
               "key": "kms_wait_for_apply"
             },
             {
-              "key": "entitlement"
+              "key": "entitlement",
+              "type_metadata": "string",
+              "options": [
+                {
+                  "description": "Use Cloud Pak with OCP License entitlement to create the OpenShift cluster. Select this option only if you use the cluster with a Cloud Pak that has an OpenShift entitlement.",
+                  "displayname": "Cloud Pak",
+                  "value": "cloud_pak"
+                },
+                {
+                  "description": "Purchase an OCP license for your worker pool. The license will be provided by IBM Cloud and there is no need to handle OpenShift licensing separately.",
+                  "displayname": "None",
+                  "value": "__NULL__"
+                }
+              ]
             },
             {
               "key": "secondary_storage"