diff --git a/kubernetes/helm/openslice/files/observability/README.md b/kubernetes/helm/openslice/files/observability/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..b268ff6ed6eb7541ef09077a4c242f92a2c98ada
--- /dev/null
+++ b/kubernetes/helm/openslice/files/observability/README.md
@@ -0,0 +1,24 @@
+# Openslice Pod Metrics and Logs Dashboard (Grafana)
+
+A dashboard to visualize Kubernetes pod metrics and logs.
+
+## Prerequisites
+
+- **Grafana**  
+  A running Grafana instance (v7.0+ recommended).  
+- **Prometheus data source**  
+  - Must be added in Grafana and scraping your cluster’s metrics (e.g. via kube-prometheus or another Prometheus setup).  
+- **Loki data source** 
+  - Must be added in Grafana to include pod logs alongside metrics.  
+- **Kubernetes metrics exposure**  
+  - Metrics-server or Prometheus exporters installed so that Prometheus can scrape pod-level metrics.  
+
+## Import Dashboard from JSON
+
+1. In your Grafana UI, click **“Import”**.  
+2. Under **“Upload JSON file”**, select  
+   `kubernetes/helm/openslice/files/observability/grafana_osl_dashboard.json`.  
+3. Choose your **Prometheus** data source.  
+4. Choose your **Loki** data source.  
+5. Click **“Import”**.
+6. In the **“namespace”** variable dropdown, select `openslice`.  
diff --git a/kubernetes/helm/openslice/files/observability/grafana_osl_dashboard.json b/kubernetes/helm/openslice/files/observability/grafana_osl_dashboard.json
new file mode 100644
index 0000000000000000000000000000000000000000..9ec89e3c5bdb8ed366ddfece3d41517037a82719
--- /dev/null
+++ b/kubernetes/helm/openslice/files/observability/grafana_osl_dashboard.json
@@ -0,0 +1,1429 @@
+{
+  "annotations": {
+    "list": [
+      {
+        "builtIn": 1,
+        "datasource": "${DS_PROMETHEUS}",
+        "enable": true,
+        "hide": true,
+        "iconColor": "rgba(0, 211, 255, 1)",
+        "name": "Annotations & Alerts",
+        "type": "dashboard"
+      }
+    ]
+  },
+  "description": "Combined Prometheus + Loki dashboard for pods",
+  "editable": true,
+  "fiscalYearStartMonth": 0,
+  "gnetId": 14350,
+  "graphTooltip": 0,
+  "id": 3,
+  "links": [],
+  "liveNow": false,
+  "panels": [
+    {
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 10,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": false,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "cpu",
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 24,
+        "x": 0,
+        "y": 0
+      },
+      "id": 1,
+      "options": {
+        "legend": {
+          "calcs": [
+            "mean",
+            "lastNotNull",
+            "max"
+          ],
+          "displayMode": "list",
+          "placement": "bottom",
+          "showLegend": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "none"
+        }
+      },
+      "pluginVersion": "10.3.3",
+      "targets": [
+        {
+          "datasource": "${DS_PROMETHEUS}",
+          "expr": "sum(irate(container_cpu_usage_seconds_total{pod=~\"$pod\",namespace=\"$namespace\",image!=\"\",container!=\"POD\"}[2m]))",
+          "format": "time_series",
+          "refId": "A"
+        }
+      ],
+      "title": "CPU sum",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_LOKI}",
+      "description": "Total  Count of log lines in the specified time range",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "match": "null",
+                "result": {
+                  "color": "rgb(31, 255, 7)",
+                  "text": "0"
+                }
+              },
+              "type": "special"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "rgb(31, 255, 7)",
+                "value": null
+              },
+              {
+                "color": "rgb(31, 255, 7)",
+                "value": 10
+              },
+              {
+                "color": "rgb(31, 255, 7)",
+                "value": 50
+              }
+            ]
+          },
+          "unit": "short",
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 12,
+        "x": 0,
+        "y": 9
+      },
+      "id": 11,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "sum"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.3",
+      "targets": [
+        {
+          "datasource": "${DS_LOKI}",
+          "expr": "sum(count_over_time(({namespace=\"$namespace\", pod=~\"$pod\"})[$__interval]))",
+          "hide": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Total  Count of logs",
+      "type": "stat"
+    },
+    {
+      "datasource": "${DS_LOKI}",
+      "description": "Total Count: of $searchable_pattern in the specified time range",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "thresholds"
+          },
+          "mappings": [
+            {
+              "options": {
+                "match": "null",
+                "result": {
+                  "text": "0"
+                }
+              },
+              "type": "special"
+            }
+          ],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green",
+                "value": null
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "short",
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 3,
+        "w": 12,
+        "x": 12,
+        "y": 9
+      },
+      "id": 6,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "colorMode": "value",
+        "graphMode": "area",
+        "justifyMode": "auto",
+        "orientation": "horizontal",
+        "reduceOptions": {
+          "calcs": [
+            "sum"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showPercentChange": false,
+        "textMode": "auto",
+        "wideLayout": true
+      },
+      "pluginVersion": "10.3.3",
+      "targets": [
+        {
+          "datasource": "${DS_LOKI}",
+          "expr": "sum(count_over_time(({namespace=\"$namespace\", pod=~\"$pod\"} |~ \"(?i)$searchable_pattern\")[$__interval]))",
+          "hide": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Total Count of pattern in logs: $searchable_pattern",
+      "type": "stat"
+    },
+    {
+      "datasource": "${DS_LOKI}",
+      "description": "Live logs is a like 'tail -f' in a real time",
+      "gridPos": {
+        "h": 9,
+        "w": 24,
+        "x": 0,
+        "y": 12
+      },
+      "id": 21,
+      "options": {
+        "dedupStrategy": "signature",
+        "enableLogDetails": true,
+        "prettifyLogMessage": false,
+        "showCommonLabels": false,
+        "showLabels": false,
+        "showTime": true,
+        "sortOrder": "Descending",
+        "wrapLogMessage": true
+      },
+      "targets": [
+        {
+          "datasource": "${DS_LOKI}",
+          "expr": "{namespace=\"$namespace\", pod=~\"$pod\"} |~ \"(?i)$searchable_pattern\" ",
+          "hide": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Live logs",
+      "type": "logs"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "links": [],
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 24,
+        "x": 0,
+        "y": 21
+      },
+      "hiddenSeries": false,
+      "id": 2,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": false,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "nullPointMode": "connected",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "10.3.3",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": "${DS_PROMETHEUS}",
+          "expr": "sum(container_memory_working_set_bytes{pod=~\"$pod\",namespace=\"$namespace\",image!=\"\",container!=\"POD\"})",
+          "format": "time_series",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "Memory sum",
+      "tooltip": {
+        "shared": true,
+        "sort": 0,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "format": "decbytes",
+          "show": true
+        },
+        {
+          "format": "short",
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    },
+    {
+      "aliasColors": {},
+      "breakPoint": "50%",
+      "combine": {
+        "label": "Others",
+        "threshold": 0
+      },
+      "datasource": "${DS_LOKI}",
+      "decimals": 0,
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            }
+          },
+          "mappings": [],
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "fontSize": "80%",
+      "format": "short",
+      "gridPos": {
+        "h": 7,
+        "w": 9,
+        "x": 9,
+        "y": 30
+      },
+      "id": 20,
+      "interval": "1m",
+      "legend": {
+        "header": "total count",
+        "percentage": true,
+        "show": true,
+        "sort": "total",
+        "sortDesc": true,
+        "values": true
+      },
+      "legendType": "right",
+      "links": [],
+      "maxDataPoints": "",
+      "nullPointMode": "connected",
+      "options": {
+        "legend": {
+          "displayMode": "list",
+          "placement": "right",
+          "showLegend": true
+        },
+        "pieType": "pie",
+        "reduceOptions": {
+          "calcs": [
+            "lastNotNull"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "tooltip": {
+          "mode": "single",
+          "sort": "none"
+        }
+      },
+      "pieType": "donut",
+      "pluginVersion": "6.4.3",
+      "strokeWidth": "0.4",
+      "targets": [
+        {
+          "datasource": "${DS_LOKI}",
+          "expr": "sum(count_over_time(({namespace=\"$namespace\", pod=~\"$pod\"} |~ \"(?i)$searchable_pattern\")[$__interval])) by (pod)",
+          "refId": "A"
+        }
+      ],
+      "title": "Matched word: \"$searchable_pattern\" donut",
+      "type": "piechart",
+      "valueName": "total"
+    },
+    {
+      "datasource": "${DS_LOKI}",
+      "fieldConfig": {
+        "defaults": {
+          "mappings": [
+            {
+              "options": {
+                "match": "null",
+                "result": {
+                  "color": "green",
+                  "text": "0"
+                }
+              },
+              "type": "special"
+            }
+          ],
+          "max": 100,
+          "min": 0,
+          "noValue": "0",
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              }
+            ]
+          },
+          "unit": "percent",
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 7,
+        "w": 6,
+        "x": 18,
+        "y": 30
+      },
+      "id": 9,
+      "links": [],
+      "maxDataPoints": 100,
+      "options": {
+        "minVizHeight": 75,
+        "minVizWidth": 75,
+        "orientation": "auto",
+        "reduceOptions": {
+          "calcs": [
+            "mean"
+          ],
+          "fields": "",
+          "values": false
+        },
+        "showThresholdLabels": false,
+        "showThresholdMarkers": false,
+        "sizing": "auto"
+      },
+      "pluginVersion": "10.3.3",
+      "targets": [
+        {
+          "datasource": "${DS_LOKI}",
+          "expr": "sum(count_over_time(({namespace=\"$namespace\", pod=~\"$pod\"} |~ \"(?i)$searchable_pattern\")[$__interval])) * 100 / sum(count_over_time(({namespace=\"$namespace\", pod=~\"$pod\"})[$__interval]))",
+          "hide": false,
+          "refId": "A"
+        }
+      ],
+      "title": "Matched word: \"$searchable_pattern\" Percentage for specified time",
+      "type": "gauge"
+    },
+    {
+      "aliasColors": {},
+      "bars": true,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "${DS_LOKI}",
+      "decimals": 0,
+      "fieldConfig": {
+        "defaults": {
+          "links": [],
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 1,
+      "gridPos": {
+        "h": 7,
+        "w": 9,
+        "x": 0,
+        "y": 30
+      },
+      "hiddenSeries": false,
+      "id": 18,
+      "interval": "1m",
+      "legend": {
+        "alignAsTable": true,
+        "avg": false,
+        "current": true,
+        "hideEmpty": false,
+        "hideZero": false,
+        "max": false,
+        "min": false,
+        "rightSide": false,
+        "show": true,
+        "total": false,
+        "values": true
+      },
+      "lines": false,
+      "linewidth": 3,
+      "links": [],
+      "maxDataPoints": "",
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "10.3.3",
+      "pointradius": 2,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": "${DS_LOKI}",
+          "expr": "sum(count_over_time(({namespace=\"$namespace\", pod=~\"$pod\"} |~ \"(?i)$searchable_pattern\")[$__interval])) by (pod)",
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "Matched word: \"$searchable_pattern\" historical",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:425",
+          "decimals": 0,
+          "format": "short",
+          "label": "Count",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:426",
+          "format": "short",
+          "logBase": 1,
+          "show": false
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "links": [],
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 54
+      },
+      "hiddenSeries": false,
+      "id": 13,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": true,
+        "show": false,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "connected",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "10.3.3",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": "${DS_PROMETHEUS}",
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "sum(irate(container_network_receive_bytes_total{pod=~\"$pod\", namespace=~\"$namespace\"}[5m]))",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "Network RX sum",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:613",
+          "format": "decbytes",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:614",
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "links": [],
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 54
+      },
+      "hiddenSeries": false,
+      "id": 14,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": true,
+        "max": true,
+        "min": false,
+        "rightSide": true,
+        "show": false,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "connected",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "10.3.3",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": "${DS_PROMETHEUS}",
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "sum(irate(container_network_transmit_bytes_total{pod=~\"$pod\", namespace=~\"$namespace\"}[5m]))",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "Network TX sum",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:613",
+          "format": "decbytes",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:614",
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "links": [],
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "fill": 0,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 24,
+        "x": 0,
+        "y": 63
+      },
+      "hiddenSeries": false,
+      "id": 15,
+      "legend": {
+        "alignAsTable": true,
+        "avg": true,
+        "current": true,
+        "hideEmpty": true,
+        "max": true,
+        "min": false,
+        "rightSide": true,
+        "show": true,
+        "sort": "max",
+        "sortDesc": true,
+        "total": false,
+        "values": true
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "10.3.3",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": "${DS_PROMETHEUS}",
+          "editorMode": "code",
+          "expr": "avg(irate(container_cpu_usage_seconds_total{pod=~\"$pod\", namespace=\"$namespace\", image!=\"\", pod!=\"\", container!=\"POD\", container!=\"\"}[2m])) by (pod,container)",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "CPU",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:457",
+          "format": "cpu",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:458",
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    },
+    {
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "barAlignment": 0,
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "decbytes",
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 24,
+        "x": 0,
+        "y": 72
+      },
+      "id": 4,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [
+            "mean",
+            "lastNotNull",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true,
+          "sortBy": "Max",
+          "sortDesc": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "desc"
+        }
+      },
+      "pluginVersion": "10.3.3",
+      "targets": [
+        {
+          "datasource": "${DS_PROMETHEUS}",
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "sum (container_memory_working_set_bytes{pod=~\"$pod$\", namespace=\"$namespace\", image!=\"\", pod!=\"\", container!=\"POD\", container!=\"\"}) by (pod, container)",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "Memory",
+      "type": "timeseries"
+    },
+    {
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "color": {
+            "mode": "palette-classic"
+          },
+          "custom": {
+            "axisBorderShow": false,
+            "axisCenteredZero": false,
+            "axisColorMode": "text",
+            "axisLabel": "",
+            "axisPlacement": "auto",
+            "drawStyle": "line",
+            "fillOpacity": 0,
+            "gradientMode": "none",
+            "hideFrom": {
+              "legend": false,
+              "tooltip": false,
+              "viz": false
+            },
+            "insertNulls": false,
+            "lineInterpolation": "linear",
+            "lineWidth": 1,
+            "pointSize": 5,
+            "scaleDistribution": {
+              "type": "linear"
+            },
+            "showPoints": "never",
+            "spanNulls": true,
+            "stacking": {
+              "group": "A",
+              "mode": "none"
+            },
+            "thresholdsStyle": {
+              "mode": "off"
+            }
+          },
+          "links": [],
+          "mappings": [],
+          "thresholds": {
+            "mode": "absolute",
+            "steps": [
+              {
+                "color": "green"
+              },
+              {
+                "color": "red",
+                "value": 80
+              }
+            ]
+          },
+          "unit": "reqps",
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "gridPos": {
+        "h": 9,
+        "w": 24,
+        "x": 0,
+        "y": 81
+      },
+      "id": 5,
+      "links": [],
+      "options": {
+        "legend": {
+          "calcs": [
+            "mean",
+            "lastNotNull",
+            "max"
+          ],
+          "displayMode": "table",
+          "placement": "right",
+          "showLegend": true,
+          "sortBy": "Max",
+          "sortDesc": true
+        },
+        "tooltip": {
+          "mode": "multi",
+          "sort": "desc"
+        }
+      },
+      "pluginVersion": "10.3.3",
+      "targets": [
+        {
+          "datasource": "${DS_PROMETHEUS}",
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "sum by (http_status_code, pod) ( rate(http_server_duration_count{namespace=~\"$namespace\", pod=~\"$pod\"}[5m]) )",
+          "format": "time_series",
+          "hide": false,
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "({{http_status_code}}) {{pod}}",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "title": "RPS by HTTP Status",
+      "type": "timeseries"
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "links": [],
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 0,
+        "y": 81
+      },
+      "hiddenSeries": false,
+      "id": 22,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "10.3.3",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": "${DS_PROMETHEUS}",
+          "editorMode": "code",
+          "expr": "avg(irate(container_network_receive_bytes_total{pod=~\"$pod\", namespace=~\"$namespace\"}[5m])) by (pod, container)",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "Network RX",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:692",
+          "format": "decbytes",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:693",
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    },
+    {
+      "aliasColors": {},
+      "bars": false,
+      "dashLength": 10,
+      "dashes": false,
+      "datasource": "${DS_PROMETHEUS}",
+      "fieldConfig": {
+        "defaults": {
+          "links": [],
+          "unitScale": true
+        },
+        "overrides": []
+      },
+      "fill": 1,
+      "fillGradient": 0,
+      "gridPos": {
+        "h": 9,
+        "w": 12,
+        "x": 12,
+        "y": 81
+      },
+      "hiddenSeries": false,
+      "id": 23,
+      "legend": {
+        "avg": false,
+        "current": false,
+        "max": false,
+        "min": false,
+        "show": true,
+        "total": false,
+        "values": false
+      },
+      "lines": true,
+      "linewidth": 1,
+      "links": [],
+      "nullPointMode": "null",
+      "options": {
+        "alertThreshold": true
+      },
+      "percentage": false,
+      "pluginVersion": "10.3.3",
+      "pointradius": 5,
+      "points": false,
+      "renderer": "flot",
+      "seriesOverrides": [],
+      "spaceLength": 10,
+      "stack": false,
+      "steppedLine": false,
+      "targets": [
+        {
+          "datasource": "${DS_PROMETHEUS}",
+          "editorMode": "code",
+          "exemplar": true,
+          "expr": "avg(irate(container_network_transmit_bytes_total{pod=~\"$pod\", namespace=~\"$namespace\"}[5m])) by (pod, container)",
+          "format": "time_series",
+          "interval": "",
+          "intervalFactor": 1,
+          "legendFormat": "",
+          "range": true,
+          "refId": "A"
+        }
+      ],
+      "thresholds": [],
+      "timeRegions": [],
+      "title": "Network TX",
+      "tooltip": {
+        "shared": true,
+        "sort": 2,
+        "value_type": "individual"
+      },
+      "type": "graph",
+      "xaxis": {
+        "mode": "time",
+        "show": true,
+        "values": []
+      },
+      "yaxes": [
+        {
+          "$$hashKey": "object:769",
+          "format": "decbytes",
+          "logBase": 1,
+          "show": true
+        },
+        {
+          "$$hashKey": "object:770",
+          "format": "short",
+          "logBase": 1,
+          "show": true
+        }
+      ],
+      "yaxis": {
+        "align": false
+      }
+    }
+  ],
+  "refresh": "10s",
+  "schemaVersion": 39,
+  "tags": [],
+  "templating": {
+    "list": [
+      {
+        "current": {
+          "selected": false,
+          "text": "monitoring",
+          "value": "monitoring"
+        },
+        "datasource": "${DS_PROMETHEUS}",
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "multi": false,
+        "name": "namespace",
+        "options": [],
+        "query": "label_values(kube_pod_info, namespace)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {
+          "selected": false,
+          "text": "All",
+          "value": "$__all"
+        },
+        "datasource": "${DS_PROMETHEUS}",
+        "definition": "",
+        "hide": 0,
+        "includeAll": true,
+        "multi": false,
+        "name": "pod",
+        "options": [],
+        "query": "label_values(kube_pod_info{namespace=\"$namespace\"},pod)",
+        "refresh": 1,
+        "regex": "",
+        "skipUrlSync": false,
+        "sort": 0,
+        "type": "query"
+      },
+      {
+        "current": {
+          "selected": false,
+          "text": "",
+          "value": ""
+        },
+        "hide": 0,
+        "includeAll": false,
+        "multi": false,
+        "name": "searchable_pattern",
+        "options": [],
+        "query": "",
+        "skipUrlSync": false,
+        "type": "textbox"
+      }
+    ]
+  },
+  "time": {
+    "from": "now-5m",
+    "to": "now"
+  },
+  "timepicker": {
+    "refresh_intervals": [
+      "10s",
+      "30s",
+      "1m",
+      "5m",
+      "15m",
+      "30m",
+      "1h",
+      "2h",
+      "1d"
+    ],
+    "time_options": [
+      "5m",
+      "15m",
+      "1h",
+      "6h",
+      "12h",
+      "24h",
+      "2d",
+      "7d",
+      "30d"
+    ]
+  },
+  "timezone": "",
+  "title": "Pods + Logs Dashboard",
+  "uid": "-pods-logs-dashboard",
+  "version": 13,
+  "weekStart": "",
+  "__inputs": [
+    {
+      "name": "DS_PROMETHEUS",
+      "label": "Prometheus",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "prometheus",
+      "pluginName": "Prometheus"
+    },
+    {
+      "name": "DS_LOKI",
+      "label": "Loki",
+      "description": "",
+      "type": "datasource",
+      "pluginId": "loki",
+      "pluginName": "Loki"
+    }
+  ]
+}
\ No newline at end of file
diff --git a/kubernetes/helm/openslice/templates/artemis.yaml b/kubernetes/helm/openslice/templates/artemis.yaml
index 87c75ea00d59459c65d068fce3d7f8eb62fa71bc..66913926be3c4555da353227679bd759f719ced7 100644
--- a/kubernetes/helm/openslice/templates/artemis.yaml
+++ b/kubernetes/helm/openslice/templates/artemis.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: artemis
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -14,13 +14,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: artemis
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: artemis
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -48,7 +48,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: artemis
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -65,6 +65,6 @@ spec:
       port: 61613
       targetPort: 61613
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: artemis
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/blockdiag.yaml b/kubernetes/helm/openslice/templates/blockdiag.yaml
index 30b2025c27637392e801158d5ea496c11c8a03b2..ec961ea2f963e79739087200f06c3e947227b2c2 100644
--- a/kubernetes/helm/openslice/templates/blockdiag.yaml
+++ b/kubernetes/helm/openslice/templates/blockdiag.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: blockdiag
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -14,13 +14,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: blockdiag
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: blockdiag
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -39,7 +39,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: blockdiag
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -50,6 +50,6 @@ spec:
       targetPort: 8001
       port: 8001
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: blockdiag
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/bugzilla.yaml b/kubernetes/helm/openslice/templates/bugzilla.yaml
index d759a2554c42af2abf6e209f2207b92cfc9ef7cb..b9d9fefae35bb7ea9849ee74c34991e88b78ed94 100644
--- a/kubernetes/helm/openslice/templates/bugzilla.yaml
+++ b/kubernetes/helm/openslice/templates/bugzilla.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: bugzilla
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -14,13 +14,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: bugzilla
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: bugzilla
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -50,7 +50,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: bugzilla
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -61,6 +61,6 @@ spec:
       port: 13010
       targetPort: 13010
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: bugzilla
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/centrallog.yaml b/kubernetes/helm/openslice/templates/centrallog.yaml
index b8143fcd9f39869242c7192e96b1a55a08e94246..2ad48cf0a6f25aaaffc0b76c3dcce61df14945a2 100644
--- a/kubernetes/helm/openslice/templates/centrallog.yaml
+++ b/kubernetes/helm/openslice/templates/centrallog.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: centrallog
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -14,13 +14,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: centrallog
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: centrallog
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -48,7 +48,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: centrallog
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -59,7 +59,7 @@ spec:
       targetPort: 13013
       port: 13013
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: centrallog
     {{- include "openslice.selectorLabels" . | nindent 4 }}
 
diff --git a/kubernetes/helm/openslice/templates/cridge-secret.yaml b/kubernetes/helm/openslice/templates/cridge-secret.yaml
index 4a32bff5cab0c141bfb250f1d8e5f1c9dc802feb..8b2811d9d280ed764a5bdfd86af0ab94527f44b4 100644
--- a/kubernetes/helm/openslice/templates/cridge-secret.yaml
+++ b/kubernetes/helm/openslice/templates/cridge-secret.yaml
@@ -15,7 +15,7 @@ kind: Secret
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: cridge
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/cridge.yaml b/kubernetes/helm/openslice/templates/cridge.yaml
index 10656390c474046f1bee83e9531b0cf87da57272..c83e52662d3438d746227a349ed002bf69e43dce 100644
--- a/kubernetes/helm/openslice/templates/cridge.yaml
+++ b/kubernetes/helm/openslice/templates/cridge.yaml
@@ -4,7 +4,7 @@ kind: Deployment
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: cridge
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -13,13 +13,13 @@ spec:
   replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: cridge
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: cridge
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
diff --git a/kubernetes/helm/openslice/templates/keycloak-config.yaml b/kubernetes/helm/openslice/templates/keycloak-config.yaml
index 748008bbe0010d28024a746eeed9e485c8b5d3b5..3f2a8edaf1acdfbd3948220e48e0260aaf892235 100644
--- a/kubernetes/helm/openslice/templates/keycloak-config.yaml
+++ b/kubernetes/helm/openslice/templates/keycloak-config.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ConfigMap
 metadata:
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: keycloak
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/keycloak.yaml b/kubernetes/helm/openslice/templates/keycloak.yaml
index fca2bdbe8782e30adda9e4a54e3b0aa455f5a573..5ee1274080ae5f0b51d068796e5b8ded91536c61 100644
--- a/kubernetes/helm/openslice/templates/keycloak.yaml
+++ b/kubernetes/helm/openslice/templates/keycloak.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: keycloak
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -14,13 +14,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: keycloak
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: keycloak
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -79,7 +79,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: keycloak
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -93,6 +93,6 @@ spec:
       port: 8443
       targetPort: 8443
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: keycloak
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/kroki-ingress.yaml b/kubernetes/helm/openslice/templates/kroki-ingress.yaml
index c1467645d8ef1159f30a4db93d165a20e737a367..fc9b68108e3273f16833600babef3235b8f89710 100644
--- a/kubernetes/helm/openslice/templates/kroki-ingress.yaml
+++ b/kubernetes/helm/openslice/templates/kroki-ingress.yaml
@@ -3,7 +3,7 @@ kind: Ingress
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
   annotations:
diff --git a/kubernetes/helm/openslice/templates/kroki.yaml b/kubernetes/helm/openslice/templates/kroki.yaml
index 5b34ae58df9ab87f202e7753f91e6423dc0beef3..197f572d6b5a1747f2e0517f114d172990218917 100644
--- a/kubernetes/helm/openslice/templates/kroki.yaml
+++ b/kubernetes/helm/openslice/templates/kroki.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: kroki
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -14,13 +14,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: kroki
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: kroki
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -42,7 +42,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: kroki
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -53,6 +53,6 @@ spec:
       targetPort: 8000
       port: 8000
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: kroki
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/manoclient.yaml b/kubernetes/helm/openslice/templates/manoclient.yaml
index 064c0c18b043595834c087cdf909ba8a2111dcf8..4e3fba3033fab57a85f1512d6d196e0d9086d12c 100644
--- a/kubernetes/helm/openslice/templates/manoclient.yaml
+++ b/kubernetes/helm/openslice/templates/manoclient.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: manoclient
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -14,13 +14,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: manoclient
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: manoclient
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -48,7 +48,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: manoclient
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -59,6 +59,6 @@ spec:
       port: 13011
       targetPort: 13011
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: manoclient
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/metrico.yaml b/kubernetes/helm/openslice/templates/metrico.yaml
index 620ca0aa2146d38585535fbad658d42536ec7a53..0047feeca7375d6937018221e26f678900bef16a 100644
--- a/kubernetes/helm/openslice/templates/metrico.yaml
+++ b/kubernetes/helm/openslice/templates/metrico.yaml
@@ -4,7 +4,7 @@ kind: Deployment
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: metrico
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -15,13 +15,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: metrico
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: metrico
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
diff --git a/kubernetes/helm/openslice/templates/mysql-config.yaml b/kubernetes/helm/openslice/templates/mysql-config.yaml
index 0de0e5277807c43e82193fa44c53a07e386b9470..2c207e1bb911cc137c404f379a74749d124f903f 100644
--- a/kubernetes/helm/openslice/templates/mysql-config.yaml
+++ b/kubernetes/helm/openslice/templates/mysql-config.yaml
@@ -3,7 +3,7 @@ kind: ConfigMap
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: mysql
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/mysql-pv-pvc.yaml b/kubernetes/helm/openslice/templates/mysql-pv-pvc.yaml
index 2746bcf4262e2ec8b1315c6f0e2294a7059ccca6..5c3298f7ac946e86c313c5081a3d0104c5e6bb4c 100644
--- a/kubernetes/helm/openslice/templates/mysql-pv-pvc.yaml
+++ b/kubernetes/helm/openslice/templates/mysql-pv-pvc.yaml
@@ -3,7 +3,7 @@ kind: PersistentVolumeClaim
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: mysql
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -22,7 +22,7 @@ kind: PersistentVolume
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: mysql
     type: local
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/kubernetes/helm/openslice/templates/mysql.yaml b/kubernetes/helm/openslice/templates/mysql.yaml
index b69a3f1e8cd3ecf222ed5aaa21f44feb52d2d950..62955ceedbdcd1026c7dc3d8ecd752fd356a0e65 100644
--- a/kubernetes/helm/openslice/templates/mysql.yaml
+++ b/kubernetes/helm/openslice/templates/mysql.yaml
@@ -3,7 +3,7 @@ kind: StatefulSet
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: mysql
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -15,13 +15,13 @@ spec:
   serviceName: {{ include "openslice.fullname" . }}-mysql
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: mysql
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: mysql
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -72,7 +72,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: mysql
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -83,6 +83,6 @@ spec:
       port: 3306
       targetPort: 3306
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: mysql
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/oasapi.yaml b/kubernetes/helm/openslice/templates/oasapi.yaml
index bf78b5dd478c19f009fddd599d6537fb7b667c66..b5a710315a6827b6e8e3813e52332272400c7a5c 100644
--- a/kubernetes/helm/openslice/templates/oasapi.yaml
+++ b/kubernetes/helm/openslice/templates/oasapi.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: oasapi
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -14,13 +14,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: oasapi
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: oasapi
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -74,7 +74,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: oasapi
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -85,6 +85,6 @@ spec:
       targetPort: 13101
       port: 13101
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: oasapi
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/openslice-ingress.yaml b/kubernetes/helm/openslice/templates/openslice-ingress.yaml
index 365ffc7a6caeeec3d9bc76c7740e7e0090d25989..92a295b939d0d9df3ad4f815958c574285c88fba 100644
--- a/kubernetes/helm/openslice/templates/openslice-ingress.yaml
+++ b/kubernetes/helm/openslice/templates/openslice-ingress.yaml
@@ -3,7 +3,7 @@ kind: Ingress
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
   annotations:
diff --git a/kubernetes/helm/openslice/templates/osom.yaml b/kubernetes/helm/openslice/templates/osom.yaml
index 14c8d2d2cbae36b462156a9292e5582506a388a8..a8221bc167c25315d4bab85a83e81bbd1f31641d 100644
--- a/kubernetes/helm/openslice/templates/osom.yaml
+++ b/kubernetes/helm/openslice/templates/osom.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: osom
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -14,13 +14,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: osom
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: osom
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -49,7 +49,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: osom
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -60,6 +60,6 @@ spec:
       targetPort: 13100
       port: 13100
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: osom
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/osportalapi-pv-pvc.yaml b/kubernetes/helm/openslice/templates/osportalapi-pv-pvc.yaml
index cb3bc42eb2db961bccc9f98146178072b46db9c3..46409c6afa50d4e7996bd54278705088761dc70e 100644
--- a/kubernetes/helm/openslice/templates/osportalapi-pv-pvc.yaml
+++ b/kubernetes/helm/openslice/templates/osportalapi-pv-pvc.yaml
@@ -3,37 +3,37 @@ kind: PersistentVolumeClaim
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
-    org.etsi.osl.service: osportalapi
+    app: openslice
+    org.etsi.osl.service: portalapi
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
-  name: {{ include "openslice.fullname" . }}-osportalapi-claim0
+  name: {{ include "openslice.fullname" . }}-portalapi-claim0
 spec:
-  storageClassName: {{ .Values.storageClass | default "osportalapi-pv-volume" }}
+  storageClassName: {{ .Values.storageClass | default "portalapi-pv-volume" }}
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: "1Gi"
 ---
-{{- if or (not .Values.storageClass) (eq .Values.storageClass "osportalapi-pv-volume") }}
+{{- if or (not .Values.storageClass) (eq .Values.storageClass "portalapi-pv-volume") }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
-    org.etsi.osl.service: osportalapi
+    app: openslice
+    org.etsi.osl.service: portalapi
     type: local
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
-  name: {{ include "openslice.fullname" . }}-osportalapi-pv-volume
+  name: {{ include "openslice.fullname" . }}-portalapi-pv-volume
 spec:
-  storageClassName: "osportalapi-pv-volume"
+  storageClassName: "portalapi-pv-volume"
   capacity:
     storage: "1Gi"
   accessModes:
     - ReadWriteOnce
   hostPath:
-    path: "/dockerdata-nfs/osportalapi-pv-volume"
+    path: "/dockerdata-nfs/portalapi-pv-volume"
 {{- end }}
diff --git a/kubernetes/helm/openslice/templates/osportalapi.yaml b/kubernetes/helm/openslice/templates/osportalapi.yaml
index 6df11d4899aec82bc2f40444c8721ee57e94edce..df894f2000b7ac3fed64427d276026cf41f791d0 100644
--- a/kubernetes/helm/openslice/templates/osportalapi.yaml
+++ b/kubernetes/helm/openslice/templates/osportalapi.yaml
@@ -4,25 +4,25 @@ kind: Deployment
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
-    org.etsi.osl.service: osportalapi
+    app: openslice
+    org.etsi.osl.service: portalapi
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
-  name: {{ include "openslice.fullname" . }}-osportalapi
+  name: {{ include "openslice.fullname" . }}-portalapi
 spec:
   {{- if not .Values.autoscaling.enabled }}
   replicas: {{ .Values.replicaCount }}
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
-      org.etsi.osl.service: osportalapi
+      app: openslice
+      org.etsi.osl.service: portalapi
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
-        org.etsi.osl.service: osportalapi
+        app: openslice
+        org.etsi.osl.service: portalapi
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
       hostNetwork: {{ .Values.hostNetwork }}
@@ -36,7 +36,7 @@ spec:
       containers:
         - image: "{{ .Values.image.portalapi.repository }}:{{ .Values.image.portalapi.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.portalapi.pullPolicy | default "Always" }}
-          name: {{ include "openslice.fullname" . }}-osportalapi
+          name: {{ include "openslice.fullname" . }}-portalapi
           env:
             - name: SPRING_APPLICATION_JSON
               value: >-
@@ -66,30 +66,30 @@ spec:
           ports:
             - containerPort: 13000
           volumeMounts:
-            - name: osportalapi-claim0
+            - name: portalapi-claim0
               mountPath: /root
       restartPolicy: Always
       volumes:
-        - name: osportalapi-claim0
+        - name: portalapi-claim0
           persistentVolumeClaim:
-            claimName: {{ include "openslice.fullname" . }}-osportalapi-claim0
+            claimName: {{ include "openslice.fullname" . }}-portalapi-claim0
 ---
 apiVersion: v1
 kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
-    org.etsi.osl.service: osportalapi
+    app: openslice
+    org.etsi.osl.service: portalapi
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
-  name: {{ include "openslice.fullname" . }}-osportalapi
+  name: {{ include "openslice.fullname" . }}-portalapi
 spec:
   ports:
     - name: "13000"
       port: 13000
       targetPort: 13000
   selector:
-    app: {{ include "openslice.fullname" . }}
-    org.etsi.osl.service: osportalapi
+    app: openslice
+    org.etsi.osl.service: portalapi
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/osscapi-pv-pvc.yaml b/kubernetes/helm/openslice/templates/osscapi-pv-pvc.yaml
index d8ce702d8723d359554be9e39f8ffdda0d91eb2a..2a7049dc5b8941f17347f0cbebdb170965b40d9b 100644
--- a/kubernetes/helm/openslice/templates/osscapi-pv-pvc.yaml
+++ b/kubernetes/helm/openslice/templates/osscapi-pv-pvc.yaml
@@ -3,7 +3,7 @@ kind: PersistentVolumeClaim
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: osscapi
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -22,7 +22,7 @@ kind: PersistentVolume
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: osscapi
     type: local
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
diff --git a/kubernetes/helm/openslice/templates/osscapi.yaml b/kubernetes/helm/openslice/templates/osscapi.yaml
index 758d5194bba9efd07fe9e9b5dcdcb91a17611667..0adf86d80b5358cf00598bbd759493fde979165c 100644
--- a/kubernetes/helm/openslice/templates/osscapi.yaml
+++ b/kubernetes/helm/openslice/templates/osscapi.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:	
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: osscapi
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -14,13 +14,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: osscapi
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: osscapi
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -83,7 +83,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: osscapi
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -94,6 +94,6 @@ spec:
       targetPort: 13082
       port: 13082
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: osscapi
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/portalweb-config.yaml b/kubernetes/helm/openslice/templates/portalweb-config.yaml
index 0ce4191dedd8d634c51cc0781e1afbf03ca6534e..f7b923f5372374f65c5f39c9eba5de57ec8ee387 100644
--- a/kubernetes/helm/openslice/templates/portalweb-config.yaml
+++ b/kubernetes/helm/openslice/templates/portalweb-config.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "openslice.fullname" . }}-portalweb-config
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: portalweb
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/portalweb.yaml b/kubernetes/helm/openslice/templates/portalweb.yaml
index c2b22a10b01c00f22a850b9e951189c86e849fb4..e492c6513f0fd97965433088abf2b9f6968ebcf9 100644
--- a/kubernetes/helm/openslice/templates/portalweb.yaml
+++ b/kubernetes/helm/openslice/templates/portalweb.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: portalweb
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -14,13 +14,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: portalweb
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: portalweb
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -53,7 +53,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: portalweb
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -63,6 +63,6 @@ spec:
     - name: "portalwebport"
       port: 80
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: portalweb
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/tmfweb-config.yaml b/kubernetes/helm/openslice/templates/tmfweb-config.yaml
index badce4153c45a9aa610586a3b2b66bac6302fd46..b1853ad5e7c30746bf6eb902d601d5c08ae0e6c8 100644
--- a/kubernetes/helm/openslice/templates/tmfweb-config.yaml
+++ b/kubernetes/helm/openslice/templates/tmfweb-config.yaml
@@ -3,7 +3,7 @@ apiVersion: v1
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: tmfweb
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/templates/tmfweb.yaml b/kubernetes/helm/openslice/templates/tmfweb.yaml
index 2d324ec79f2f34379c10d8b12ae10d3ad1cd493f..854ac5a9c908795421a3533541678d0e999b1156 100644
--- a/kubernetes/helm/openslice/templates/tmfweb.yaml
+++ b/kubernetes/helm/openslice/templates/tmfweb.yaml
@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: tmfweb
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -14,13 +14,13 @@ spec:
   {{- end }}
   selector:
     matchLabels:
-      app: {{ include "openslice.fullname" . }}
+      app: openslice
       org.etsi.osl.service: tmfweb
       {{- include "openslice.selectorLabels" . | nindent 6 }}
   template:
     metadata:
       labels:
-        app: {{ include "openslice.fullname" . }}
+        app: openslice
         org.etsi.osl.service: tmfweb
         {{- include "openslice.selectorLabels" . | nindent 8 }}
     spec:
@@ -48,7 +48,7 @@ kind: Service
 metadata:
   namespace: {{ .Release.Namespace }}
   labels:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: tmfweb
     chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
     {{- include "openslice.labels" . | nindent 4 }}
@@ -58,6 +58,6 @@ spec:
     - name: "tmwebport"
       port: 80
   selector:
-    app: {{ include "openslice.fullname" . }}
+    app: openslice
     org.etsi.osl.service: tmfweb
     {{- include "openslice.selectorLabels" . | nindent 4 }}
diff --git a/kubernetes/helm/openslice/values.yaml b/kubernetes/helm/openslice/values.yaml
index e531b73b43b145f8c4c5da251c3733fa886c6e2d..fac3528dc8257f28c9c743f61ad0b630f96440aa 100644
--- a/kubernetes/helm/openslice/values.yaml
+++ b/kubernetes/helm/openslice/values.yaml
@@ -172,8 +172,6 @@ serviceAccount:
   # If not set and create is true, a name is generated using the fullname template
   name: ""
 
-podAnnotations: {}
-
 podSecurityContext: {}
   # fsGroup: 2000
 
@@ -215,12 +213,6 @@ ingress:
     port: 80
   annotations: {}
 
-
-  tls: []
-  #  - secretName: chart-example-tls
-  #    hosts:
-  #      - chart-example.local
-
 resources: {}
   # We usually recommend not to specify default resources and to leave this as a conscious
   # choice for the user. This also increases chances charts run on environments with little
@@ -239,9 +231,3 @@ autoscaling:
   maxReplicas: 100
   targetCPUUtilizationPercentage: 80
   targetMemoryUtilizationPercentage: 80
-
-nodeSelector: {}
-
-tolerations: []
-
-affinity: {}