diff --git a/.github/workflows/helm-lint-and-test.yml b/.github/workflows/helm-lint-and-test.yml
index 54ba51d..49c7ac2 100644
--- a/.github/workflows/helm-lint-and-test.yml
+++ b/.github/workflows/helm-lint-and-test.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           # this might remove tools that are actually needed,
           # if set to "true" but frees about 6 GB
-          tool-cache: true
+          tool-cache: false
           # all of these default to true, but feel free to set to
           # "false" if necessary for your workflow
           android: true
@@ -57,7 +57,7 @@ jobs:
       - name: k3s install + add more swap
         run: |
           curl -sfL https://get.k3s.io | K3S_KUBECONFIG_MODE="644" sh -
-          sudo dd if=/dev/zero of=/swapfile bs=1M count=8k status=progress
+          sudo dd if=/dev/zero of=/swapfile bs=1M count=4k status=progress
           sudo chmod 0600 /swapfile
           sudo mkswap /swapfile
           sudo swapon /swapfile
diff --git a/mviewer/templates/elasticsearch-svc.yaml b/mviewer/templates/elasticsearch-svc.yaml
index 10d9780..9961f44 100644
--- a/mviewer/templates/elasticsearch-svc.yaml
+++ b/mviewer/templates/elasticsearch-svc.yaml
@@ -12,5 +12,5 @@ spec:
       targetPort: elasticsearch
   selector:
     {{- include "mviewer.selectorLabels" . | nindent 4 }}
-    app: mviewer-elasticsearch
+    app.kubernetes.io/component: {{ include "mviewer.fullname" . }}-elasticsearch
 {{- end }}
diff --git a/mviewer/templates/mviewer-deployment.yaml b/mviewer/templates/mviewer-deployment.yaml
index d0e7a1c..1222700 100644
--- a/mviewer/templates/mviewer-deployment.yaml
+++ b/mviewer/templates/mviewer-deployment.yaml
@@ -11,7 +11,7 @@ spec:
   selector:
     matchLabels:
       {{- include "mviewer.selectorLabels" . | nindent 6 }}
-      app: mviewer
+      app.kubernetes.io/component: {{ include "mviewer.fullname" . }}-mviewer
   template:
     metadata:
       {{- with $webapp.podAnnotations }}
diff --git a/mviewer/templates/mviewer-svc.yaml b/mviewer/templates/mviewer-svc.yaml
index 4531a4d..6b432ca 100644
--- a/mviewer/templates/mviewer-svc.yaml
+++ b/mviewer/templates/mviewer-svc.yaml
@@ -11,4 +11,4 @@ spec:
       targetPort: http
   selector:
     {{- include "mviewer.selectorLabels" . | nindent 4 }}
-    app: mviewer
+    app.kubernetes.io/component: {{ include "mviewer.fullname" . }}-mviewer
\ No newline at end of file
diff --git a/mviewer/templates/mviewerstudio-svc.yaml b/mviewer/templates/mviewerstudio-svc.yaml
index 77fef66..765d452 100644
--- a/mviewer/templates/mviewerstudio-svc.yaml
+++ b/mviewer/templates/mviewerstudio-svc.yaml
@@ -11,4 +11,4 @@ spec:
       targetPort: http
   selector:
     {{- include "mviewer.selectorLabels" . | nindent 4 }}
-    app: mviewerstudio
+    app.kubernetes.io/component: {{ include "mviewer.fullname" . }}-mviewerstudio