diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2
index d2a7fcc4..a93a0cff 100644
--- a/src/mas/devops/templates/pipelinerun-install.yml.j2
+++ b/src/mas/devops/templates/pipelinerun-install.yml.j2
@@ -682,6 +682,98 @@ spec:
     - name: grafana_instance_storage_size
       value: "{{ grafana_instance_storage_size }}"
 {%- endif %}
+{%- if install_aibroker is defined and install_aibroker != "" %}
+
+    # AI Broker
+    # -------------------------------------------------------------------------
+    - name: install_aibroker
+      value: "{{ install_aibroker }}"
+    - name: mas_aibroker_channel
+      value: "{{ mas_aibroker_channel }}"
+{%- endif %}
+{%- if mas_aibroker_storage_provider is defined and mas_aibroker_storage_provider != "" %}
+    
+    # AI Broker - OpenData Hub Storage
+    # -------------------------------------------------------------------------
+    - name: mas_aibroker_storage_provider
+      value: "{{ mas_aibroker_storage_provider }}"
+    - name: mas_aibroker_storage_accesskey
+      value: "{{ mas_aibroker_storage_accesskey }}"
+    - name: mas_aibroker_storage_secretkey
+      value: "{{ mas_aibroker_storage_secretkey }}"
+    - name: mas_aibroker_storage_host
+      value: "{{ mas_aibroker_storage_host }}"
+    - name: mas_aibroker_storage_port
+      value: "{{ mas_aibroker_storage_port }}"
+    - name: mas_aibroker_storage_ssl
+      value: "{{ mas_aibroker_storage_ssl }}"
+    - name: mas_aibroker_storage_region
+      value: "{{ mas_aibroker_storage_region }}"
+    - name: mas_aibroker_storage_pipelines_bucket
+      value: "{{ mas_aibroker_storage_pipelines_bucket }}"
+    - name: mas_aibroker_storage_tenants_bucket
+      value: "{{ mas_aibroker_storage_tenants_bucket }}"
+    - name: mas_aibroker_storage_templates_bucket
+      value: "{{ mas_aibroker_storage_templates_bucket }}"     
+    - name: mas_aibroker_tenant_name
+      value: "{{ mas_aibroker_tenant_name }}"
+{%- endif %}
+{%- if mas_aibroker_controller_tag is defined and mas_aibroker_controller_tag != "" %}
+
+    # AI Broker - KModels Tags
+    # -------------------------------------------------------------------------
+    - name: mas_aibroker_controller_tag
+      value: "{{ mas_aibroker_controller_tag }}"
+    - name: mas_aibroker_store_tag
+      value: "{{ mas_aibroker_store_tag }}"
+    - name: mas_aibroker_watcher_tag
+      value: "{{ mas_aibroker_watcher_tag }}"
+    - name: mas_aibroker_connector_tag
+      value: "{{ mas_aibroker_connector_tag }}"
+    - name: mas_aibroker_pipeline_steps_tag
+      value: "{{ mas_aibroker_pipeline_steps_tag }}"
+{%- endif %}
+{%- if mas_aibroker_watsonxai_apikey is defined and mas_aibroker_watsonxai_apikey != "" %}
+
+    # AI Broker - watsonX
+    # -------------------------------------------------------------------------
+    - name: mas_aibroker_watsonxai_apikey
+      value: "{{ mas_aibroker_watsonxai_apikey }}"
+    - name: mas_aibroker_watsonxai_url
+      value: "{{ mas_aibroker_watsonxai_url }}"
+    - name: mas_aibroker_watsonxai_project_id
+      value: "{{ mas_aibroker_watsonxai_project_id }}"
+    - name: mas_aibroker_watsonx_action
+      value: "{{ mas_aibroker_watsonx_action }}"
+{%- endif %}
+{%- if mas_aibroker_s3_action is defined and mas_aibroker_s3_action != "" %}
+
+    # AI Broker - S3
+    # -------------------------------------------------------------------------  
+    - name: mas_aibroker_s3_action
+      value: "{{ mas_aibroker_s3_action }}"
+    - name: mas_aibroker_apikey_action
+      value: "{{ mas_aibroker_apikey_action }}"
+{%- endif %}
+{%- if mas_aibroker_db_host is defined and mas_aibroker_db_host != "" %}
+
+    # AI Broker - Database (DataSciencePipelinesApplication)
+    # -------------------------------------------------------------------------
+    - name: mas_aibroker_db_host
+      value: "{{ mas_aibroker_db_host }}"
+    - name: mas_aibroker_db_port
+      value: "{{ mas_aibroker_db_port }}"
+    - name: mas_aibroker_db_user
+      value: "{{ mas_aibroker_db_user }}"
+    - name: mas_aibroker_db_database
+      value: "{{ mas_aibroker_db_database }}"
+    - name: mas_aibroker_db_secret_name
+      value: "{{ mas_aibroker_db_secret_name }}"
+    - name: mas_aibroker_db_secret_key
+      value: "{{ mas_aibroker_db_secret_key }}"
+    - name: mas_aibroker_db_secret_value
+      value: "{{ mas_aibroker_db_secret_value }}"
+{%- endif %}
 
   workspaces:
     # The generated configuration files