mas-cli 15.6.1__py3-none-any.whl → 15.6.3__py3-none-any.whl

mas/cli/templates/ibm-mas-tekton.yaml

@@ -129,7 +129,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -201,7 +201,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 5 minute intervals = 4 hours
       command:
@@ -281,7 +281,7 @@ spec:
 
     # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set STATUS=pending and wait for it to be changed to "approved"
     - name: app-cfg-post-verify
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -495,7 +495,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aiservice_tenant
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -711,7 +711,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aiservice
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -827,7 +827,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - appconnect
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -945,7 +945,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - arcgis
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/cert-manager.yaml
@@ -1015,7 +1015,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cert_manager
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -1081,7 +1081,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - common_services
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -1208,7 +1208,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cos
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1328,7 +1328,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -1445,7 +1445,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d_service
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1551,7 +1551,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - cp4d
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/db2.yaml
@@ -1873,7 +1873,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - db2
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -1983,7 +1983,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - eck
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gencfg-workspace.yaml
@@ -2072,20 +2072,20 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - gencfg_workspace
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
-# /home/runner/work/cli/cli/tekton/target/tasks/gitops-aibroker-tenant.yaml
+# /home/runner/work/cli/cli/tekton/target/tasks/gitops-aiservice-tenant.yaml
 # --------------------------------------------------------------------------------
 ---
 apiVersion: tekton.dev/v1beta1
 kind: Task
 metadata:
-  name: gitops-aibroker-tenant
+  name: gitops-aiservice-tenant
 spec:
   params: 
     - name: cluster_name
@@ -2106,18 +2106,16 @@ spec:
       type: string
     - name: github_host
       type: string
-    - name: aibroker_namespace
+    - name: aiservice_namespace
       type: string
-    - name: mas_aibroker_provision_tenant
+    - name: aiservice_provision_tenant
       type: string
-    - name: aibroker_instance_id
+    - name: aiservice_instance_id
       type: string
     - name: tenantNamespace
       type: string
     - name: tenant_id
       type: string
-    - name: mas_aibroker_tenant_name
-      type: string
     - name: cluster_domain
       type: string
     - name: in_saas_env
@@ -2130,27 +2128,29 @@ spec:
       type: string
     - name: slscfg_url
       type: string
-    - name: mas_aibroker_sls_subscription_id
+    - name: aiservice_sls_subscription_id
       type: string
-    - name: mas_aibroker_watsonxai_url
+    - name: aiservice_watsonxai_url
       type: string
-    - name: mas_aibroker_watsonxai_project_id
+    - name: aiservice_watsonx_full
       type: string
-    - name: mas_aibroker_storage_port
+    - name: aiservice_watsonx_instance_id
       type: string
-    - name: mas_aibroker_storage_region
+    - name: aiservice_watsonx_version
       type: string
-    - name: mas_aibroker_storage_provider
+    - name: aiservice_watsonx_username
       type: string
-    - name: mas_aibroker_storage_pipelines_bucket
+    - name: aiservice_operator_log_level
       type: string
-    - name: mas_aibroker_storage_ssl
+    - name: aiservice_storage_region
       type: string
-    - name: mas_aibroker_s3_endpoint_url
+    - name: aiservice_storage_provider
       type: string
-    - name: mas_aibroker_s3_region
+    - name: aiservice_storage_ssl
       type: string
-    - name: mas_aibroker_s3_bucket_prefix
+    - name: aiservice_s3_endpoint_url
+      type: string
+    - name: aiservice_s3_bucket_prefix
       type: string
     - name: rsl_url
       type: string
@@ -2161,7 +2161,7 @@ spec:
     - name: tenant_entitlement_end_date
       type: string
   stepTemplate:
-    name: gitops-aibroker-tenant
+    name: gitops-aiservice-tenant
     env:
       - name: CLUSTER_NAME
         value: $(params.cluster_name)
@@ -2181,18 +2181,16 @@ spec:
         value: $(params.github_host)
       - name: GITHUB_REPO
         value: $(params.github_repo)
-      - name: AIBROKER_NAMESPACE
-        value: $(params.aibroker_namespace)
-      - name: MAS_AIBROKER_PROVISION_TENANT
-        value: $(params.mas_aibroker_provision_tenant)
-      - name: AIBROKER_INSTANCE_ID
-        value: $(params.aibroker_instance_id)
+      - name: AISERVICE_NAMESPACE
+        value: $(params.aiservice_namespace)
+      - name: AISERVICE_PROVISION_TENANT
+        value: $(params.aiservice_provision_tenant)
+      - name: AISERVICE_INSTANCE_ID
+        value: $(params.aiservice_instance_id)
       - name: TENANT_NAMESPACE
         value: $(params.tenantNamespace)
       - name: TENANT_ID
         value: $(params.tenant_id)
-      - name: MAS_AIBROKER_TENANT_NAME
-        value: $(params.mas_aibroker_tenant_name)
       - name: CLUSTER_DOMAIN
         value: $(params.cluster_domain)
       - name: IN_SAAS_ENV
@@ -2205,29 +2203,30 @@ spec:
         value: $(params.drocfg_url)
       - name: SLSCFG_URL
         value: $(params.slscfg_url)
-
-      - name: MAS_AIBROKER_SLS_SUBSCRIPTION_ID
-        value: $(params.mas_aibroker_sls_subscription_id)
-      - name: MAS_AIBROKER_WATSONXAI_URL
-        value: $(params.mas_aibroker_watsonxai_url)
-      - name: MAS_AIBROKER_WATSONXAI_PROJECT_ID
-        value: $(params.mas_aibroker_watsonxai_project_id)
-      - name: MAS_AIBROKER_STORAGE_PORT
-        value: $(params.mas_aibroker_storage_port)
-      - name: MAS_AIBROKER_STORAGE_REGION
-        value: $(params.mas_aibroker_storage_region)
-      - name: MAS_AIBROKER_STORAGE_PROVIDER
-        value: $(params.mas_aibroker_storage_provider)
-      - name: MAS_AIBROKER_STORAGE_PIPELINES_BUCKET
-        value: $(params.mas_aibroker_storage_pipelines_bucket)
-      - name: MAS_AIBROKER_STORAGE_SSL
-        value: $(params.mas_aibroker_storage_ssl)
-      - name: MAS_AIBROKER_S3_ENDPOINT_URL
-        value: $(params.mas_aibroker_s3_endpoint_url)
-      - name: MAS_AIBROKER_S3_REGION
-        value: $(params.mas_aibroker_s3_region)
-      - name: MAS_AIBROKER_S3_BUCKET_PREFIX
-        value: $(params.mas_aibroker_s3_bucket_prefix)
+      - name: AISERVICE_SLS_SUBSCRIPTION_ID
+        value: $(params.aiservice_sls_subscription_id)
+      - name: AISERVICE_WATSONXAI_URL
+        value: $(params.aiservice_watsonxai_url)
+      - name: AISERVICE_WATSONX_FULL
+        value: $(params.aiservice_watsonx_full)
+      - name: AISERVICE_WATSONX_INSTANCE_ID
+        value: $(params.aiservice_watsonx_instance_id)
+      - name: AISERVICE_WATSONX_VERSION
+        value: $(params.aiservice_watsonx_version)
+      - name: AISERVICE_WATSONX_USERNAME
+        value: $(params.aiservice_watsonx_username)
+      - name: AISERVICE_OPERATOR_LOG_LEVEL
+        value: $(params.aiservice_operator_log_level)
+      - name: AISERVICE_STORAGE_REGION
+        value: $(params.aiservice_storage_region)
+      - name: AISERVICE_STORAGE_PROVIDER
+        value: $(params.aiservice_storage_provider)
+      - name: AISERVICE_STORAGE_SSL
+        value: $(params.aiservice_storage_ssl)
+      - name: AISERVICE_S3_ENDPOINT_URL
+        value: $(params.aiservice_s3_endpoint_url)
+      - name: AISERVICE_S3_BUCKET_PREFIX
+        value: $(params.aiservice_s3_bucket_prefix)
       - name: RSL_URL
         value: $(params.rsl_url)
       - name: TENANT_ENTITLEMENT_TYPE
@@ -2249,11 +2248,11 @@ spec:
         git config --global user.email "you@example.com"
         git config --global user.password $GITHUB_PAT
 
-        mkdir -p /tmp/init-aibroker-tenant
+        mkdir -p /tmp/init-aiservice-tenant
         
-        mas gitops-aibroker-tenant -a $ACCOUNT -c $CLUSTER_NAME \
+        mas gitops-aiservice-tenant -a $ACCOUNT -c $CLUSTER_NAME \
         --secrets-path $SECRET_PATH \
-        --dir /tmp/init-aibroker-tenant \
+        --dir /tmp/init-aiservice-tenant \
         --github-push \
         --github-host "$GITHUB_HOST" \
         --github-org "$GITHUB_ORG" \
@@ -2265,19 +2264,19 @@ spec:
       command:
         - /bin/sh
         - -c
-      name: gitops-aibroker-tenant
+      name: gitops-aiservice-tenant
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
-# /home/runner/work/cli/cli/tekton/target/tasks/gitops-aibroker.yaml
+# /home/runner/work/cli/cli/tekton/target/tasks/gitops-aiservice.yaml
 # --------------------------------------------------------------------------------
 ---
 apiVersion: tekton.dev/v1beta1
 kind: Task
 metadata:
-  name: gitops-aibroker
+  name: gitops-aiservice
 spec:
   params:
     - name: cluster_name
@@ -2299,39 +2298,25 @@ spec:
       type: string
     - name: github_host
       type: string
-    - name: aibroker_instance_id
+    - name: aiservice_instance_id
       type: string
-    - name: aibroker_namespace
+    - name: aiservice_namespace
       type: string
-    - name: mas_aibroker_watsonx_secret
+    - name: aiservice_watsonx_secret
       type: string
     - name: pull_secret_name
       type: string
-    - name: mas_aibroker_storage_provider
-      type: string
-    - name: mas_aibroker_storage_secret
-      type: string
-    - name: mas_aibroker_storage_host
-      type: string
-    - name: mas_aibroker_storage_port
-      type: string
-    - name: mas_aibroker_storage_ssl
-      type: string
-    - name: mas_aibroker_storage_region
-      type: string
-    - name: mas_aibroker_storage_pipelines_bucket
+    - name: aiservice_storage_provider
       type: string
-    - name: mas_aibroker_storage_tenants_bucket
+    - name: aiservice_storage_ssl
       type: string
-    - name: mas_aibroker_storage_templates_bucket
-      type: string
-    - name: mas_aibroker_mariadb_secret
+    - name: aiservice_storage_region
       type: string
     - name: primary_storage_class
       type: string
     - name: artifactory_username
       type: string
-    - name: mas_app_channel
+    - name: aiservice_channel
       type: string
     - name: mas_catalog_source
       type: string
@@ -2347,15 +2332,29 @@ spec:
       type: string
     - name: environment_type
       type: string
-    - name: mas_aibroker_s3_endpoint_url
+    - name: aiservice_s3_endpoint_url
+      type: string
+    - name: aiservice_s3_bucket_prefix
+      type: string
+    - name: sls_registration_key_secret
+      type: string
+    - name: dro_token_secret
+      type: string
+    - name: dro_cacert_secret
+      type: string
+    - name: aiservice_s3_templates_bucket
+      type: string
+    - name: aiservice_s3_tenants_bucket
       type: string
-    - name: mas_aibroker_s3_region
+    - name: aiservice_s3_secret
       type: string
-    - name: mas_aibroker_s3_bucket_prefix
+    - name: jdbc_secret
+      type: string
+    - name: use_aws_db2
       type: string
 
   stepTemplate:
-    name: gitops-aibroker
+    name: gitops-aiservice
     env:
       - name: CLUSTER_NAME
         value: $(params.cluster_name)
@@ -2375,40 +2374,26 @@ spec:
         value: $(params.github_host)
       - name: GITHUB_REPO
         value: $(params.github_repo)
-      - name: AIBROKER_INSTANCE_ID
-        value: $(params.aibroker_instance_id)
-      - name: AIBROKER_NAMESPACE
-        value: $(params.aibroker_namespace)
-      - name: MAS_AIBROKER_WATSONX_SECRET
-        value: $(params.mas_aibroker_watsonx_secret)
+      - name: AISERVICE_INSTANCE_ID
+        value: $(params.aiservice_instance_id)
+      - name: AISERVICE_NAMESPACE
+        value: $(params.aiservice_namespace)
+      - name: AISERVICE_WATSONX_SECRET
+        value: $(params.aiservice_watsonx_secret)
       - name: PULL_SECRET_NAME
         value: $(params.pull_secret_name)
-      - name: MAS_AIBROKER_STORAGE_PROVIDER
-        value: $(params.mas_aibroker_storage_provider)
-      - name: MAS_AIBROKER_STORAGE_SECRET
-        value: $(params.mas_aibroker_storage_secret)
-      - name: MAS_AIBROKER_STORAGE_HOST
-        value: $(params.mas_aibroker_storage_host)
-      - name: MAS_AIBROKER_STORAGE_PORT
-        value: $(params.mas_aibroker_storage_port)
-      - name: MAS_AIBROKER_STORAGE_SSL
-        value: $(params.mas_aibroker_storage_ssl)
-      - name: MAS_AIBROKER_STORAGE_REGION
-        value: $(params.mas_aibroker_storage_region)
-      - name: MAS_AIBROKER_STORAGE_PIPELINES_BUCKET
-        value: $(params.mas_aibroker_storage_pipelines_bucket)
-      - name: MAS_AIBROKER_STORAGE_TENANTS_BUCKET
-        value: $(params.mas_aibroker_storage_tenants_bucket)
-      - name: MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET
-        value: $(params.mas_aibroker_storage_templates_bucket)
-      - name: MAS_AIBROKER_MARIADB_SECRET
-        value: $(params.mas_aibroker_mariadb_secret)
+      - name: AISERVICE_STORAGE_PROVIDER
+        value: $(params.aiservice_storage_provider)
+      - name: AISERVICE_STORAGE_SSL
+        value: $(params.aiservice_storage_ssl)
+      - name: AISERVICE_STORAGE_REGION
+        value: $(params.aiservice_storage_region)
       - name: PRIMARY_STORAGE_CLASS
         value: $(params.primary_storage_class)
       - name: ARTIFACTORY_USERNAME
         value: $(params.artifactory_username)
-      - name: MAS_APP_CHANNEL
-        value: $(params.mas_app_channel)
+      - name: AISERVICE_CHANNEL
+        value: $(params.aiservice_channel)
       - name: MAS_CATALOG_SOURCE
         value: $(params.mas_catalog_source)
       - name: MAS_ICR_CP
@@ -2423,12 +2408,27 @@ spec:
         value: $(params.is_external_route)
       - name: ENVIRONMENT_TYPE
         value: $(params.environment_type)
-      - name: MAS_AIBROKER_S3_ENDPOINT_URL
-        value: $(params.mas_aibroker_s3_endpoint_url)
-      - name: MAS_AIBROKER_S3_REGION
-        value: $(params.mas_aibroker_s3_region)
-      - name: MAS_AIBROKER_S3_BUCKET_PREFIX
-        value: $(params.mas_aibroker_s3_bucket_prefix)
+      - name: AISERVICE_S3_ENDPOINT_URL
+        value: $(params.aiservice_s3_endpoint_url)
+      - name: AISERVICE_S3_BUCKET_PREFIX
+        value: $(params.aiservice_s3_bucket_prefix)
+      - name: SLS_REGISTRATION_KEY_SECRET
+        value: $(params.sls_registration_key_secret)
+      - name: DRO_TOKEN_SECRET
+        value: $(params.dro_token_secret)
+      - name: DRO_CACERT_SECRET
+        value: $(params.dro_cacert_secret)
+      - name: AISERVICE_S3_TEMPLATES_BUCKET
+        value: $(params.aiservice_s3_templates_bucket)
+      - name: AISERVICE_S3_TENANTS_BUCKET
+        value: $(params.aiservice_s3_tenants_bucket)
+      - name: AISERVICE_S3_SECRET
+        value: $(params.aiservice_s3_secret)
+      - name: JDBC_SECRET
+        value: $(params.jdbc_secret)
+      - name: USE_AWS_DB2
+        value: $(params.use_aws_db2)
+        
     envFrom:
       - configMapRef:
           name: environment-properties
@@ -2444,10 +2444,10 @@ spec:
         git config --global user.email "you@example.com"
         git config --global user.password $GITHUB_PAT
 
-        mkdir -p /tmp/init-aibroker
-        mas gitops-aibroker -a $ACCOUNT -c $CLUSTER_NAME \
+        mkdir -p /tmp/init-aiservice
+        mas gitops-aiservice -a $ACCOUNT -c $CLUSTER_NAME \
         --secrets-path $SECRET_PATH \
-        --dir /tmp/init-aibroker \
+        --dir /tmp/init-aiservice \
         --github-push \
         --github-host $GITHUB_HOST \
         --github-org  $GITHUB_ORG \
@@ -2458,9 +2458,9 @@ spec:
       command:
         - /bin/sh
         - -c
-      name: gitops-aibroker
+      name: gitops-aiservice
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2561,7 +2561,7 @@ spec:
         - -c
       name: gitops-bootstrap
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2643,7 +2643,7 @@ spec:
         - -c
       name: gitops-cis-compliance
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -2983,7 +2983,7 @@ spec:
         - -c
       name: gitops-cluster
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: gitops-cluster-configs
@@ -3092,7 +3092,7 @@ spec:
         - -c
       name: gitops-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3240,7 +3240,7 @@ spec:
         - -c
       name: gitops-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -3369,7 +3369,7 @@ spec:
         - -c
       name: gitops-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -3660,7 +3660,7 @@ spec:
         - -c
       name: gitops-db2u-database
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -3758,7 +3758,7 @@ spec:
         - -c
       name: gitops-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3885,7 +3885,7 @@ spec:
         - -c
       name: gitops-delete-jdbc-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -3983,13 +3983,193 @@ spec:
         - -c
       name: gitops-delete-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 
 
 
 
+# --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-aiservice-tenant.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: gitops-deprovision-aiservice-tenant
+spec:
+  params: 
+    - name: cluster_name
+      type: string
+    - name: account
+      type: string
+    - name: cluster_url
+      type: string
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    - name: git_branch
+      type: string
+    - name: github_org
+      type: string
+    - name: github_repo
+      type: string
+    - name: github_host
+      type: string
+    - name: aiservice_instance_id
+      type: string
+    - name: tenant_id
+      type: string
+      
+  stepTemplate:
+    name: gitops-deprovision-aiservice-tenant
+    env:
+      - name: CLUSTER_NAME
+        value: $(params.cluster_name)
+      - name: ACCOUNT
+        value: $(params.account)
+      - name: CLUSTER_URL
+        value: $(params.cluster_url)
+      - name: SECRET_PATH
+        value: $(params.secrets_path)
+      - name: SM_AWS_REGION
+        value: $(params.avp_aws_secret_region)
+      - name: GIT_BRANCH
+        value: $(params.git_branch)
+      - name: GITHUB_ORG
+        value: $(params.github_org)
+      - name: GITHUB_HOST
+        value: $(params.github_host)
+      - name: GITHUB_REPO
+        value: $(params.github_repo)
+      - name: AISERVICE_INSTANCE_ID
+        value: $(params.aiservice_instance_id)
+      - name: TENANT_ID
+        value: $(params.tenant_id)
+    envFrom:
+      - configMapRef:
+          name: environment-properties
+          optional: true
+      - secretRef:
+          name: secure-properties
+  steps:
+    - args:
+      - |-
+        git config --global user.name "MAS Automation"
+        git config --global user.email "you@example.com"
+        git config --global user.password $GITHUB_PAT
+
+        mkdir -p /tmp/init-aiservice-tenant
+        
+        mas gitops-deprovision-aiservice-tenant -a $ACCOUNT -c $CLUSTER_NAME \
+        --secrets-path $SECRET_PATH \
+        --dir /tmp/init-aiservice-tenant \
+        --github-push \
+        --github-host "$GITHUB_HOST" \
+        --github-org "$GITHUB_ORG" \
+        --github-repo "$GITHUB_REPO" \
+        --git-branch "$GIT_BRANCH" \
+
+
+        exit $?
+      command:
+        - /bin/sh
+        - -c
+      name: gitops-deprovision-aiservice-tenant
+      imagePullPolicy: IfNotPresent
+      image: quay.io/ibmmas/cli:15.6.3
+  workspaces:
+    - name: configs
+# --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-aiservice.yaml
+# --------------------------------------------------------------------------------
+---
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: gitops-deprovision-aiservice
+spec:
+  params: 
+    - name: cluster_name
+      type: string
+    - name: account
+      type: string
+    - name: cluster_url
+      type: string
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    - name: git_branch
+      type: string
+    - name: github_org
+      type: string
+    - name: github_repo
+      type: string
+    - name: github_host
+      type: string
+    - name: aiservice_instance_id
+      type: string
+      
+  stepTemplate:
+    name: gitops-deprovision-aiservice
+    env:
+      - name: CLUSTER_NAME
+        value: $(params.cluster_name)
+      - name: ACCOUNT
+        value: $(params.account)
+      - name: CLUSTER_URL
+        value: $(params.cluster_url)
+      - name: SECRET_PATH
+        value: $(params.secrets_path)
+      - name: SM_AWS_REGION
+        value: $(params.avp_aws_secret_region)
+      - name: GIT_BRANCH
+        value: $(params.git_branch)
+      - name: GITHUB_ORG
+        value: $(params.github_org)
+      - name: GITHUB_HOST
+        value: $(params.github_host)
+      - name: GITHUB_REPO
+        value: $(params.github_repo)
+      - name: AISERVICE_INSTANCE_ID
+        value: $(params.aiservice_instance_id)
+    envFrom:
+      - configMapRef:
+          name: environment-properties
+          optional: true
+      - secretRef:
+          name: secure-properties
+  steps:
+    - args:
+      - |-
+        git config --global user.name "MAS Automation"
+        git config --global user.email "you@example.com"
+        git config --global user.password $GITHUB_PAT
+
+        mkdir -p /tmp/init-aiservice
+        
+        mas gitops-deprovision-aiservice -a $ACCOUNT -c $CLUSTER_NAME \
+        --secrets-path $SECRET_PATH \
+        --dir /tmp/init-aiservice \
+        --github-push \
+        --github-host "$GITHUB_HOST" \
+        --github-org "$GITHUB_ORG" \
+        --github-repo "$GITHUB_REPO" \
+        --git-branch "$GIT_BRANCH" \
+
+
+        exit $?
+      command:
+        - /bin/sh
+        - -c
+      name: gitops-deprovision-aiservice
+      imagePullPolicy: IfNotPresent
+      image: quay.io/ibmmas/cli:15.6.3
+  workspaces:
+    - name: configs
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-app-config.yaml
 # --------------------------------------------------------------------------------
@@ -4075,7 +4255,7 @@ spec:
         - -c
       name: gitops-deprovision-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4160,7 +4340,7 @@ spec:
         - -c
       name: gitops-deprovision-app-install
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4245,7 +4425,7 @@ spec:
         - -c
       name: gitops-deprovision-cluster
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4364,7 +4544,7 @@ spec:
         - -c
       name: gitops-deprovision-cos
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4469,10 +4649,9 @@ spec:
         - -c
       name: gitops-deprovision-cp4d-service
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
-    - name: configs
-# --------------------------------------------------------------------------------
+    - name: configs# --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-cp4d.yaml
 # --------------------------------------------------------------------------------
 ---
@@ -4557,7 +4736,7 @@ spec:
         - -c
       name: gitops-deprovision-cp4d
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -4642,7 +4821,7 @@ spec:
         - -c
       name: gitops-deprovision-customer-subscription
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: shared-entitlement
 # --------------------------------------------------------------------------------
@@ -4735,7 +4914,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u-database
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 
@@ -4818,7 +4997,7 @@ spec:
         - -c
       name: gitops-deprovision-db2u
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 
@@ -4935,7 +5114,7 @@ spec:
         - -c
       name: gitops-deprovision-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 
@@ -5045,7 +5224,7 @@ spec:
         - -c
       name: gitops-deprovision-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5148,12 +5327,100 @@ spec:
         - -c
       name: gitops-deprovision-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 
 
 
+# --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-odh.yaml
+# --------------------------------------------------------------------------------
+
+apiVersion: tekton.dev/v1beta1
+kind: Task
+metadata:
+  name: gitops-deprovision-odh
+spec:
+  params:
+    - name: cluster_name
+      type: string
+    - name: account
+      type: string
+    - name: cluster_id
+      type: string
+    - name: cluster_url
+      type: string
+      default: ""
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    - name: git_branch
+      type: string
+    - name: github_org
+      type: string
+    - name: github_repo
+      type: string
+    - name: github_host
+      type: string
+    - name: aiservice_instance_id
+      type: string
+  stepTemplate:
+    name: gitops-deprovision-odh
+    env:
+      - name: CLUSTER_NAME
+        value: $(params.cluster_name)
+      - name: ACCOUNT
+        value: $(params.account)
+      - name: CLUSTER_URL
+        value: $(params.cluster_url)
+      - name: SECRET_PATH
+        value: $(params.secrets_path)
+      - name: SM_AWS_REGION
+        value: $(params.avp_aws_secret_region)
+      - name: GIT_BRANCH
+        value: $(params.git_branch)
+      - name: GITHUB_ORG
+        value: $(params.github_org)
+      - name: GITHUB_HOST
+        value: $(params.github_host)
+      - name: GITHUB_REPO
+        value: $(params.github_repo)
+      - name: AISERVICE_INSTANCE_ID
+        value: $(params.aiservice_instance_id)
+    envFrom:
+      - configMapRef:
+          name: environment-properties
+          optional: true
+      - secretRef:
+          name: secure-properties
+  steps:
+    - args:
+      - |-
+        git config --global user.name "MAS Automation"
+        git config --global user.email "you@example.com"
+        git config --global user.password $GITHUB_PAT
+        
+        mkdir -p /tmp/deprovision-odh
+        mas gitops-deprovision-odh -a $ACCOUNT -c $CLUSTER_NAME \
+        --dir /tmp/deprovision-odh \
+        --secrets-path $SECRET_PATH \
+        --github-push \
+        --github-host $GITHUB_HOST \
+        --github-org $GITHUB_ORG \
+        --github-repo $GITHUB_REPO \
+        --git-branch $GIT_BRANCH \
+
+        exit $?
+      command:
+        - /bin/sh
+        - -c
+      name: gitops-deprovision-odh
+      imagePullPolicy: IfNotPresent
+      image: quay.io/ibmmas/cli:15.6.3
+  workspaces:
+    - name: configs
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/gitops-deprovision-rosa.yaml
 # --------------------------------------------------------------------------------
@@ -5205,7 +5472,7 @@ spec:
         - -c
       name: gitops-deprovision-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5410,7 +5677,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 
@@ -5508,7 +5775,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5600,7 +5867,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5812,7 +6079,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5905,7 +6172,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -5996,7 +6263,7 @@ spec:
         - -c
       name: gitops-deprovision-suite-workspace
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6089,7 +6356,7 @@ spec:
         - -c
       name: gitops-deprovision-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 
@@ -6202,7 +6469,7 @@ spec:
         - -c
       name: gitops-dro
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -6329,7 +6596,7 @@ spec:
         - -c
       name: gitops-efs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 
@@ -6464,7 +6731,7 @@ spec:
         - -c
       name: gitops-jdbc-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -6560,7 +6827,7 @@ spec:
         - -c
       name: gitops-kafka-config
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 
@@ -6682,201 +6949,7 @@ spec:
         - -c
       name: gitops-kafka
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
-  workspaces:
-    - name: configs
-# --------------------------------------------------------------------------------
-# /home/runner/work/cli/cli/tekton/target/tasks/gitops-kmodel.yaml
-# --------------------------------------------------------------------------------
-
-apiVersion: tekton.dev/v1beta1
-kind: Task
-metadata:
-  name: gitops-kmodel
-spec:
-  params:
-    - name: cluster_name
-      type: string
-    - name: account
-      type: string
-    - name: cluster_id
-      type: string
-    - name: cluster_url
-      type: string
-      default: ""
-    - name: secrets_path
-      type: string
-    - name: avp_aws_secret_region
-      type: string
-    - name: git_branch
-      type: string
-    - name: github_org
-      type: string
-    - name: github_repo
-      type: string
-    - name: github_host
-      type: string
-
-    - name: aibroker_instance_id
-      type: string
-    - name: aibroker_internal_tls
-      type: string
-    - name: aibroker_namespace
-      type: string
-    - name: pull_secret_name
-      type: string
-    - name: mas_aibroker_storage_provider
-      type: string
-    - name: mas_aibroker_storage_ssl
-      type: string
-    - name: mas_aibroker_storage_host
-      type: string
-    - name: mas_aibroker_storage_port
-      type: string
-    - name: mas_aibroker_storage_region
-      type: string
-    - name: mas_aibroker_storage_templates_bucket
-      type: string
-    - name: mas_aibroker_storage_tenants_bucket
-      type: string
-    - name: mas_aibroker_storage_pipelines_bucket
-      type: string
-    - name: ssh_secret_name
-      type: string
-    - name: docker_server
-      type: string
-    - name: tenantNamespace
-      type: string
-    - name: mas_aibroker_provision_tenant
-      type: string
-    - name: primary_storage_class
-      type: string
-    - name: image_store
-      type: string
-    - name: image_watcher
-      type: string
-    - name: image_controller
-      type: string
-    - name: mas_aibroker_connector_tag
-      type: string
-    - name: mas_aibroker_saas
-      type: string
-    - name: model_id_unique_length
-      type: string
-    - name: model_id_prefix
-      type: string
-      
-    - name: mas_app_channel
-      type: string
-    - name: mas_icr_cp
-      type: string
-
-  stepTemplate:
-    name: gitops-kmodel
-    env:
-      - name: CLUSTER_NAME
-        value: $(params.cluster_name)
-      - name: ACCOUNT
-        value: $(params.account)
-      #- name: CLUSTER_ID
-      #  value: $(params.cluster_id)
-      - name: CLUSTER_URL
-        value: $(params.cluster_url)
-      - name: SECRET_PATH
-        value: $(params.secrets_path)
-      - name: SM_AWS_REGION
-        value: $(params.avp_aws_secret_region)
-      - name: GIT_BRANCH
-        value: $(params.git_branch)
-      - name: GITHUB_ORG
-        value: $(params.github_org)
-      - name: GITHUB_HOST
-        value: $(params.github_host)
-      - name: GITHUB_REPO
-        value: $(params.github_repo)
-      - name: AIBROKER_INSTANCE_ID
-        value: $(params.aibroker_instance_id)
-      - name: AIBROKER_INTERNAL_TLS
-        value: $(params.aibroker_internal_tls)
-      - name: AIBROKER_NAMESPACE
-        value: $(params.aibroker_namespace)
-      - name: PULL_SECRET_NAME
-        value: $(params.pull_secret_name)
-      - name: MAS_AIBROKER_STORAGE_PROVIDER
-        value: $(params.mas_aibroker_storage_provider)
-      - name: MAS_AIBROKER_STORAGE_SSL
-        value: $(params.mas_aibroker_storage_ssl)
-      - name: MAS_AIBROKER_STORAGE_HOST
-        value: $(params.mas_aibroker_storage_host)
-      - name: MAS_AIBROKER_STORAGE_PORT
-        value: $(params.mas_aibroker_storage_port)
-      - name: MAS_AIBROKER_STORAGE_REGION
-        value: $(params.mas_aibroker_storage_region)
-      - name: MAS_AIBROKER_STORAGE_TEMPLATES_BUCKET
-        value: $(params.mas_aibroker_storage_templates_bucket)
-      - name: MAS_AIBROKER_STORAGE_TENANTS_BUCKET
-        value: $(params.mas_aibroker_storage_tenants_bucket)
-      - name: MAS_AIBROKER_STORAGE_PIPELINES_BUCKET
-        value: $(params.mas_aibroker_storage_pipelines_bucket)
-      - name: SSH_SECRET_NAME
-        value: $(params.ssh_secret_name)
-      - name: DOCKER_SERVER
-        value: $(params.docker_server)
-      - name: TENANT_NAMESPACE
-        value: $(params.tenantNamespace)
-      - name: MAS_AIBROKER_PROVISION_TENANT
-        value: $(params.mas_aibroker_provision_tenant)
-      - name: PRIMARY_STORAGE_CLASS
-        value: $(params.primary_storage_class)
-      - name: IMAGE_STORE
-        value: $(params.image_store)
-      - name: IMAGE_WATCHER
-        value: $(params.image_watcher)
-      - name: IMAGE_CONTROLLER
-        value: $(params.image_controller)
-      - name: MAS_AIBROKER_CONNECTOR_TAG
-        value: $(params.mas_aibroker_connector_tag)
-      - name: MAS_AIBROKER_SAAS
-        value: $(params.mas_aibroker_saas)
-      - name: MODEL_ID_UNIQUE_LENGTH
-        value: $(params.model_id_unique_length)
-      - name: MODEL_ID_PREFIX
-        value: $(params.model_id_prefix)
-      - name: MAS_APP_CHANNEL
-        value: $(params.mas_app_channel)
-      - name: MAS_ICR_CP
-        value: $(params.mas_icr_cp)
-
-    envFrom:
-      - configMapRef:
-          name: environment-properties
-          optional: true
-      - secretRef:
-          name: secure-properties
-  steps:
-    - args:
-      - |-
-        git config --global user.name "MAS Automation"
-        git config --global user.email "you@example.com"
-        git config --global user.password $GITHUB_PAT
-        
-        mkdir -p /tmp/init-kmodel
-        mas gitops-kmodel -a $ACCOUNT -c $CLUSTER_NAME \
-        --dir /tmp/init-kmodel \
-        --secrets-path $SECRET_PATH \
-        --github-push \
-        --github-host $GITHUB_HOST \
-        --github-org $GITHUB_ORG \
-        --github-repo $GITHUB_REPO \
-        --git-branch $GIT_BRANCH \
-
-        exit $?
-      command:
-        - /bin/sh
-        - -c
-      name: gitops-kmodel
-      imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -7032,7 +7105,7 @@ spec:
         - -c
       name: gitops-license
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: shared-entitlement
 
@@ -7756,7 +7829,7 @@ spec:
         - -c
       name: gitops-mas-fvt-preparer
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -8256,7 +8329,7 @@ spec:
         - -c
       name: gitops-mas-initiator
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8314,6 +8387,8 @@ spec:
       type: string
     - name: csb_ca_certificate_file
       type: string
+    - name: recommend_cluster
+      type: string
 
   stepTemplate:
     name: gitops-mas-provisioner
@@ -8364,6 +8439,8 @@ spec:
         value: $(params.async_poll_max)
       - name: CSB_CA_CERTIFICATE_FILE
         value: $(params.csb_ca_certificate_file)
+      - name: RECOMMEND_CLUSTER
+        value: $(params.recommend_cluster)
     envFrom:
       - configMapRef:
           name: environment-properties
@@ -8393,7 +8470,7 @@ spec:
         - -c
       name: gitops-mas-provisioner
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: gitops-cluster-configs
@@ -8502,7 +8579,7 @@ spec:
         - -c
       name: gitops-mongo
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 
@@ -8628,7 +8705,7 @@ spec:
         - -c
       name: gitops-nvidia-gpu
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8644,7 +8721,7 @@ spec:
       type: string
     - name: account
       type: string
-    - name: aibroker_instance_id
+    - name: aiservice_instance_id
       type: string
     - name: cluster_url
       type: string
@@ -8659,6 +8736,8 @@ spec:
       type: string
     - name: secrets_path
       type: string
+    - name: aiservice_namespace
+      type: string
     - name: avp_aws_secret_region
       type: string
     - name: odh_channel
@@ -8674,11 +8753,16 @@ spec:
       type: string
     - name: odh_operator_version
       type: string
-    - name: mas_aibroker_storage_ssl
+    - name: aiservice_storage_ssl
       type: string
       default: "true"
-    - name: mas_aibroker_storage_region
+    - name: aiservice_storage_region
+      type: string
+    - name: opendatahub_source 
+      type: string
+    - name: aiservice_odh_model_deployment_type
       type: string
+
   stepTemplate:
     name: gitops-odh
     env:
@@ -8686,8 +8770,8 @@ spec:
         value: $(params.cluster_name)
       - name: ACCOUNT
         value: $(params.account)
-      - name: AIBROKER_INSTANCE_ID
-        value: $(params.aibroker_instance_id)
+      - name: AISERVICE_INSTANCE_ID
+        value: $(params.aiservice_instance_id)
       - name: CLUSTER_URL
         value: $(params.cluster_url)
       - name: GITHUB_REPO
@@ -8704,6 +8788,8 @@ spec:
         value: $(params.github_repo)
       - name: SM_AWS_REGION
         value: $(params.avp_aws_secret_region)
+      - name: AISERVICE_NAMESPACE
+        value: $(params.aiservice_namespace)
       - name: ODH_CHANNEL
         value: $(params.odh_channel)
       - name: ODH_INSTALL_PLAN
@@ -8716,10 +8802,14 @@ spec:
         value: $(params.opendatahub_namespace)
       - name: ODH_OPERATOR_VERSION
         value: $(params.odh_operator_version)
-      - name: MAS_AIBROKER_STORAGE_SSL
-        value: $(params.mas_aibroker_storage_ssl)
-      - name: MAS_AIBROKER_STORAGE_REGION
-        value: $(params.mas_aibroker_storage_region)
+      - name: AISERVICE_STORAGE_SSL
+        value: $(params.aiservice_storage_ssl)
+      - name: AISERVICE_STORAGE_REGION
+        value: $(params.aiservice_storage_region)
+      - name: OPENDATAHUB_SOURCE 
+        value: $(params.opendatahub_source)
+      - name: AISERVICE_ODH_MODEL_DEPLOYMENT_TYPE
+        value: $(params.aiservice_odh_model_deployment_type)
     envFrom:
       - configMapRef:
           name: environment-properties
@@ -8749,7 +8839,7 @@ spec:
         - -c
       name: gitops-odh
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8867,7 +8957,7 @@ spec:
         - -c
       name: gitops-process-mongo-user
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -8923,7 +9013,7 @@ spec:
         - -c
       name: gitops-rosa
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -9052,7 +9142,7 @@ spec:
         - -c
       name: gitops-sls
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: shared-entitlement
 
@@ -9235,7 +9325,7 @@ spec:
         - -c
       name: gitops-suite-app-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -9393,7 +9483,7 @@ spec:
         - -c
       name: gitops-suite-app-install
       imagePullPolicy: Always
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -9499,7 +9589,7 @@ spec:
         - -c
       name: gitops-suite-certs
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: certificates
@@ -9674,7 +9764,7 @@ spec:
         - -c
       name: gitops-suite-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -9774,7 +9864,7 @@ spec:
         - -c
       name: gitops-suite-dns
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 
@@ -9898,7 +9988,7 @@ spec:
         - -c
       name: gitops-suite-idp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-additional-configs
@@ -9999,7 +10089,7 @@ spec:
         - -c
       name: gitops-suite-objectstorage-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -10421,7 +10511,7 @@ spec:
         - -c
       name: gitops-suite-smtp-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -10541,7 +10631,7 @@ spec:
         - -c
       name: gitops-suite-watson-studio-config
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -10643,7 +10733,7 @@ spec:
         - -c
       name: gitops-suite-workspace
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
 # --------------------------------------------------------------------------------
@@ -10981,7 +11071,7 @@ spec:
         - -c
       name: gitops-suite
       imagePullPolicy: IfNotPresent
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
   workspaces:
     - name: configs
     - name: shared-gitops-configs
@@ -11031,7 +11121,7 @@ spec:
 
   steps:
     - name: grafana
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -11165,7 +11255,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ibm_catalogs
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -11407,7 +11497,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - kafka
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -11875,7 +11965,7 @@ spec:
       description: Extracted component names as a JSON array
   steps:
     - name: extract
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       script: |
         #!/bin/sh
         echo "Hello.. Start extraction for $(params.mas_appws_components)"
@@ -12228,7 +12318,7 @@ spec:
           echo "No IBM COS instance to delete"
         fi
         exit 0
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       env:
@@ -12328,7 +12418,7 @@ spec:
           echo "No EventStreams instance to delete"
         fi
         exit 0
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       env:
@@ -12429,7 +12519,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_deprovision
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -12497,6 +12587,63 @@ spec:
               name: mas-fvt
               key: FYRE_SITE
               optional: true
+
+        # AWS (IPI) Support
+        - name: AWS_ACCESS_KEY_ID
+          valueFrom:
+            secretKeyRef:
+              name: mas-fvt
+              key: AWS_ACCESS_KEY_ID
+              optional: true
+        
+        - name: AWS_SECRET_ACCESS_KEY
+          valueFrom:
+            secretKeyRef:
+              name: mas-fvt
+              key: AWS_SECRET_ACCESS_KEY
+              optional: true
+
+        - name: IPI_DIR
+          valueFrom:
+            secretKeyRef:
+              name: mas-fvt
+              key: IPI_DIR
+              optional: true
+
+        - name: IPI_CONFIG_DIR
+          valueFrom:
+            secretKeyRef:
+              name: mas-fvt
+              key: IPI_CONFIG_DIR
+              optional: true
+
+        - name: IPI_PLATFORM
+          valueFrom:
+            secretKeyRef:
+              name: mas-fvt
+              key: IPI_PLATFORM
+              optional: true
+
+        - name: OCP_VERSION
+          valueFrom:
+            secretKeyRef:
+              name: mas-fvt
+              key: OCP_VERSION
+              optional: true
+
+        - name: FVT_ARTIFACTORY_USERNAME
+          valueFrom:
+            secretKeyRef:
+              name: mas-fvt
+              key: FVT_ARTIFACTORY_USERNAME
+              optional: true
+                    
+        - name: FVT_ARTIFACTORY_TOKEN
+          valueFrom:
+            secretKeyRef:
+              name: mas-fvt
+              key: FVT_ARTIFACTORY_TOKEN
+              optional: true
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/mas-fvt-finalize.yaml
 # --------------------------------------------------------------------------------
@@ -12529,7 +12676,7 @@ spec:
       command:
         - python3
         - /opt/app-root/src/finalizer.py
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -14233,7 +14380,7 @@ spec:
       command:
         - python3
         - /opt/app-root/src/mobilever.py
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       onError: continue
 
@@ -14596,7 +14743,7 @@ spec:
 
   steps:
     - name: post-update-verify
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -14652,7 +14799,7 @@ spec:
 
   steps:
     - name: create-offline-upgrade-cron
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -14708,7 +14855,7 @@ spec:
 
   steps:
     - name: create-offline-upgrade-cron
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -15142,7 +15289,7 @@ spec:
         echo '--------------------------------------------------------------------------------'
         exit $RESULT
       timeout: "0"
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -15202,7 +15349,7 @@ spec:
         echo '--------------------------------------------------------------------------------'
         exit $RESULT
       timeout: "0"
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -15275,7 +15422,7 @@ spec:
         echo '--------------------------------------------------------------------------------'
         exit $RESULT
       timeout: "0"
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -15321,7 +15468,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -15418,7 +15565,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 5 minute intervals = just over 4 hours
       command:
@@ -15462,7 +15609,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -15615,7 +15762,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -15664,7 +15811,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -15714,7 +15861,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -15793,7 +15940,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 15 retries at 5 minute intervals = just over 1 hour
       command:
@@ -15838,7 +15985,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -15966,7 +16113,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -16010,7 +16157,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16163,7 +16310,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -16210,7 +16357,7 @@ spec:
 
   steps:
     - name: start-testng-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16302,7 +16449,7 @@ spec:
               optional: false
 
     - name: wait-for-testng-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -16349,7 +16496,7 @@ spec:
 
   steps:
     - name: start-pytest-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16432,7 +16579,7 @@ spec:
               optional: false
 
     - name: wait-for-pytest-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -16480,7 +16627,7 @@ spec:
 
   steps:
     - name: start-pytest-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16560,7 +16707,7 @@ spec:
               optional: false
 
     - name: wait-for-pytest-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -16586,7 +16733,7 @@ spec:
           value: "True"
 
     - name: start-testng-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16685,7 +16832,7 @@ spec:
               optional: false
 
     - name: wait-for-testng-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -16728,7 +16875,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16819,7 +16966,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 5 minute intervals = 4 hours
       command:
@@ -16863,7 +17010,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -16954,7 +17101,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 5 minute intervals = 4 hours
       command:
@@ -16998,7 +17145,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -17077,7 +17224,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 5 minute intervals = 4 hours
       command:
@@ -17121,7 +17268,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -17206,7 +17353,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 15 retries at 5 minute intervals = just over 1 hour
       command:
@@ -17250,7 +17397,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -17346,7 +17493,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 10 retries at 5 minute intervals = 50 min
       command:
@@ -17394,7 +17541,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -17498,7 +17645,7 @@ spec:
               optional: false
         
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 10 retries at 5 minute intervals = 50 min
       command:
@@ -17542,7 +17689,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -17621,7 +17768,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -17665,7 +17812,7 @@ spec:
 
   steps:
     - name: start-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - ansible-playbook
@@ -17770,7 +17917,7 @@ spec:
               optional: false
 
     - name: wait-for-pipelinerun
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       # 50 retries at 10 minute intervals = just over 8 hours
       command:
@@ -17795,13 +17942,13 @@ spec:
         - name: IGNORE_FAILURE
           value: "True"
 # --------------------------------------------------------------------------------
-# /home/runner/work/cli/cli/tekton/target/tasks/minio.yaml
+# /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
 # --------------------------------------------------------------------------------
 ---
 apiVersion: tekton.dev/v1beta1
 kind: Task
 metadata:
-  name: mas-devops-minio
+  name: mas-devops-mongodb
 spec:
   params:
     # Common: Control the image pull policy for the CLI container image
@@ -17816,190 +17963,84 @@ spec:
       default: ""
 
 
-    # Pre-Release Support
-    - name: artifactory_username
-      default: ''
+    - name: mas_instance_id
       type: string
-      description: Required to use development MAS builds
-    - name: artifactory_token
-      default: ''
+      description: Instance ID
+      default: "" # By default, no config will be generated
+    - name: custom_labels
       type: string
-      description: Required to use development MAS builds
+      description: Optional MAS custom labels, comma separated list of key=value pairs
+      default: ""
 
-    # Entitlement
-    - name: ibm_entitlement_key
+    # Storage Class
+    - name: mongodb_storage_class
       type: string
+      default: ""
 
-    # MAS Details
-    - name: mas_instance_id
+    # Other mongoDb parameters
+    - name: mongodb_namespace
       type: string
-      description: Instance ID
+      description: Optional configuration for mongodb namespace
+      default: ""
+    - name: mongodb_replicas
+      type: string
+      description: Optional configuration for mongodb replicas
+      default: ""
+    - name: mongodb_cpu_requests
+      type: string
+      description: Optional configuration for mongodb cpu requests
+      default: ""
+    - name: mongodb_provider
+      type: string
+      description: MongoDb provider
+      default: ""
+    - name: mongodb_version
+      type: string
+      description: MongoDb version
+      default: ""
+    - name: mongodb_action
+      type: string
+      description: Optional. Used to uninstall MongoDB
+      default: ""
+    - name: mongodb_v5_upgrade
+      type: string
+      description: Approves the MongoDb upgrade to version 5 if needed
+      default: ""
+    - name: mongodb_v6_upgrade
+      type: string
+      description: Approves the MongoDb upgrade to version 6 if needed
+      default: ""
+    - name: mongodb_v7_upgrade
+      type: string
+      description: Approves the MongoDb upgrade to version 7 if needed
+      default: ""
 
-    # Minio credentials
-    - name: minio_root_user
+    # Dependencies - IBM Cloud MongoDb
+    # -------------------------------------------------------------------------
+    - name: ibmcloud_resourcegroup
       type: string
-      description: root user for minio
+      description: IBM Cloud resource group
       default: ""
-    - name: minio_root_password
+    - name: ibm_mongo_name
+      type: string
+      description: IBM Cloud MongoDb instance name
+      default: ""
+    - name: ibm_mongo_admin_password
+      type: string
+      description: IBM Cloud MongoDb admin password
+      default: ""
+    - name: ibm_mongo_resourcegroup
+      type: string
+      description: IBM Cloud MongoDb resource group
+      default: ""
+    - name: ibm_mongo_region
+      type: string
+      description: IBM Cloud MongoDb instance region
+      default: ""
+    - name: ibmcloud_apikey
       type: string
-
-  stepTemplate:
-    env:
-      - name: DEVOPS_MONGO_URI
-        valueFrom:
-          secretKeyRef:
-            name: mas-devops
-            key: DEVOPS_MONGO_URI
-            optional: true
-      - name: DEVOPS_BUILD_NUMBER
-        valueFrom:
-          secretKeyRef:
-            name: mas-devops
-            key: DEVOPS_BUILD_NUMBER
-            optional: true
-      - name: DEVOPS_ENVIRONMENT
-        valueFrom:
-          secretKeyRef:
-            name: mas-devops
-            key: MAS_INSTANCE_ID
-            optional: true
-      - name: DEVOPS_SUITE_NAME
-        value: $(params.devops_suite_name)
-
-
-      # Pre-Release Support
-      - name: ARTIFACTORY_USERNAME
-        value: $(params.artifactory_username)
-      - name: ARTIFACTORY_TOKEN
-        value: $(params.artifactory_token)
-
-      # Entitlement
-      - name: IBM_ENTITLEMENT_KEY
-        value: $(params.ibm_entitlement_key)
-
-      # MAS Details
-      - name: MAS_INSTANCE_ID
-        value: $(params.mas_instance_id)
-
-      - name: MINIO_NAMESPACE
-        value: minio
-
-      - name: MINIO_INSTANCE_NAME
-        value: minio
-
-      - name: MINIO_ROOT_USER
-        value: $(params.minio_root_user)
-
-      - name: MINIO_ROOT_PASSWORD
-        value: $(params.minio_root_password)
-
-  steps:
-    - name: minio
-      command:
-        - /opt/app-root/src/run-role.sh
-        - minio
-      image: quay.io/ibmmas/cli:15.6.1
-      imagePullPolicy: $(params.image_pull_policy)
-# --------------------------------------------------------------------------------
-# /home/runner/work/cli/cli/tekton/target/tasks/mongodb.yaml
-# --------------------------------------------------------------------------------
----
-apiVersion: tekton.dev/v1beta1
-kind: Task
-metadata:
-  name: mas-devops-mongodb
-spec:
-  params:
-    # Common: Control the image pull policy for the CLI container image
-    - name: image_pull_policy
-      type: string
-      default: IfNotPresent
-
-    # Common: Support for saving task execution results to a MongoDb instance
-    - name: devops_suite_name
-      type: string
-      description: Optional name for the junit suite, used to enable save-junit-to-mongo.py
-      default: ""
-
-
-    - name: mas_instance_id
-      type: string
-      description: Instance ID
-      default: "" # By default, no config will be generated
-    - name: custom_labels
-      type: string
-      description: Optional MAS custom labels, comma separated list of key=value pairs
-      default: ""
-
-    # Storage Class
-    - name: mongodb_storage_class
-      type: string
-      default: ""
-
-    # Other mongoDb parameters
-    - name: mongodb_namespace
-      type: string
-      description: Optional configuration for mongodb namespace
-      default: ""
-    - name: mongodb_replicas
-      type: string
-      description: Optional configuration for mongodb replicas
-      default: ""
-    - name: mongodb_cpu_requests
-      type: string
-      description: Optional configuration for mongodb cpu requests
-      default: ""
-    - name: mongodb_provider
-      type: string
-      description: MongoDb provider
-      default: ""
-    - name: mongodb_version
-      type: string
-      description: MongoDb version
-      default: ""
-    - name: mongodb_action
-      type: string
-      description: Optional. Used to uninstall MongoDB
-      default: ""
-    - name: mongodb_v5_upgrade
-      type: string
-      description: Approves the MongoDb upgrade to version 5 if needed
-      default: ""
-    - name: mongodb_v6_upgrade
-      type: string
-      description: Approves the MongoDb upgrade to version 6 if needed
-      default: ""
-    - name: mongodb_v7_upgrade
-      type: string
-      description: Approves the MongoDb upgrade to version 7 if needed
-      default: ""
-
-    # Dependencies - IBM Cloud MongoDb
-    # -------------------------------------------------------------------------
-    - name: ibmcloud_resourcegroup
-      type: string
-      description: IBM Cloud resource group
-      default: ""
-    - name: ibm_mongo_name
-      type: string
-      description: IBM Cloud MongoDb instance name
-      default: ""
-    - name: ibm_mongo_admin_password
-      type: string
-      description: IBM Cloud MongoDb admin password
-      default: ""
-    - name: ibm_mongo_resourcegroup
-      type: string
-      description: IBM Cloud MongoDb resource group
-      default: ""
-    - name: ibm_mongo_region
-      type: string
-      description: IBM Cloud MongoDb instance region
-      default: ""
-    - name: ibmcloud_apikey
-      type: string
-      description: API Key used to create Mongo instance in IBM Cloud
-      default: ""
+      description: API Key used to create Mongo instance in IBM Cloud
+      default: ""
 
   stepTemplate:
     env:
@@ -18076,7 +18117,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - mongodb
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -18119,7 +18160,7 @@ spec:
         - $(params.base_output_dir)
         - --extra-namespaces
         - selenium
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       env:
         - name: DEVOPS_MONGO_URI
@@ -18236,7 +18277,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - nvidia_gpu
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -18272,7 +18313,7 @@ spec:
     # Verify Cluster
     # -------------------------------------------------------------------------
     - name: ocp-verify-cluster
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -18314,7 +18355,7 @@ spec:
     # Verify Catalogs
     # -------------------------------------------------------------------------
     - name: ocp-verify-catalogs
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -18356,7 +18397,7 @@ spec:
     # Verify Subscriptions
     # -------------------------------------------------------------------------
     - name: ocp-verify-subscriptions
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -18398,7 +18439,7 @@ spec:
     # Verify Workloads
     # -------------------------------------------------------------------------
     - name: ocp-verify-workloads
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -18440,7 +18481,7 @@ spec:
     # Verify Catalogs - Ingress TLS
     # -------------------------------------------------------------------------
     - name: ocp-verify-ingress
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/run-role.sh
@@ -18566,7 +18607,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocp_verify
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 # --------------------------------------------------------------------------------
@@ -18634,7 +18675,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - ocs
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -18763,7 +18804,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - aiservice_odh
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/sls-registry-update.yaml
@@ -18939,7 +18980,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - sls
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -19399,12 +19440,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_config
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-app-cfg-$(params.mas_app_id) exists then set STATUS=pending and wait for it to be changed to "approved"
     - name: app-cfg-post-verify
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -19599,7 +19640,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_install
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -19688,7 +19729,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_rollback
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-uninstall.yaml
@@ -19751,7 +19792,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_uninstall
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-upgrade.yaml
@@ -19826,7 +19867,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_upgrade
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-app-verify.yaml
@@ -19927,7 +19968,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_app_verify
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-certs.yaml
@@ -20070,7 +20111,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_certs
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 
   workspaces:
@@ -20137,7 +20178,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_config
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -20469,7 +20510,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_facilities
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
     
@@ -20541,7 +20582,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_db2_setup_for_manage
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-dns.yaml
@@ -20736,7 +20777,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_dns
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-install.yaml
@@ -20985,7 +21026,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_install
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
 
@@ -21073,7 +21114,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_rollback
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-uninstall.yaml
@@ -21138,7 +21179,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_uninstall
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-upgrade.yaml
@@ -21208,7 +21249,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_upgrade
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/suite-verify.yaml
@@ -21270,12 +21311,12 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - suite_verify
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 
     # If configmap/approval-suite-verify exists then set STATUS=pending and wait for it to be changed to "approved"
     - name: suite-post-verify
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       command:
         - /opt/app-root/src/wait-for-configmap.sh
@@ -21398,7 +21439,7 @@ spec:
       command:
         - /opt/app-root/src/run-role.sh
         - turbonomic
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
 # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/tasks/uds.yaml
@@ -21479,7 +21520,7 @@ spec:
     # IBM User Data Services (UDS)
     # -------------------------------------------------------------------------
     - name: uds
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -21542,7 +21583,7 @@ spec:
     # IBM Data Reporter Operator (DRO)
     # -------------------------------------------------------------------------
     - name: dro
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       imagePullPolicy: $(params.image_pull_policy)
       workingDir: /workspace/configs
       command:
@@ -21628,7 +21669,7 @@ spec:
       description: "The value to set"
   steps:
     - name: update-configmap
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       command:
         - /opt/app-root/src/update-configmap.sh
       env:
@@ -21675,7 +21716,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -21756,7 +21797,7 @@ spec:
 
   steps:
     - name: wait-for-configmap
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       command:
         - /opt/app-root/src/wait-for-configmap.sh
       env:
@@ -21816,7 +21857,7 @@ spec:
 
   steps:
     - name: wait
-      image: quay.io/ibmmas/cli:15.6.1
+      image: quay.io/ibmmas/cli:15.6.3
       command:
         - /opt/app-root/src/wait-for-tekton.sh
       env:
@@ -21861,7 +21902,7 @@ spec:
     - name: launchfvt_aiservice
       type: string
       default: "false"
-      description: "Set this to 'true' to enable launch of the AIBroker FVT pipeline after the ai service has been installed"
+      description: "Set this to 'true' to enable launch of the AIService FVT pipeline after the ai service has been installed"
 
     # Finalize
     # -------------------------------------------------------------------------
@@ -24806,180 +24847,12 @@ spec:
         - name: shared-entitlement
           workspace: shared-entitlement
 # --------------------------------------------------------------------------------
-# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-aibroker-tenant.yaml
+# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-aiservice-pipeline.yaml
 # --------------------------------------------------------------------------------
 apiVersion: tekton.dev/v1beta1
 kind: Pipeline
 metadata:
-  name: gitops-mas-aibroker-tenant
-spec:
-  params:
-    - name: cluster_name
-      type: string
-    - name: account
-      type: string
-    - name: cluster_id
-      type: string
-    - name: cluster_url
-      type: string
-    - name: secrets_path
-      type: string
-    - name: avp_aws_secret_region
-      type: string
-    - name: git_branch
-      type: string
-    - name: github_org
-      type: string
-    - name: github_repo
-      type: string
-    - name: github_host
-      type: string
-    - name: aibroker_namespace
-      type: string
-    - name: mas_aibroker_provision_tenant
-      type: string
-    - name: aibroker_instance_id
-      type: string
-    - name: tenantNamespace
-      type: string
-    - name: tenant_id
-      type: string
-    - name: mas_aibroker_tenant_name
-      type: string
-    - name: cluster_domain
-      type: string
-    - name: in_saas_env
-      type: string
-    - name: mas_icr_cp
-      type: string
-    - name: mas_icr_cpopen
-      type: string
-    - name: drocfg_url
-      type: string
-    - name: slscfg_url
-      type: string
-    - name: mas_aibroker_sls_subscription_id
-      type: string
-    - name: mas_aibroker_watsonxai_url
-      type: string
-    - name: mas_aibroker_watsonxai_project_id
-      type: string
-    - name: mas_aibroker_storage_port
-      type: string
-    - name: mas_aibroker_storage_region
-      type: string
-    - name: mas_aibroker_storage_provider
-      type: string
-    - name: mas_aibroker_storage_pipelines_bucket
-      type: string
-    - name: mas_aibroker_storage_ssl
-      type: string
-    - name: mas_aibroker_s3_endpoint_url
-      type: string
-    - name: mas_aibroker_s3_region
-      type: string
-    - name: mas_aibroker_s3_bucket_prefix
-      type: string
-    - name: rsl_url
-      type: string
-    - name: tenant_entitlement_type
-      type: string
-    - name: tenant_entitlement_start_date
-      type: string
-    - name: tenant_entitlement_end_date
-      type: string
-
-  workspaces:
-    - name: configs
-  tasks:
-    - name: run-gitops-aibroker-tenant
-      taskRef:
-        name: gitops-aibroker-tenant
-      workspaces:
-        - name: configs
-          workspace: configs
-      params:
-        - name: cluster_name
-          value: $(params.cluster_name)
-        - name: account
-          value: $(params.account)
-        - name: cluster_id
-          value: $(params.cluster_id)
-        - name: cluster_url
-          value: $(params.cluster_url)
-        - name: secrets_path
-          value: $(params.secrets_path)
-        - name: avp_aws_secret_region
-          value: $(params.avp_aws_secret_region)
-        - name: git_branch
-          value: $(params.git_branch)
-        - name: github_org
-          value: $(params.github_org)
-        - name: github_repo
-          value: $(params.github_repo)
-        - name: github_host
-          value: $(params.github_host)
-        - name: aibroker_namespace
-          value: $(params.aibroker_namespace)
-        - name: mas_aibroker_provision_tenant
-          value: $(params.mas_aibroker_provision_tenant)
-        - name: aibroker_instance_id
-          value: $(params.aibroker_instance_id)
-        - name: tenantNamespace
-          value: $(params.tenantNamespace)
-        - name: tenant_id
-          value: $(params.tenant_id)
-        - name: mas_aibroker_tenant_name
-          value: $(params.mas_aibroker_tenant_name)
-        - name: cluster_domain
-          value: $(params.cluster_domain)
-        - name: in_saas_env
-          value: $(params.in_saas_env)
-        - name: mas_icr_cp
-          value: $(params.mas_icr_cp)
-        - name: mas_icr_cpopen
-          value: $(params.mas_icr_cpopen)
-        - name: drocfg_url
-          value: $(params.drocfg_url)
-        - name: slscfg_url
-          value: $(params.slscfg_url)
-        - name: mas_aibroker_sls_subscription_id
-          value: $(params.mas_aibroker_sls_subscription_id)
-        - name: mas_aibroker_watsonxai_url
-          value: $(params.mas_aibroker_watsonxai_url)
-        - name: mas_aibroker_watsonxai_project_id
-          value: $(params.mas_aibroker_watsonxai_project_id)
-        - name: mas_aibroker_storage_port
-          value: $(params.mas_aibroker_storage_port)
-        - name: mas_aibroker_storage_region
-          value: $(params.mas_aibroker_storage_region)
-        - name: mas_aibroker_storage_provider
-          value: $(params.mas_aibroker_storage_provider)
-        - name: mas_aibroker_storage_pipelines_bucket
-          value: $(params.mas_aibroker_storage_pipelines_bucket)
-        - name: mas_aibroker_storage_ssl
-          value: $(params.mas_aibroker_storage_ssl)
-        - name: mas_aibroker_s3_endpoint_url
-          value: $(params.mas_aibroker_s3_endpoint_url)
-        - name: mas_aibroker_s3_region
-          value: $(params.mas_aibroker_s3_region)
-        - name: mas_aibroker_s3_bucket_prefix
-          value: $(params.mas_aibroker_s3_bucket_prefix)
-        - name: rsl_url
-          value: $(params.rsl_url)
-        - name: tenant_entitlement_type
-          value: $(params.tenant_entitlement_type)
-        - name: tenant_entitlement_start_date
-          value: $(params.tenant_entitlement_start_date)
-        - name: tenant_entitlement_end_date
-          value: $(params.tenant_entitlement_end_date)
-        # --------------------------------------------------------------------------------
-# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-aibroker.yaml
-# --------------------------------------------------------------------------------
-apiVersion: tekton.dev/v1beta1
-kind: Pipeline
-metadata:
-  name: gitops-mas-aibroker
+  name: gitops-aiservice-pipeline
 spec:
   params:
     - name: cluster_name
@@ -24988,11 +24861,10 @@ spec:
       type: string
     - name: account
       type: string
-    - name: aibroker_instance_id
+    - name: aiservice_instance_id
       type: string
     - name: cluster_url
       type: string
-      default: ""
     - name: secrets_path
       type: string
     - name: avp_aws_secret_region
@@ -25006,38 +24878,22 @@ spec:
     - name: github_host
       type: string
 
-    # AIBROKER-specific
-    - name: aibroker_namespace
+    # aiservice-specific
+    - name: aiservice_namespace
       type: string
-    - name: mas_aibroker_watsonx_secret
+    - name: aiservice_watsonx_secret
       type: string
     - name: pull_secret_name
       type: string
-    - name: mas_aibroker_storage_provider
-      type: string
-    - name: mas_aibroker_storage_secret
-      type: string
-    - name: mas_aibroker_storage_host
-      type: string
-    - name: mas_aibroker_storage_port
-      type: string
-    - name: mas_aibroker_storage_ssl
-      type: string
-    - name: mas_aibroker_storage_region
-      type: string
-    - name: mas_aibroker_storage_pipelines_bucket
-      type: string
-    - name: mas_aibroker_storage_tenants_bucket
+    - name: aiservice_storage_provider
       type: string
-    - name: mas_aibroker_storage_templates_bucket
-      type: string
-    - name: mas_aibroker_mariadb_secret
+    - name: aiservice_storage_ssl
       type: string
     - name: primary_storage_class
       type: string
     - name: artifactory_username
       type: string
-    - name: mas_app_channel
+    - name: aiservice_channel
       type: string
     - name: mas_catalog_source
       type: string
@@ -25051,6 +24907,10 @@ spec:
       type: string
     - name: is_external_route
       type: string
+    - name: jdbc_secret
+      type: string
+    - name: use_aws_db2
+      type: string
 
     # ODH-specific
     - name: odh_channel
@@ -25065,39 +24925,29 @@ spec:
       type: string
     - name: odh_operator_version
       type: string
-
-    # KMODEL-specific 
-    - name: aibroker_internal_tls
-      type: string
-    - name: docker_server
-      type: string
-    - name: image_controller
-      type: string
-    - name: image_store
+    - name: environment_type
       type: string
-    - name: image_watcher
+    - name: aiservice_s3_endpoint_url
       type: string
-    - name: mas_aibroker_connector_tag
+    - name: aiservice_storage_region
       type: string
-    - name: mas_aibroker_provision_tenant
+    - name: aiservice_s3_bucket_prefix
       type: string
-    - name: mas_aibroker_saas
+    - name: opendatahub_source 
       type: string
-    - name: model_id_prefix
+    - name: aiservice_odh_model_deployment_type
       type: string
-    - name: model_id_unique_length
+    - name: sls_registration_key_secret
       type: string
-    - name: ssh_secret_name
+    - name: dro_token_secret
       type: string
-    - name: tenantNamespace
-      type: string 
-    - name: environment_type
+    - name: dro_cacert_secret
       type: string
-    - name: mas_aibroker_s3_endpoint_url
+    - name: aiservice_s3_templates_bucket
       type: string
-    - name: mas_aibroker_s3_region
+    - name: aiservice_s3_tenants_bucket
       type: string
-    - name: mas_aibroker_s3_bucket_prefix
+    - name: aiservice_s3_secret
       type: string
 
   workspaces:
@@ -25118,8 +24968,8 @@ spec:
           value: $(params.cluster_name)
         - name: account
           value: $(params.account)
-        - name: aibroker_instance_id
-          value: $(params.aibroker_instance_id)
+        - name: aiservice_instance_id
+          value: $(params.aiservice_instance_id)
         - name: cluster_url
           value: $(params.cluster_url)
         - name: git_branch
@@ -25134,6 +24984,8 @@ spec:
           value: $(params.secrets_path)
         - name: avp_aws_secret_region
           value: $(params.avp_aws_secret_region)
+        - name: aiservice_namespace
+          value: $(params.aiservice_namespace)
         - name: odh_channel
           value: $(params.odh_channel)
         - name: odh_subscription_install_plan
@@ -25146,24 +24998,28 @@ spec:
           value: $(params.opendatahub_namespace)
         - name: odh_operator_version
           value: $(params.odh_operator_version)
-        - name: mas_aibroker_storage_ssl
-          value: $(params.mas_aibroker_storage_ssl)
-        - name: mas_aibroker_storage_region
-          value: $(params.mas_aibroker_storage_region)
-          
-    # 3.gitops-Aibroker
+        - name: aiservice_storage_ssl
+          value: $(params.aiservice_storage_ssl)
+        - name: aiservice_storage_region
+          value: $(params.aiservice_storage_region)
+        - name: opendatahub_source 
+          value: $(params.opendatahub_source)
+        - name: aiservice_odh_model_deployment_type
+          value: $(params.aiservice_odh_model_deployment_type)
+
+    # 3.gitops-aiservice
     # -------------------------------------------------------------------------
 
-    - name: gitops-aibroker
+    - name: gitops-aiservice
       taskRef:
-        name: gitops-aibroker
+        name: gitops-aiservice
       runAfter:
         - gitops-odh
       workspaces:
         - name: configs
           workspace: configs
       params:
-        # AIBROKER shared and specific params
+        # aiservice shared and specific params
         - name: cluster_name
           value: $(params.cluster_name)
         - name: account
@@ -25182,40 +25038,26 @@ spec:
           value: $(params.github_repo)
         - name: github_host
           value: $(params.github_host)
-        - name: aibroker_instance_id
-          value: $(params.aibroker_instance_id)
-        - name: aibroker_namespace
-          value: $(params.aibroker_namespace)
-        - name: mas_aibroker_watsonx_secret
-          value: $(params.mas_aibroker_watsonx_secret)
+        - name: aiservice_instance_id
+          value: $(params.aiservice_instance_id)
+        - name: aiservice_namespace
+          value: $(params.aiservice_namespace)
+        - name: aiservice_watsonx_secret
+          value: $(params.aiservice_watsonx_secret)
         - name: pull_secret_name
           value: $(params.pull_secret_name)
-        - name: mas_aibroker_storage_provider
-          value: $(params.mas_aibroker_storage_provider)
-        - name: mas_aibroker_storage_secret
-          value: $(params.mas_aibroker_storage_secret)
-        - name: mas_aibroker_storage_host
-          value: $(params.mas_aibroker_storage_host)
-        - name: mas_aibroker_storage_port
-          value: $(params.mas_aibroker_storage_port)
-        - name: mas_aibroker_storage_ssl
-          value: $(params.mas_aibroker_storage_ssl)
-        - name: mas_aibroker_storage_region
-          value: $(params.mas_aibroker_storage_region)
-        - name: mas_aibroker_storage_pipelines_bucket
-          value: $(params.mas_aibroker_storage_pipelines_bucket)
-        - name: mas_aibroker_storage_tenants_bucket
-          value: $(params.mas_aibroker_storage_tenants_bucket)
-        - name: mas_aibroker_storage_templates_bucket
-          value: $(params.mas_aibroker_storage_templates_bucket)
-        - name: mas_aibroker_mariadb_secret
-          value: $(params.mas_aibroker_mariadb_secret)
+        - name: aiservice_storage_provider
+          value: $(params.aiservice_storage_provider)
+        - name: aiservice_storage_ssl
+          value: $(params.aiservice_storage_ssl)
+        - name: aiservice_storage_region
+          value: $(params.aiservice_storage_region)
         - name: primary_storage_class
           value: $(params.primary_storage_class)
         - name: artifactory_username
           value: $(params.artifactory_username)
-        - name: mas_app_channel
-          value: $(params.mas_app_channel)
+        - name: aiservice_channel
+          value: $(params.aiservice_channel)
         - name: mas_catalog_source
           value: $(params.mas_catalog_source)
         - name: mas_icr_cp
@@ -25230,21 +25072,116 @@ spec:
           value: $(params.is_external_route)
         - name: environment_type
           value: $(params.environment_type)
-        - name: mas_aibroker_s3_endpoint_url
-          value: $(params.mas_aibroker_s3_endpoint_url)
-        - name: mas_aibroker_s3_region
-          value: $(params.mas_aibroker_s3_region)
-        - name: mas_aibroker_s3_bucket_prefix
-          value: $(params.mas_aibroker_s3_bucket_prefix)
-        
+        - name: aiservice_s3_endpoint_url
+          value: $(params.aiservice_s3_endpoint_url)
+        - name: aiservice_s3_bucket_prefix
+          value: $(params.aiservice_s3_bucket_prefix)
+        - name: sls_registration_key_secret
+          value: $(params.sls_registration_key_secret)
+        - name: dro_token_secret
+          value: $(params.dro_token_secret)
+        - name: dro_cacert_secret
+          value: $(params.dro_cacert_secret)
+        - name: aiservice_s3_templates_bucket
+          value: $(params.aiservice_s3_templates_bucket)
+        - name: aiservice_s3_tenants_bucket
+          value: $(params.aiservice_s3_tenants_bucket)
+        - name: aiservice_s3_secret
+          value: $(params.aiservice_s3_secret)
+        - name: jdbc_secret
+          value: $(params.jdbc_secret)
+        - name: use_aws_db2
+          value: $(params.use_aws_db2)# --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-aiservice-tenant-pipeline.yaml
+# --------------------------------------------------------------------------------
+apiVersion: tekton.dev/v1beta1
+kind: Pipeline
+metadata:
+  name: gitops-aiservice-tenant-pipeline
+spec:
+  params:
+    - name: cluster_name
+      type: string
+    - name: account
+      type: string
+    - name: cluster_id
+      type: string
+    - name: cluster_url
+      type: string
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    - name: git_branch
+      type: string
+    - name: github_org
+      type: string
+    - name: github_repo
+      type: string
+    - name: github_host
+      type: string
+    - name: aiservice_namespace
+      type: string
+    - name: aiservice_provision_tenant
+      type: string
+    - name: aiservice_instance_id
+      type: string
+    - name: tenantNamespace
+      type: string
+    - name: tenant_id
+      type: string
+    - name: cluster_domain
+      type: string
+    - name: in_saas_env
+      type: string
+    - name: mas_icr_cp
+      type: string
+    - name: mas_icr_cpopen
+      type: string
+    - name: drocfg_url
+      type: string
+    - name: slscfg_url
+      type: string
+    - name: aiservice_sls_subscription_id
+      type: string
+    - name: aiservice_watsonxai_url
+      type: string
+    - name: aiservice_watsonx_full
+      type: string
+    - name: aiservice_watsonx_instance_id
+      type: string
+    - name: aiservice_watsonx_version
+      type: string
+    - name: aiservice_watsonx_username
+      type: string
+    - name: aiservice_operator_log_level
+      type: string
 
-    # 4.gitops-Kmodel
-    # -------------------------------------------------------------------------
-    - name: gitops-kmodel
+    - name: aiservice_storage_region
+      type: string
+    - name: aiservice_storage_provider
+      type: string
+    - name: aiservice_storage_ssl
+      type: string
+    - name: aiservice_s3_endpoint_url
+      type: string
+    - name: aiservice_s3_bucket_prefix
+      type: string
+    - name: rsl_url
+      type: string
+    - name: tenant_entitlement_type
+      type: string
+    - name: tenant_entitlement_start_date
+      type: string
+    - name: tenant_entitlement_end_date
+      type: string
+
+  workspaces:
+    - name: configs
+  tasks:
+    - name: run-gitops-aiservice-tenant
       taskRef:
-        name: gitops-kmodel
-      runAfter:
-        - gitops-aibroker
+        name: gitops-aiservice-tenant
       workspaces:
         - name: configs
           workspace: configs
@@ -25269,58 +25206,237 @@ spec:
           value: $(params.github_repo)
         - name: github_host
           value: $(params.github_host)
-        - name: aibroker_instance_id
-          value: $(params.aibroker_instance_id)
-        - name: aibroker_internal_tls
-          value: $(params.aibroker_internal_tls)
-        - name: aibroker_namespace
-          value: $(params.aibroker_namespace)
-        - name: pull_secret_name
-          value: $(params.pull_secret_name)
-        - name: mas_aibroker_storage_provider
-          value: $(params.mas_aibroker_storage_provider)
-        - name: mas_aibroker_storage_ssl
-          value: $(params.mas_aibroker_storage_ssl)
-        - name: mas_aibroker_storage_host
-          value: $(params.mas_aibroker_storage_host)
-        - name: mas_aibroker_storage_port
-          value: $(params.mas_aibroker_storage_port)
-        - name: mas_aibroker_storage_region
-          value: $(params.mas_aibroker_storage_region)
-        - name: mas_aibroker_storage_templates_bucket
-          value: $(params.mas_aibroker_storage_templates_bucket)
-        - name: mas_aibroker_storage_tenants_bucket
-          value: $(params.mas_aibroker_storage_tenants_bucket)
-        - name: mas_aibroker_storage_pipelines_bucket
-          value: $(params.mas_aibroker_storage_pipelines_bucket)
-        - name: ssh_secret_name
-          value: $(params.ssh_secret_name)
-        - name: docker_server
-          value: $(params.docker_server)
+        - name: aiservice_namespace
+          value: $(params.aiservice_namespace)
+        - name: aiservice_provision_tenant
+          value: $(params.aiservice_provision_tenant)
+        - name: aiservice_instance_id
+          value: $(params.aiservice_instance_id)
         - name: tenantNamespace
           value: $(params.tenantNamespace)
-        - name: mas_aibroker_provision_tenant
-          value: $(params.mas_aibroker_provision_tenant)
-        - name: primary_storage_class
-          value: $(params.primary_storage_class)
-        - name: image_store
-          value: $(params.image_store)
-        - name: image_watcher
-          value: $(params.image_watcher)
-        - name: image_controller
-          value: $(params.image_controller)
-        - name: mas_aibroker_connector_tag
-          value: $(params.mas_aibroker_connector_tag)
-        - name: mas_aibroker_saas
-          value: $(params.mas_aibroker_saas)
-        - name: model_id_unique_length
-          value: $(params.model_id_unique_length)
-        - name: model_id_prefix
-          value: $(params.model_id_prefix)
-        - name: mas_app_channel
-          value: $(params.mas_app_channel)
+        - name: tenant_id
+          value: $(params.tenant_id)
+        - name: cluster_domain
+          value: $(params.cluster_domain)
+        - name: in_saas_env
+          value: $(params.in_saas_env)
         - name: mas_icr_cp
-          value: $(params.mas_icr_cp)# --------------------------------------------------------------------------------
+          value: $(params.mas_icr_cp)
+        - name: mas_icr_cpopen
+          value: $(params.mas_icr_cpopen)
+        - name: drocfg_url
+          value: $(params.drocfg_url)
+        - name: slscfg_url
+          value: $(params.slscfg_url)
+        - name: aiservice_sls_subscription_id
+          value: $(params.aiservice_sls_subscription_id)
+        - name: aiservice_watsonxai_url
+          value: $(params.aiservice_watsonxai_url)
+        - name: aiservice_watsonx_full
+          value: $(params.aiservice_watsonx_full)
+        - name: aiservice_watsonx_instance_id
+          value: $(params.aiservice_watsonx_instance_id)
+        - name: aiservice_watsonx_version
+          value: $(params.aiservice_watsonx_version)
+        - name: aiservice_watsonx_username
+          value: $(params.aiservice_watsonx_username)
+        - name: aiservice_operator_log_level
+          value: $(params.aiservice_operator_log_level)
+        - name: aiservice_storage_region
+          value: $(params.aiservice_storage_region)
+        - name: aiservice_storage_provider
+          value: $(params.aiservice_storage_provider)
+        - name: aiservice_storage_ssl
+          value: $(params.aiservice_storage_ssl)
+        - name: aiservice_s3_endpoint_url
+          value: $(params.aiservice_s3_endpoint_url)
+        - name: aiservice_s3_bucket_prefix
+          value: $(params.aiservice_s3_bucket_prefix)
+        - name: rsl_url
+          value: $(params.rsl_url)
+        - name: tenant_entitlement_type
+          value: $(params.tenant_entitlement_type)
+        - name: tenant_entitlement_start_date
+          value: $(params.tenant_entitlement_start_date)
+        - name: tenant_entitlement_end_date
+          value: $(params.tenant_entitlement_end_date)
+        # --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-deprovision-aiservice-pipeline.yaml
+# --------------------------------------------------------------------------------
+apiVersion: tekton.dev/v1beta1
+kind: Pipeline
+metadata:
+  name: gitops-deprovision-aiservice-pipeline
+spec:
+  params:
+    - name: cluster_name
+      type: string
+    - name: cluster_id
+      type: string
+    - name: account
+      type: string
+    - name: aiservice_instance_id
+      type: string
+    - name: cluster_url
+      type: string
+      default: ""
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    - name: git_branch
+      type: string
+    - name: github_org
+      type: string
+    - name: github_repo
+      type: string
+    - name: github_host
+      type: string
+  workspaces:
+    - name: configs
+
+  tasks:
+    #1. gitops-deprovision-aiservice
+    # -------------------------------------------------------------------------------------------------------
+    - name: run-gitops-deprovision-aiservice
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-aiservice
+      workspaces:
+        - name: configs
+          workspace: configs
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: account
+          value: $(params.account)
+        - name: cluster_id
+          value: $(params.cluster_id)
+        - name: cluster_url
+          value: $(params.cluster_url)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: git_branch
+          value: $(params.git_branch)
+        - name: github_org
+          value: $(params.github_org)
+        - name: github_repo
+          value: $(params.github_repo)
+        - name: github_host
+          value: $(params.github_host)
+        - name: aiservice_instance_id
+          value: $(params.aiservice_instance_id)
+
+    #2.gitops-deprovision-odh
+    # -------------------------------------------------------------------------
+    - name: run-gitops-deprovision-odh
+      runAfter:
+        - run-gitops-deprovision-aiservice
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-odh
+      workspaces:
+        - name: configs
+          workspace: configs
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: account
+          value: $(params.account)
+        - name: cluster_id
+          value: $(params.cluster_id)
+        - name: cluster_url
+          value: $(params.cluster_url)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: git_branch
+          value: $(params.git_branch)
+        - name: github_org
+          value: $(params.github_org)
+        - name: github_repo
+          value: $(params.github_repo)
+        - name: github_host
+          value: $(params.github_host)
+        - name: aiservice_instance_id
+          value: $(params.aiservice_instance_id)
+
+   # --------------------------------------------------------------------------------
+# /home/runner/work/cli/cli/tekton/target/pipelines/gitops-deprovision-aiservice-tenant-pipeline.yaml
+# --------------------------------------------------------------------------------
+apiVersion: tekton.dev/v1beta1
+kind: Pipeline
+metadata:
+  name: gitops-deprovision-aiservice-tenant-pipeline
+spec:
+  params:
+    - name: cluster_name
+      type: string
+    - name: cluster_id
+      type: string
+    - name: account
+      type: string
+    - name: aiservice_instance_id
+      type: string
+    - name: tenant_id
+      type: string
+    - name: cluster_url
+      type: string
+      default: ""
+    - name: secrets_path
+      type: string
+    - name: avp_aws_secret_region
+      type: string
+    - name: git_branch
+      type: string
+    - name: github_org
+      type: string
+    - name: github_repo
+      type: string
+    - name: github_host
+      type: string
+  workspaces:
+    - name: configs
+  tasks:
+    - name: run-gitops-deprovision-aiservice-tenant
+      taskRef:
+        kind: Task
+        name: gitops-deprovision-aiservice-tenant
+      workspaces:
+        - name: configs
+          workspace: configs
+      params:
+        - name: cluster_name
+          value: $(params.cluster_name)
+        - name: account
+          value: $(params.account)
+        - name: cluster_id
+          value: $(params.cluster_id)
+        - name: cluster_url
+          value: $(params.cluster_url)
+        - name: secrets_path
+          value: $(params.secrets_path)
+        - name: avp_aws_secret_region
+          value: $(params.avp_aws_secret_region)
+        - name: git_branch
+          value: $(params.git_branch)
+        - name: github_org
+          value: $(params.github_org)
+        - name: github_repo
+          value: $(params.github_repo)
+        - name: github_host
+          value: $(params.github_host)
+        - name: aiservice_instance_id
+          value: $(params.aiservice_instance_id)
+        - name: tenant_id
+          value: $(params.tenant_id)
+          
+
+      
+   # --------------------------------------------------------------------------------
 # /home/runner/work/cli/cli/tekton/target/pipelines/gitops-mas-apps.yaml
 # --------------------------------------------------------------------------------
 ---
@@ -30754,6 +30870,9 @@ spec:
     - name: provisioner_csb_ca_certificate_file
       type: string
       default: ''
+    - name: provisioner_recommend_cluster
+      type: string
+      default: 'false'
 
   tasks:
     - name: gitops-cluster
@@ -31061,6 +31180,8 @@ spec:
           value: $(params.provisioner_enable_pd_alert)
         - name: csb_ca_certificate_file
           value: $(params.provisioner_csb_ca_certificate_file)
+        - name: recommend_cluster
+          value: $(params.provisioner_recommend_cluster)
       taskRef:
         kind: Task
         name: gitops-mas-provisioner
@@ -33616,36 +33737,6 @@ spec:
       runAfter:
         - kyverno-assist
 
-    - name: imagescan-assist
-      timeout: "0"
-      taskRef:
-        kind: Task
-        name: mas-ivt-core
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_digest
-          value: $(params.ivt_digest_core)
-
-        - name: product_id
-          value: ibm-mas-assist
-        - name: product_channel
-          value: $(params.mas_app_channel_assist)
-        - name: fvt_test_suite
-          value: imagescan
-      when:
-        - input: "$(params.ivt_digest_core)"
-          operator: notin
-          values: [""]
-
-
     # 2. Prepare data for Python and Desktop suites
     # -----------------------------------------------------------------------------
     - name: fvt-assist-preparedata
@@ -33941,7 +34032,7 @@ spec:
         - input: "$(params.ivt_digest_core)"
           operator: notin
           values: [""]
-    
+
     - name: kyverno-dependencies
       timeout: "0"
       taskRef:
@@ -34004,35 +34095,6 @@ spec:
       runAfter:
         - kyverno-dependencies
 
-    - name: imagescan
-      timeout: "0"
-      taskRef:
-        kind: Task
-        name: mas-ivt-core
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_digest
-          value: $(params.ivt_digest_core)
-
-        - name: product_id
-          value: ibm-mas
-        - name: product_channel
-          value: $(params.mas_channel)
-        - name: fvt_test_suite
-          value: imagescan
-      when:
-        - input: "$(params.ivt_digest_core)"
-          operator: notin
-          values: [""]
-
     # Phase 1
     # -------------------------------------------------------------------------
     # Only suites that take less than 5 minutes
@@ -35534,35 +35596,6 @@ spec:
         - name: pod-templates
           workspace: shared-pod-templates
 
-    - name: imagescan-iot
-      timeout: "0"
-      taskRef:
-        kind: Task
-        name: mas-ivt-core
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_digest
-          value: $(params.ivt_digest_core)
-
-        - name: product_id
-          value: ibm-mas-iot
-        - name: product_channel
-          value: $(params.mas_app_channel_iot)
-        - name: fvt_test_suite
-          value: imagescan
-      when:
-        - input: "$(params.ivt_digest_core)"
-          operator: notin
-          values: [""]
-
     # 2. IoT FVT
     # -----------------------------------------------------------------------------
     - name: fvt-iot
@@ -39210,35 +39243,6 @@ spec:
         - name: pod-templates
           workspace: shared-pod-templates
 
-    - name: imagescan-manage
-      timeout: "0"
-      taskRef:
-        kind: Task
-        name: mas-ivt-core
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_digest
-          value: $(params.ivt_digest_core)
-
-        - name: product_id
-          value: ibm-mas-manage
-        - name: product_channel
-          value: $(params.mas_app_channel_manage)
-        - name: fvt_test_suite
-          value: imagescan
-      when:
-        - input: "$(params.ivt_digest_core)"
-          operator: notin
-          values: [""]
-
     # 2. Manage FVT - Manage
     # -------------------------------------------------------------------------
     
@@ -41423,35 +41427,6 @@ spec:
           operator: notin
           values: [""]
 
-    - name: imagescan-monitor
-      timeout: "0"
-      taskRef:
-        kind: Task
-        name: mas-ivt-core
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_digest
-          value: $(params.ivt_digest_core)
-
-        - name: product_id
-          value: ibm-mas-monitor
-        - name: product_channel
-          value: $(params.mas_app_channel_monitor)
-        - name: fvt_test_suite
-          value: imagescan
-      when:
-        - input: "$(params.ivt_digest_core)"
-          operator: notin
-          values: [""]
-
     # 2. Monitor FVT (with or without Manage Integration)
     # -----------------------------------------------------------------------------
     # When Manage is installed in the cluster, many Monitor APIs are disabled, this
@@ -41688,35 +41663,6 @@ spec:
           operator: notin
           values: [""]
 
-    - name: imagescan-optimizer
-      timeout: "0"
-      taskRef:
-        kind: Task
-        name: mas-ivt-core
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_digest
-          value: $(params.ivt_digest_core)
-
-        - name: product_id
-          value: ibm-mas-optimizer
-        - name: product_channel
-          value: $(params.mas_app_channel_optimizer)
-        - name: fvt_test_suite
-          value: imagescan
-      when:
-        - input: "$(params.ivt_digest_core)"
-          operator: notin
-          values: [""]
-
     # 2. Run "cypress/optimizer/e2e/ui/bvt/MOAdmin.cy.js"
     # -----------------------------------------------------------------------------
     - name: moadmin
@@ -41755,7 +41701,7 @@ spec:
           operator: notin
           values: [""]
       runAfter:
-        - imagescan-optimizer
+        - ivtcore-optimizer
       workspaces:
         - name: configs
           workspace: shared-configs
@@ -42456,35 +42402,6 @@ spec:
           operator: notin
           values: [""]
 
-    - name: imagescan-predict
-      timeout: "0"
-      taskRef:
-        kind: Task
-        name: mas-ivt-core
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_digest
-          value: $(params.ivt_digest_core)
-
-        - name: product_id
-          value: ibm-mas-predict
-        - name: product_channel
-          value: $(params.mas_app_channel_predict)
-        - name: fvt_test_suite
-          value: imagescan
-      when:
-        - input: "$(params.ivt_digest_core)"
-          operator: notin
-          values: [""]
-
     # 2. Prepare data for Python and Desktop suites
     # -----------------------------------------------------------------------------
     - name: fvt-predict
@@ -42764,35 +42681,6 @@ spec:
           operator: notin
           values: [""]
 
-    - name: imagescan-visualinspection
-      timeout: "0"
-      taskRef:
-        kind: Task
-        name: mas-ivt-core
-      workspaces:
-        - name: configs
-          workspace: shared-configs
-      params:
-        - name: mas_instance_id
-          value: $(params.mas_instance_id)
-        - name: mas_workspace_id
-          value: $(params.mas_workspace_id)
-        - name: fvt_image_registry
-          value: $(params.fvt_image_registry)
-        - name: fvt_image_digest
-          value: $(params.ivt_digest_core)
-
-        - name: product_id
-          value: ibm-mas-visualinspection
-        - name: product_channel
-          value: $(params.mas_app_channel_visualinspection)
-        - name: fvt_test_suite
-          value: imagescan
-      when:
-        - input: "$(params.ivt_digest_core)"
-          operator: notin
-          values: [""]
-
     # 2. Prepare data for Python and Desktop suites
     # -----------------------------------------------------------------------------
     - name: fvt-visualinspection