diff --git a/src/mas/devops/templates/pipelinerun-install.yml.j2 b/src/mas/devops/templates/pipelinerun-install.yml.j2
index 1c4797f7..c7b058cb 100644
--- a/src/mas/devops/templates/pipelinerun-install.yml.j2
+++ b/src/mas/devops/templates/pipelinerun-install.yml.j2
@@ -226,6 +226,10 @@ spec:
       value: "{{ kafka_namespace }}"
     - name: kafka_version
       value: "{{ kafka_version }}"
+    - name: kafka_storage_class
+      value: "{{ kafka_storage_class }}"
+    - name: zookeeper_storage_class
+      value: "{{ zookeeper_storage_class }}"
   {%- if kafka_provider == "aws" %}
 
     # Dependencies - AWS MSK
@@ -732,6 +736,8 @@ spec:
       value: "{{ grafana_v5_namespace }}"
     - name: grafana_instance_storage_size
       value: "{{ grafana_instance_storage_size }}"
+    - name: grafana_instance_storage_class
+      value: "{{ grafana_instance_storage_class }}"
 {%- endif %}
 {%- if mas_app_channel_facilities is defined and mas_app_channel_facilities != "" %}