diff --git a/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml b/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml
index 90fd3ffa..ab0f5606 100644
--- a/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml
+++ b/demos/data-lakehouse-iceberg-trino-spark/create-spark-ingestion-job.yaml
@@ -39,6 +39,8 @@ data:
     kind: SparkApplication
     metadata:
       name: spark-ingest-into-lakehouse
+      labels:
+        stackable.tech/vendor: Stackable
     spec:
       version: "1.0"
       sparkImage:
@@ -61,7 +63,7 @@ data:
         # Every merge into statements creates 8 files.
         # Paralleling is enough for the demo, might need to be increased (or omitted entirely) when merge larger data volumes
         spark.sql.shuffle.partitions: "8"
-    
+
         # As of 2023-10-31 the operator does not set this
         spark.executor.cores: "4"
       volumes:
diff --git a/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml b/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml
index a8e8e0bf..f4b4dc9e 100644
--- a/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml
+++ b/demos/data-lakehouse-iceberg-trino-spark/setup-superset.yaml
@@ -70,7 +70,6 @@ data:
     # with open("superset-assets.zip", "wb") as f:
     #     f.write(result.content)
 
-
     #########################
     # IMPORTANT
     #########################
diff --git a/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml b/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml
index e4e05ff8..9fc8b529 100644
--- a/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml
+++ b/demos/nifi-kafka-druid-water-level-data/create-druid-ingestion-job.yaml
@@ -14,9 +14,9 @@ spec:
             - name: ingestion-job-spec
               mountPath: /tmp/ingestion-job-spec
       volumes:
-      - name: ingestion-job-spec
-        configMap:
-          name: create-druid-ingestion-job-spec
+        - name: ingestion-job-spec
+          configMap:
+            name: create-druid-ingestion-job-spec
       restartPolicy: OnFailure
   backoffLimit: 50
 ---
diff --git a/demos/signal-processing/serviceaccount.yaml b/demos/signal-processing/serviceaccount.yaml
index 30e4ada9..8a2d0b19 100644
--- a/demos/signal-processing/serviceaccount.yaml
+++ b/demos/signal-processing/serviceaccount.yaml
@@ -45,4 +45,3 @@ rules:
       - pods/exec
     verbs:
       - create
-
diff --git a/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml b/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml
index 9d485797..31e53bac 100644
--- a/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml
+++ b/demos/spark-k8s-anomaly-detection-taxi-data/create-spark-anomaly-detection-job.yaml
@@ -96,7 +96,7 @@ kind: ConfigMap
 metadata:
   name: cm-spark
 data:
-  spark-ad.py: |
+  spark-ad.py: |-
     from pyspark.sql import SparkSession
     from pyspark.sql.functions import dayofweek, to_date, to_timestamp, date_format, year, hour, minute, month, when, dayofmonth, dayofweek
     from pyspark.sql.functions import concat_ws, substring, concat, lpad, lit
@@ -191,4 +191,4 @@ data:
     )
 
     # write via iceberg
-    df_out.writeTo("prediction.ad.iforest").append()
\ No newline at end of file
+    df_out.writeTo("prediction.ad.iforest").append()
diff --git a/stacks/_templates/jupyterhub.yaml b/stacks/_templates/jupyterhub.yaml
index 3a96f3a5..69c48809 100644
--- a/stacks/_templates/jupyterhub.yaml
+++ b/stacks/_templates/jupyterhub.yaml
@@ -14,6 +14,8 @@ options:
         password: {{ jupyterHubAdminPassword }}
       JupyterHub:
         authenticator_class: dummy
+    labels:
+      stackable.tech/vendor: Stackable
   proxy:
     service:
       type: NodePort
@@ -41,6 +43,8 @@ options:
     serviceAccountName: spark
     networkPolicy:
       enabled: false
+    extraLabels:
+      stackable.tech/vendor: Stackable
     extraEnv:
       HADOOP_CONF_DIR: "/home/jovyan/hdfs"
     initContainers:
diff --git a/stacks/_templates/minio-distributed-small.yaml b/stacks/_templates/minio-distributed-small.yaml
index 96398439..9c5ea823 100644
--- a/stacks/_templates/minio-distributed-small.yaml
+++ b/stacks/_templates/minio-distributed-small.yaml
@@ -5,6 +5,10 @@ repo:
   url: https://charts.min.io/
 version: 5.0.14
 options:
+  additionalLabels:
+    stackable.tech/vendor: Stackable
+  podLabels:
+    stackable.tech/vendor: Stackable
   rootUser: admin
   rootPassword: {{ minioAdminPassword }}
   mode: distributed
diff --git a/stacks/_templates/minio-distributed.yaml b/stacks/_templates/minio-distributed.yaml
index 7a9d821f..c357d5c8 100644
--- a/stacks/_templates/minio-distributed.yaml
+++ b/stacks/_templates/minio-distributed.yaml
@@ -5,6 +5,10 @@ repo:
   url: https://charts.min.io/
 version: 5.0.14
 options:
+  additionalLabels:
+    stackable.tech/vendor: Stackable
+  podLabels:
+    stackable.tech/vendor: Stackable
   rootUser: admin
   rootPassword: {{ minioAdminPassword }}
   mode: distributed
diff --git a/stacks/_templates/minio.yaml b/stacks/_templates/minio.yaml
index af51aaeb..7937eb4a 100644
--- a/stacks/_templates/minio.yaml
+++ b/stacks/_templates/minio.yaml
@@ -5,6 +5,10 @@ repo:
   url: https://charts.min.io/
 version: 5.0.14
 options:
+  additionalLabels:
+    stackable.tech/vendor: Stackable
+  podLabels:
+    stackable.tech/vendor: Stackable
   rootUser: admin
   rootPassword: {{ minioAdminPassword }}
   mode: standalone
diff --git a/stacks/_templates/opensearch-dashboards.yaml b/stacks/_templates/opensearch-dashboards.yaml
index d8761af8..dd3c3891 100644
--- a/stacks/_templates/opensearch-dashboards.yaml
+++ b/stacks/_templates/opensearch-dashboards.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://opensearch-project.github.io/helm-charts
 version: 2.14.0
 options:
+  labels:
+    stackable.tech/vendor: Stackable
   service:
     type: NodePort
     port: 5601
@@ -12,6 +14,8 @@ options:
       stackable.tech/logging-view-logs: |-
         /app/discover?security_tenant=global#/view/logs
       stackable.tech/logging-credentials-secret: opensearch-user
+    labels:
+      stackable.tech/vendor: Stackable
   opensearchAccount:
     secret: opensearch-dashboard-user
   extraEnvs:
diff --git a/stacks/_templates/opensearch.yaml b/stacks/_templates/opensearch.yaml
index e49c5fe8..b2f3d195 100644
--- a/stacks/_templates/opensearch.yaml
+++ b/stacks/_templates/opensearch.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://opensearch-project.github.io/helm-charts
 version: 2.16.1
 options:
+  labels:
+    stackable.tech/vendor: Stackable
   config:
     opensearch.yml: |
       plugins:
diff --git a/stacks/_templates/postgresql-airflow.yaml b/stacks/_templates/postgresql-airflow.yaml
index bb129930..77b23187 100644
--- a/stacks/_templates/postgresql-airflow.yaml
+++ b/stacks/_templates/postgresql-airflow.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://charts.bitnami.com/bitnami/
 version: 13.2.18
 options:
+  commonLabels:
+    stackable.tech/vendor: Stackable
   auth:
     username: airflow
     password: airflow
diff --git a/stacks/_templates/postgresql-druid.yaml b/stacks/_templates/postgresql-druid.yaml
index c1ac7881..fec0f4ad 100644
--- a/stacks/_templates/postgresql-druid.yaml
+++ b/stacks/_templates/postgresql-druid.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://charts.bitnami.com/bitnami/
 version: 13.2.18
 options:
+  commonLabels:
+    stackable.tech/vendor: Stackable
   auth:
     username: druid
     password: druid
diff --git a/stacks/_templates/postgresql-hive-iceberg.yaml b/stacks/_templates/postgresql-hive-iceberg.yaml
index a9f6c4fe..a0b9d631 100644
--- a/stacks/_templates/postgresql-hive-iceberg.yaml
+++ b/stacks/_templates/postgresql-hive-iceberg.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://charts.bitnami.com/bitnami/
 version: 13.2.18
 options:
+  commonLabels:
+    stackable.tech/vendor: Stackable
   auth:
     username: hive
     password: hive
diff --git a/stacks/_templates/postgresql-hive.yaml b/stacks/_templates/postgresql-hive.yaml
index 8fe03d68..2958339b 100644
--- a/stacks/_templates/postgresql-hive.yaml
+++ b/stacks/_templates/postgresql-hive.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://charts.bitnami.com/bitnami/
 version: 13.2.18
 options:
+  commonLabels:
+    stackable.tech/vendor: Stackable
   auth:
     username: hive
     password: hive
diff --git a/stacks/_templates/postgresql-hivehdfs.yaml b/stacks/_templates/postgresql-hivehdfs.yaml
index 61c83ee3..67504d96 100644
--- a/stacks/_templates/postgresql-hivehdfs.yaml
+++ b/stacks/_templates/postgresql-hivehdfs.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://charts.bitnami.com/bitnami/
 version: 13.2.18
 options:
+  commonLabels:
+    stackable.tech/vendor: Stackable
   auth:
     username: hive
     password: hive
diff --git a/stacks/_templates/postgresql-hives3.yaml b/stacks/_templates/postgresql-hives3.yaml
index 1aba0799..e73aeb62 100644
--- a/stacks/_templates/postgresql-hives3.yaml
+++ b/stacks/_templates/postgresql-hives3.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://charts.bitnami.com/bitnami/
 version: 13.2.18
 options:
+  commonLabels:
+    stackable.tech/vendor: Stackable
   auth:
     username: hive
     password: hive
diff --git a/stacks/_templates/postgresql-superset.yaml b/stacks/_templates/postgresql-superset.yaml
index f90b2043..4d9d1b4e 100644
--- a/stacks/_templates/postgresql-superset.yaml
+++ b/stacks/_templates/postgresql-superset.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://charts.bitnami.com/bitnami/
 version: 13.2.18
 options:
+  commonLabels:
+    stackable.tech/vendor: Stackable
   auth:
     username: superset
     password: superset
diff --git a/stacks/_templates/postgresql-timescaledb.yaml b/stacks/_templates/postgresql-timescaledb.yaml
index 69b830e4..594ff092 100644
--- a/stacks/_templates/postgresql-timescaledb.yaml
+++ b/stacks/_templates/postgresql-timescaledb.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://charts.timescale.com/
 version: 0.33.1
 options:
+  podLabels:
+    stackable.tech/vendor: Stackable
   replicaCount: 1
   secrets:
     credentials:
diff --git a/stacks/_templates/prometheus-service-monitor.yaml b/stacks/_templates/prometheus-service-monitor.yaml
index 15e919c5..5e470cf1 100644
--- a/stacks/_templates/prometheus-service-monitor.yaml
+++ b/stacks/_templates/prometheus-service-monitor.yaml
@@ -3,6 +3,7 @@ kind: ServiceMonitor
 metadata:
   name: scrape-label
   labels:
+    stackable.tech/vendor: Stackable
     release: prometheus
 spec:
   endpoints:
@@ -19,6 +20,7 @@ kind: ServiceMonitor
 metadata:
   name: scrape-minio
   labels:
+    stackable.tech/vendor: Stackable
     release: prometheus
 spec:
   endpoints:
diff --git a/stacks/_templates/prometheus.yaml b/stacks/_templates/prometheus.yaml
index a5d42302..bd796d78 100644
--- a/stacks/_templates/prometheus.yaml
+++ b/stacks/_templates/prometheus.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://prometheus-community.github.io/helm-charts
 version: 54.2.2
 options:
+  commonMetaLabels:
+    stackable.tech/vendor: Stackable
   prometheus:
     prometheusSpec:
       storageSpec:
diff --git a/stacks/_templates/redis-airflow.yaml b/stacks/_templates/redis-airflow.yaml
index 04e56e19..2381f61f 100644
--- a/stacks/_templates/redis-airflow.yaml
+++ b/stacks/_templates/redis-airflow.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://charts.bitnami.com/bitnami/
 version: 18.1.6
 options:
+  commonLabels:
+    stackable.tech/vendor: Stackable
   auth:
     password: airflow
   replica:
diff --git a/stacks/_templates/vector-aggregator.yaml b/stacks/_templates/vector-aggregator.yaml
index 47d8113d..2b05dfdb 100644
--- a/stacks/_templates/vector-aggregator.yaml
+++ b/stacks/_templates/vector-aggregator.yaml
@@ -5,6 +5,10 @@ repo:
   url: https://helm.vector.dev
 version: 0.26.0
 options:
+  commonLabels:
+    stackable.tech/vendor: Stackable
+  podLabels: # Doesn't seem to work?
+    stackable.tech/vendor: Stackable
   role: Aggregator
   customConfig:
     sources:
diff --git a/stacks/jupyterhub-pyspark-hdfs/hdfs.yaml b/stacks/jupyterhub-pyspark-hdfs/hdfs.yaml
index 27e3331c..c3086e0e 100644
--- a/stacks/jupyterhub-pyspark-hdfs/hdfs.yaml
+++ b/stacks/jupyterhub-pyspark-hdfs/hdfs.yaml
@@ -44,4 +44,4 @@ spec:
             capacity: 5Gi
     roleGroups:
       default:
-        replicas: 1
\ No newline at end of file
+        replicas: 1
diff --git a/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml b/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml
index 1f52c726..0bd609f3 100644
--- a/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml
+++ b/stacks/jupyterhub-pyspark-hdfs/spark_driver_service.yaml
@@ -21,4 +21,4 @@ spec:
       port: 4040
       protocol: TCP
       targetPort: 4040
-  type: ClusterIP
\ No newline at end of file
+  type: ClusterIP
diff --git a/stacks/keycloak-opa-poc/druid.yaml b/stacks/keycloak-opa-poc/druid.yaml
index 4e395136..2dd9a0d8 100644
--- a/stacks/keycloak-opa-poc/druid.yaml
+++ b/stacks/keycloak-opa-poc/druid.yaml
@@ -71,7 +71,7 @@ spec:
         # it seems like the Druid processes cannot handle the OIDC authentication flow.
         druid.auth.authenticator.MyBasicMetadataAuthenticator.type: basic
         druid.auth.authenticator.MyBasicMetadataAuthenticator.initialInternalClientPassword: '${env:DRUID_SYSTEM_USER_PASSWORD}' # Default password for internal 'druid_system' user
-        druid.auth.authenticator.MyBasicMetadataAuthenticator.skipOnFailure: "true"  # for any non system user, skip to the pac4j authenticator
+        druid.auth.authenticator.MyBasicMetadataAuthenticator.skipOnFailure: "true" # for any non system user, skip to the pac4j authenticator
         druid.auth.authenticator.MyBasicMetadataAuthenticator.authorizerName: OpaAuthorizer
 
         # pac4j authenticator
@@ -84,7 +84,7 @@ spec:
         druid.auth.pac4j.oidc.clientSecret: '{"type":"environment","variable":"DRUID_CLIENT_SECRET"}'
         druid.auth.pac4j.oidc.discoveryURI: '${env:KEYCLOAK_DISCOVERY_URL}'
         # druid.auth.pac4j.oidc.oidcClaim: preferred_username  # setting doesn't work, but should?
-        
+
         druid.auth.authenticatorChain: '["MyBasicMetadataAuthenticator","pac4j"]'
 
         druid.escalator.type: basic
diff --git a/stacks/keycloak-opa-poc/hdfs.yaml b/stacks/keycloak-opa-poc/hdfs.yaml
index 5252196b..40d34d25 100644
--- a/stacks/keycloak-opa-poc/hdfs.yaml
+++ b/stacks/keycloak-opa-poc/hdfs.yaml
@@ -20,4 +20,4 @@ spec:
   journalNodes:
     roleGroups:
       default:
-        replicas: 1
\ No newline at end of file
+        replicas: 1
diff --git a/stacks/keycloak-opa-poc/opa.yaml b/stacks/keycloak-opa-poc/opa.yaml
index bbf66ea3..0d5df1c9 100644
--- a/stacks/keycloak-opa-poc/opa.yaml
+++ b/stacks/keycloak-opa-poc/opa.yaml
@@ -8,4 +8,4 @@ spec:
     productVersion: 0.57.0
   servers:
     roleGroups:
-      default: {}
\ No newline at end of file
+      default: {}
diff --git a/stacks/keycloak-opa-poc/zookeeper.yaml b/stacks/keycloak-opa-poc/zookeeper.yaml
index 48e864ee..0c133c90 100644
--- a/stacks/keycloak-opa-poc/zookeeper.yaml
+++ b/stacks/keycloak-opa-poc/zookeeper.yaml
@@ -25,4 +25,4 @@ metadata:
   name: hdfs-znode
 spec:
   clusterRef:
-    name: zk
\ No newline at end of file
+    name: zk
diff --git a/stacks/signal-processing/grafana.yaml b/stacks/signal-processing/grafana.yaml
index b98bfea7..b5b83a56 100644
--- a/stacks/signal-processing/grafana.yaml
+++ b/stacks/signal-processing/grafana.yaml
@@ -5,6 +5,8 @@ repo:
   url: https://grafana.github.io/helm-charts
 version: 6.56.1
 options:
+  extraLabels:
+    stackable.tech/vendor: Stackable
   grafana.ini:
     analytics:
       check_for_updates: false
diff --git a/stacks/signal-processing/jupyterhub.yaml b/stacks/signal-processing/jupyterhub.yaml
index 8b1eeb90..a3ab254b 100644
--- a/stacks/signal-processing/jupyterhub.yaml
+++ b/stacks/signal-processing/jupyterhub.yaml
@@ -14,6 +14,8 @@ options:
         password: {{ jupyterHubAdminPassword }}
       JupyterHub:
         authenticator_class: dummy
+    labels:
+      stackable.tech/vendor: Stackable
   proxy:
     service:
       type: NodePort
@@ -32,6 +34,8 @@ options:
     serviceAccountName: spark
     networkPolicy:
       enabled: false
+    extraLabels:
+      stackable.tech/vendor: Stackable
     initContainers:
       - name: download-notebook
         image: docker.stackable.tech/stackable/tools:1.0.0-stackable23.11.0
diff --git a/stacks/signal-processing/secrets.yaml b/stacks/signal-processing/secrets.yaml
index d2d41668..2265fb38 100644
--- a/stacks/signal-processing/secrets.yaml
+++ b/stacks/signal-processing/secrets.yaml
@@ -5,4 +5,4 @@ metadata:
   name: timescale-admin-credentials
 stringData:
   username: admin
-  password: {{ postgresAdminPassword }}
\ No newline at end of file
+  password: {{ postgresAdminPassword }}