diff --git a/docker/osm-krm-functions/scripts/library/krm-functions.rc b/docker/osm-krm-functions/scripts/library/krm-functions.rc
index 2b5d696..30f1b54 100644
--- a/docker/osm-krm-functions/scripts/library/krm-functions.rc
+++ b/docker/osm-krm-functions/scripts/library/krm-functions.rc
@@ -1151,7 +1151,7 @@
   local MGMT_PROJECT_NAME="${24:-"osm_admin"}"
   local MGMT_CLUSTER_NAME="${25:-"_management"}"
   local BASE_TEMPLATES_PATH="${26:-"cloud-resources/capi"}"
-  local NAMESPACE="${27:-"managed-resources"}"
+  local CAPO_RESOURCES_NAMESPACE="${27:-"managed-resources"}"
 
   # Varibles with valus from convention.
   local CLUSTER_TYPE="openstack"
@@ -1193,7 +1193,7 @@
     "| select(.kind == \"Kustomization\") | select(.metadata.name == \"${CLUSTER_KUSTOMIZATION_NAME}\")" | \
   patch_replace \
     ".spec.postBuild.substitute.namespace" \
-    "${NAMESPACE}" \
+    "${CAPO_RESOURCES_NAMESPACE}" \
     "| select(.kind == \"Kustomization\") | select(.metadata.name == \"${CLUSTER_KUSTOMIZATION_NAME}\")" | \
   patch_replace \
     ".spec.postBuild.substitute.worker_machine_count" \
@@ -1274,9 +1274,9 @@
   local CLUSTER_KUSTOMIZATION_NAME="${1}"
   local CLUSTER_NAME="${2}"
   local VM_SIZE="${3}"
-  local VM_SIZE_CONTROL_PLANE="${4}"
+  local VM_SIZE_CONTROL_PLANE="${4:-"${VM_SIZE}"}"
   local NODE_COUNT="${5}"
-  local NODE_COUNT_CONTROLPLANE="${6}"
+  local NODE_COUNT_CONTROLPLANE="${6:-"1"}"
   local K8S_VERSION="${7}"
   # OpenStack specific
   local OPENSTACK_CLOUD_NAME="${8}"
@@ -1296,10 +1296,11 @@
   local FLEET_REPO_URL="${20:-"${FLEET_REPO_URL}"}"
   local SW_CATALOGS_REPO_DIR="${21:-"${SW_CATALOGS_REPO_DIR}"}"
   local SW_CATALOGS_REPO_URL="${22:-"${SW_CATALOGS_REPO_URL}"}"
-  local MGMT_PROJECT_NAME="${23:-"osm_admin"}"
-  local MGMT_CLUSTER_NAME="${24:-"_management"}"
-  local BASE_TEMPLATES_PATH="${25:-"cloud-resources/capi"}"
-  local NAMESPACE="${26:-"managed-resources"}"
+  local SKIP_BOOTSTRAP="${23:-"false"}"
+  local MGMT_PROJECT_NAME="${24:-"osm_admin"}"
+  local MGMT_CLUSTER_NAME="${25:-"_management"}"
+  local BASE_TEMPLATES_PATH="${26:-"cloud-resources/capi"}"
+  local CAPO_RESOURCES_NAMESPACE="${27:-"managed-resources"}"
   
   # Determine key folders in Fleet
   local MGMT_RESOURCES_DIR="${FLEET_REPO_DIR}/${MGMT_PROJECT_NAME}/managed-resources/${MGMT_CLUSTER_NAME}"
@@ -1334,7 +1335,7 @@
     "${MGMT_PROJECT_NAME}" \
     "${MGMT_CLUSTER_NAME}" \
     "${BASE_TEMPLATES_PATH}" \
-    "${NAMESPACE}"
+    "${CAPO_RESOURCES_NAMESPACE}"
 }
 
 # Create remote Openshift cluster via ACM