diff --git a/config/monitoring/grafana-dashboards/grafana-dashboard-component-onboarding.json b/config/monitoring/grafana-dashboards/grafana-dashboard-component-onboarding.json
new file mode 100644
index 00000000..bdb262ab
--- /dev/null
+++ b/config/monitoring/grafana-dashboards/grafana-dashboard-component-onboarding.json
@@ -0,0 +1,332 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 13,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 5,
+        "x": 0,
+        "y": 0
+      },
+      "id": 6,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "9.1.6",
+      "targets": [
+        {
+          "editorMode": "builder",
+          "exemplar": false,
+          "expr": "redhat_appstudio_buildservice_component_onboarding_time_count",
+          "format": "table",
+          "instant": true,
+          "legendFormat": "__auto",
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Initial simple builds or initial PaC provisions total count",
+      "type": "stat"
+    },
+    {
+      "description": "Each bar shows how many initial simple build pipeline runs or initial PaC provisions were prepared in the time range. For example, \"15\" bar shows the number of initial simple build pipeline runs or initial PaC provisions that took from 10 to 15 seconds.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 12,
+        "x": 5,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "displayMode": "gradient",
+        "minVizHeight": 10,
+        "minVizWidth": 0,
+        "orientation": "vertical",
+        "reduceOptions": {
+          "calcs": [
+            "last"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": false
+      },
+      "pluginVersion": "9.1.6",
+      "targets": [
+        {
+          "editorMode": "builder",
+          "exemplar": false,
+          "expr": "redhat_appstudio_buildservice_component_onboarding_time_bucket",
+          "format": "heatmap",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "{{le}}",
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Initial simple build or initial PaC provisions time distribution",
+      "type": "bargauge"
+    },
+    {
+      "description": "Shows increase of initial simple builds or PaC provisions in each time category over time",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 17,
+        "x": 0,
+        "y": 11
+      },
+      "id": 8,
+      "maxDataPoints": 25,
+      "options": {
+        "calculate": false,
+        "calculation": {
+          "xBuckets": {
+            "mode": "size"
+          },
+          "yBuckets": {
+            "mode": "size",
+            "scale": {
+              "type": "linear"
+            }
+          }
+        },
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "reverse": false,
+          "scale": "exponential",
+          "scheme": "YlOrRd",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "rowsFrame": {
+          "layout": "auto"
+        },
+        "tooltip": {
+          "show": true,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "left",
+          "reverse": false,
+          "unit": "none"
+        }
+      },
+      "pluginVersion": "9.1.6",
+      "targets": [
+        {
+          "editorMode": "code",
+          "expr": "sum(increase(redhat_appstudio_buildservice_component_onboarding_time_bucket[$__interval])) by (le)",
+          "format": "heatmap",
+          "interval": "",
+          "legendFormat": "{{le}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Increase of initial simple builds or initial PaC provisions on timeline",
+      "type": "heatmap"
+    },
+    {
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 17,
+        "x": 0,
+        "y": 23
+      },
+      "id": 9,
+      "maxDataPoints": 25,
+      "options": {
+        "calculate": false,
+        "calculation": {
+          "xBuckets": {
+            "mode": "size"
+          },
+          "yBuckets": {
+            "mode": "size",
+            "scale": {
+              "type": "linear"
+            }
+          }
+        },
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "reverse": false,
+          "scale": "exponential",
+          "scheme": "YlOrRd",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "rowsFrame": {
+          "layout": "auto"
+        },
+        "tooltip": {
+          "show": false,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "hidden",
+          "reverse": false,
+          "unit": "none"
+        }
+      },
+      "pluginVersion": "9.1.6",
+      "targets": [
+        {
+          "editorMode": "code",
+          "expr": "rate(redhat_appstudio_buildservice_component_onboarding_time_sum[$__rate_interval])/rate(redhat_appstudio_buildservice_component_onboarding_time_count[$__rate_interval])",
+          "format": "heatmap",
+          "interval": "",
+          "legendFormat": "{{le}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Initial sipmle builds or initial PaC provisions average time on timeline",
+      "type": "heatmap"
+    }
+  ],
+  "schemaVersion": 37,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-24h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Component creation (initial simple build or PaC provision)",
+  "weekStart": ""
+}
diff --git a/config/monitoring/grafana-dashboards/grafana-dashboard-initial-build-pipeline.json b/config/monitoring/grafana-dashboards/grafana-dashboard-pac-unprovision.json
similarity index 85%
rename from config/monitoring/grafana-dashboards/grafana-dashboard-initial-build-pipeline.json
rename to config/monitoring/grafana-dashboards/grafana-dashboard-pac-unprovision.json
index 00ef38ed..75dc566b 100644
--- a/config/monitoring/grafana-dashboards/grafana-dashboard-initial-build-pipeline.json
+++ b/config/monitoring/grafana-dashboards/grafana-dashboard-pac-unprovision.json
@@ -73,7 +73,7 @@
         {
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "redhat_appstudio_buildservice_initial_build_pipeline_creation_time_count",
+          "expr": "redhat_appstudio_buildservice_PaC_unconfiguration_time_count",
           "format": "table",
           "instant": true,
           "legendFormat": "__auto",
@@ -81,11 +81,11 @@
           "refId": "A"
         }
       ],
-      "title": "Initial builds total count",
+      "title": "Pipelines as Code unprovisions total count",
       "type": "stat"
     },
     {
-      "description": "Each bar shows how many pipeline runs were prepared in the time range. For example, \"15\" bar shows the number of initial build pipeline runs preparations that took from 10 to 15 seconds.",
+      "description": "Each bar shows how many repositories were unprovisioned in the time range. For example, \"15\" bar shows the number of git repository unprovisions that took from 10 to 15 seconds.",
       "fieldConfig": {
         "defaults": {
           "color": {
@@ -131,7 +131,7 @@
         {
           "editorMode": "builder",
           "exemplar": false,
-          "expr": "redhat_appstudio_buildservice_initial_build_pipeline_creation_time_bucket",
+          "expr": "redhat_appstudio_buildservice_PaC_unconfiguration_time_bucket",
           "format": "heatmap",
           "hide": false,
           "instant": true,
@@ -141,11 +141,11 @@
           "refId": "A"
         }
       ],
-      "title": "Initial build submission time distribution",
+      "title": "Pipelines as Code unprovisions time distribution",
       "type": "bargauge"
     },
     {
-      "description": "Shows increase of initial build pipeline runs in each time category over time",
+      "description": "Shows increase of Pipelines as Code unprovisions in each time category over time",
       "fieldConfig": {
         "defaults": {
           "custom": {
@@ -218,7 +218,7 @@
       "targets": [
         {
           "editorMode": "code",
-          "expr": "sum(increase(redhat_appstudio_buildservice_initial_build_pipeline_creation_time_bucket[$__interval])) by (le)",
+          "expr": "sum(increase(redhat_appstudio_buildservice_PaC_unconfiguration_time_bucket[$__interval])) by (le)",
           "format": "heatmap",
           "interval": "",
           "legendFormat": "{{le}}",
@@ -226,7 +226,7 @@
           "refId": "A"
         }
       ],
-      "title": "Increase of initial builds on timeline",
+      "title": "Increase of Pipelines as Code unprovisions on timeline",
       "type": "heatmap"
     },
     {
@@ -303,7 +303,7 @@
       "targets": [
         {
           "editorMode": "code",
-          "expr": "rate(redhat_appstudio_buildservice_initial_build_pipeline_creation_time_sum[$__rate_interval])/rate(redhat_appstudio_buildservice_initial_build_pipeline_creation_time_count[$__rate_interval])",
+          "expr": "rate(redhat_appstudio_buildservice_PaC_unconfiguration_time_sum[$__rate_interval])/rate(redhat_appstudio_buildservice_PaC_unconfiguration_time_count[$__rate_interval])",
           "format": "heatmap",
           "interval": "",
           "legendFormat": "{{le}}",
@@ -311,7 +311,7 @@
           "refId": "A"
         }
       ],
-      "title": "Initial build pipeline run submission average time on timeline",
+      "title": "Pipelines as Code unprovisions average time on timeline",
       "type": "heatmap"
     }
   ],
@@ -327,8 +327,6 @@
   },
   "timepicker": {},
   "timezone": "",
-  "title": "Component Onboarding (initial build)",
-  "uid": "Y82Gzro4k",
-  "version": 13,
+  "title": "Component Offboarding (Pipelines-as-Code)",
   "weekStart": ""
 }
diff --git a/config/monitoring/grafana-dashboards/grafana-dashboard-push-pipeline-rebuild-trigger.json b/config/monitoring/grafana-dashboards/grafana-dashboard-push-pipeline-rebuild-trigger.json
new file mode 100644
index 00000000..7dac774c
--- /dev/null
+++ b/config/monitoring/grafana-dashboards/grafana-dashboard-push-pipeline-rebuild-trigger.json
@@ -0,0 +1,332 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 13,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 5,
+        "x": 0,
+        "y": 0
+      },
+      "id": 6,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "9.1.6",
+      "targets": [
+        {
+          "editorMode": "builder",
+          "exemplar": false,
+          "expr": "redhat_appstudio_buildservice_Push_pipeline_rebuild_trigger_time_count",
+          "format": "table",
+          "instant": true,
+          "legendFormat": "__auto",
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Triggered push pipeline rebuilds total count",
+      "type": "stat"
+    },
+    {
+      "description": "Each bar shows how many push pipeline rebuilds were triggered in the time range. For example, \"15\" bar shows the number of triggered push pipeline rebuilds that took from 10 to 15 seconds.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 12,
+        "x": 5,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "displayMode": "gradient",
+        "minVizHeight": 10,
+        "minVizWidth": 0,
+        "orientation": "vertical",
+        "reduceOptions": {
+          "calcs": [
+            "last"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": false
+      },
+      "pluginVersion": "9.1.6",
+      "targets": [
+        {
+          "editorMode": "builder",
+          "exemplar": false,
+          "expr": "redhat_appstudio_buildservice_Push_pipeline_rebuild_trigger_time_bucket",
+          "format": "heatmap",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "{{le}}",
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Push pipeline rebuild triggered time distribution",
+      "type": "bargauge"
+    },
+    {
+      "description": "Shows increase of triggered push pipeline rebuilds in each time category over time",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 17,
+        "x": 0,
+        "y": 11
+      },
+      "id": 8,
+      "maxDataPoints": 25,
+      "options": {
+        "calculate": false,
+        "calculation": {
+          "xBuckets": {
+            "mode": "size"
+          },
+          "yBuckets": {
+            "mode": "size",
+            "scale": {
+              "type": "linear"
+            }
+          }
+        },
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "reverse": false,
+          "scale": "exponential",
+          "scheme": "YlOrRd",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "rowsFrame": {
+          "layout": "auto"
+        },
+        "tooltip": {
+          "show": true,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "left",
+          "reverse": false,
+          "unit": "none"
+        }
+      },
+      "pluginVersion": "9.1.6",
+      "targets": [
+        {
+          "editorMode": "code",
+          "expr": "sum(increase(redhat_appstudio_buildservice_Push_pipeline_rebuild_trigger_time_bucket[$__interval])) by (le)",
+          "format": "heatmap",
+          "interval": "",
+          "legendFormat": "{{le}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Increase of triggered push pipeline rebuilds on timeline",
+      "type": "heatmap"
+    },
+    {
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 17,
+        "x": 0,
+        "y": 23
+      },
+      "id": 9,
+      "maxDataPoints": 25,
+      "options": {
+        "calculate": false,
+        "calculation": {
+          "xBuckets": {
+            "mode": "size"
+          },
+          "yBuckets": {
+            "mode": "size",
+            "scale": {
+              "type": "linear"
+            }
+          }
+        },
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "reverse": false,
+          "scale": "exponential",
+          "scheme": "YlOrRd",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "rowsFrame": {
+          "layout": "auto"
+        },
+        "tooltip": {
+          "show": false,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "hidden",
+          "reverse": false,
+          "unit": "none"
+        }
+      },
+      "pluginVersion": "9.1.6",
+      "targets": [
+        {
+          "editorMode": "code",
+          "expr": "rate(redhat_appstudio_buildservice_Push_pipeline_rebuild_trigger_time_sum[$__rate_interval])/rate(redhat_appstudio_buildservice_Push_pipeline_rebuild_trigger_time_count[$__rate_interval])",
+          "format": "heatmap",
+          "interval": "",
+          "legendFormat": "{{le}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Triggered push pipeline rebuild average time on timeline",
+      "type": "heatmap"
+    }
+  ],
+  "schemaVersion": 37,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-24h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Component Building (Push pipeline rebuild manually triggered)",
+  "weekStart": ""
+}
diff --git a/config/monitoring/grafana-dashboards/grafana-dashboard-simple-build-pipeline.json b/config/monitoring/grafana-dashboards/grafana-dashboard-simple-build-pipeline.json
new file mode 100644
index 00000000..5c4819b5
--- /dev/null
+++ b/config/monitoring/grafana-dashboards/grafana-dashboard-simple-build-pipeline.json
@@ -0,0 +1,332 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": {
+          "type": "grafana",
+          "uid": "-- Grafana --"
+        },
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "target": {
+          "limit": 100,
+          "matchAny": false,
+          "tags": [],
+          "type": "dashboard"
+        },
+        "type": "dashboard"
+      }
+    ]
+  },
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "graphTooltip": 0,
+  "id": 13,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 6,
+        "w": 5,
+        "x": 0,
+        "y": 0
+      },
+      "id": 6,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "textMode": "auto"
+      },
+      "pluginVersion": "9.1.6",
+      "targets": [
+        {
+          "editorMode": "builder",
+          "exemplar": false,
+          "expr": "redhat_appstudio_buildservice_simple_build_pipeline_creation_time_count",
+          "format": "table",
+          "instant": true,
+          "legendFormat": "__auto",
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Simple builds total count",
+      "type": "stat"
+    },
+    {
+      "description": "Each bar shows how many simple build pipeline runs were prepared in the time range. For example, \"15\" bar shows the number of simple build pipeline runs preparations that took from 10 to 15 seconds.",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              }
+            ]
+          },
+          "unit": "none"
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 11,
+        "w": 12,
+        "x": 5,
+        "y": 0
+      },
+      "id": 2,
+      "options": {
+        "displayMode": "gradient",
+        "minVizHeight": 10,
+        "minVizWidth": 0,
+        "orientation": "vertical",
+        "reduceOptions": {
+          "calcs": [
+            "last"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showUnfilled": false
+      },
+      "pluginVersion": "9.1.6",
+      "targets": [
+        {
+          "editorMode": "builder",
+          "exemplar": false,
+          "expr": "redhat_appstudio_buildservice_simple_build_pipeline_creation_time_bucket",
+          "format": "heatmap",
+          "hide": false,
+          "instant": true,
+          "interval": "",
+          "legendFormat": "{{le}}",
+          "range": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Simple build submission time distribution",
+      "type": "bargauge"
+    },
+    {
+      "description": "Shows increase of simple build pipeline runs in each time category over time",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 12,
+        "w": 17,
+        "x": 0,
+        "y": 11
+      },
+      "id": 8,
+      "maxDataPoints": 25,
+      "options": {
+        "calculate": false,
+        "calculation": {
+          "xBuckets": {
+            "mode": "size"
+          },
+          "yBuckets": {
+            "mode": "size",
+            "scale": {
+              "type": "linear"
+            }
+          }
+        },
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "reverse": false,
+          "scale": "exponential",
+          "scheme": "YlOrRd",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "rowsFrame": {
+          "layout": "auto"
+        },
+        "tooltip": {
+          "show": true,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "left",
+          "reverse": false,
+          "unit": "none"
+        }
+      },
+      "pluginVersion": "9.1.6",
+      "targets": [
+        {
+          "editorMode": "code",
+          "expr": "sum(increase(redhat_appstudio_buildservice_simple_build_pipeline_creation_time_bucket[$__interval])) by (le)",
+          "format": "heatmap",
+          "interval": "",
+          "legendFormat": "{{le}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Increase of simple builds on timeline",
+      "type": "heatmap"
+    },
+    {
+      "description": "",
+      "fieldConfig": {
+        "defaults": {
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "scaleDistribution": {
+              "type": "linear"
+            }
+          }
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 17,
+        "x": 0,
+        "y": 23
+      },
+      "id": 9,
+      "maxDataPoints": 25,
+      "options": {
+        "calculate": false,
+        "calculation": {
+          "xBuckets": {
+            "mode": "size"
+          },
+          "yBuckets": {
+            "mode": "size",
+            "scale": {
+              "type": "linear"
+            }
+          }
+        },
+        "cellGap": 1,
+        "color": {
+          "exponent": 0.5,
+          "fill": "dark-orange",
+          "mode": "scheme",
+          "reverse": false,
+          "scale": "exponential",
+          "scheme": "YlOrRd",
+          "steps": 64
+        },
+        "exemplars": {
+          "color": "rgba(255,0,255,0.7)"
+        },
+        "filterValues": {
+          "le": 1e-9
+        },
+        "legend": {
+          "show": true
+        },
+        "rowsFrame": {
+          "layout": "auto"
+        },
+        "tooltip": {
+          "show": false,
+          "yHistogram": false
+        },
+        "yAxis": {
+          "axisPlacement": "hidden",
+          "reverse": false,
+          "unit": "none"
+        }
+      },
+      "pluginVersion": "9.1.6",
+      "targets": [
+        {
+          "editorMode": "code",
+          "expr": "rate(redhat_appstudio_buildservice_simple_build_pipeline_creation_time_sum[$__rate_interval])/rate(redhat_appstudio_buildservice_simple_build_pipeline_creation_time_count[$__rate_interval])",
+          "format": "heatmap",
+          "interval": "",
+          "legendFormat": "{{le}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Simple build pipeline run submission average time on timeline",
+      "type": "heatmap"
+    }
+  ],
+  "schemaVersion": 37,
+  "style": "dark",
+  "tags": [],
+  "templating": {
+    "list": []
+  },
+  "time": {
+    "from": "now-24h",
+    "to": "now"
+  },
+  "timepicker": {},
+  "timezone": "",
+  "title": "Component Building (simple build)",
+  "weekStart": ""
+}
diff --git a/config/monitoring/grafana-dashboards/kustomization.yaml b/config/monitoring/grafana-dashboards/kustomization.yaml
index 506a41e6..1e9a5368 100644
--- a/config/monitoring/grafana-dashboards/kustomization.yaml
+++ b/config/monitoring/grafana-dashboards/kustomization.yaml
@@ -9,9 +9,18 @@ generatorOptions:
 
 
 configMapGenerator:
-  - name: grafana-dashboard-initial-build-pipeline
+  - name: grafana-dashboard-component-onboarding
     files:
-      - grafana-dashboard-initial-build-pipeline.json
+      - grafana-dashboard-component-onboarding.json
   - name: grafana-dashboard-pac-provision
     files:
       - grafana-dashboard-pac-provision.json
+  - name: grafana-dashboard-pac-unprovision
+    files:
+      - grafana-dashboard-pac-unprovision.json
+  - name: grafana-dashboard-push-pipeline-rebuild-trigger
+    files:
+      - grafana-dashboard-push-pipeline-rebuild-trigger.json
+  - name: grafana-dashboard-simple-build-pipeline
+    files:
+      - grafana-dashboard-simple-build-pipeline.json