diff --git a/helm-chart/templates/04-hub-deployment.yaml b/helm-chart/templates/04-hub-deployment.yaml
index 507d014a2..79383b2c4 100644
--- a/helm-chart/templates/04-hub-deployment.yaml
+++ b/helm-chart/templates/04-hub-deployment.yaml
@@ -30,9 +30,9 @@ spec:
             {{ .Values.tap.debug | ternary "- -debug" "" }}
           envFrom:
             - configMapRef:
-                name: kubeshark-hub-config
+                name: kubeshark-config-map
             - secretRef:
-                name: kubeshark-hub-secret
+                name: kubeshark-secret
           image: '{{ .Values.tap.docker.registry }}/hub:{{ .Values.tap.docker.tag }}'
           imagePullPolicy: {{ .Values.tap.docker.imagepullpolicy }}
           readinessProbe:
diff --git a/helm-chart/templates/06-front-deployment.yaml b/helm-chart/templates/06-front-deployment.yaml
index 731941026..b7f934b44 100644
--- a/helm-chart/templates/06-front-deployment.yaml
+++ b/helm-chart/templates/06-front-deployment.yaml
@@ -59,6 +59,6 @@ spec:
       volumes:
         - name: nginx-config
           configMap:
-            name: kubeshark-nginx-config
+            name: kubeshark-nginx-config-map
       dnsPolicy: ClusterFirstWithHostNet
       serviceAccountName: {{ include "kubeshark.serviceAccountName" . }}
diff --git a/helm-chart/templates/09-worker-daemon-set.yaml b/helm-chart/templates/09-worker-daemon-set.yaml
index 8b40b29da..881b70387 100644
--- a/helm-chart/templates/09-worker-daemon-set.yaml
+++ b/helm-chart/templates/09-worker-daemon-set.yaml
@@ -42,7 +42,7 @@ spec:
           name: kubeshark-worker-daemon-set
           envFrom:
             - secretRef:
-                name: kubeshark-hub-secret
+                name: kubeshark-secret
         {{- if .Values.tap.debug }}
           env:
           - name: PROFILING_ENABLED
diff --git a/helm-chart/templates/12-nginx-config-map.yaml b/helm-chart/templates/12-nginx-config-map.yaml
index 706570424..0732122fb 100644
--- a/helm-chart/templates/12-nginx-config-map.yaml
+++ b/helm-chart/templates/12-nginx-config-map.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: kubeshark-nginx-config
+  name: kubeshark-nginx-config-map
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "kubeshark.labels" . | nindent 4 }}
diff --git a/helm-chart/templates/hub-config.yaml b/helm-chart/templates/13-config-map.yaml
similarity index 96%
rename from helm-chart/templates/hub-config.yaml
rename to helm-chart/templates/13-config-map.yaml
index 413bdd7cc..90492b738 100644
--- a/helm-chart/templates/hub-config.yaml
+++ b/helm-chart/templates/13-config-map.yaml
@@ -1,7 +1,7 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: kubeshark-hub-config
+  name: kubeshark-config-map
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubeshark.co/app: hub
diff --git a/helm-chart/templates/hub-secret.yaml b/helm-chart/templates/14-secret.yaml
similarity index 88%
rename from helm-chart/templates/hub-secret.yaml
rename to helm-chart/templates/14-secret.yaml
index 8f4731780..87c816035 100644
--- a/helm-chart/templates/hub-secret.yaml
+++ b/helm-chart/templates/14-secret.yaml
@@ -1,7 +1,7 @@
 kind: Secret
 apiVersion: v1
 metadata:
-  name: kubeshark-hub-secret
+  name: kubeshark-secret
   namespace: {{ .Release.Namespace }}
   labels:
     app.kubeshark.co/app: hub
diff --git a/manifests/complete.yaml b/manifests/complete.yaml
index c491e14a5..02000e369 100644
--- a/manifests/complete.yaml
+++ b/manifests/complete.yaml
@@ -13,11 +13,11 @@ metadata:
   name: kubeshark-service-account
   namespace: default
 ---
-# Source: kubeshark/templates/hub-secret.yaml
+# Source: kubeshark/templates/14-secret.yaml
 kind: Secret
 apiVersion: v1
 metadata:
-  name: kubeshark-hub-secret
+  name: kubeshark-secret
   namespace: default
   labels:
     app.kubeshark.co/app: hub
@@ -33,7 +33,7 @@ stringData:
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: kubeshark-nginx-config
+  name: kubeshark-nginx-config-map
   namespace: default
   labels:
     helm.sh/chart: kubeshark-41.7
@@ -59,11 +59,11 @@ data:
       }
     }
 ---
-# Source: kubeshark/templates/hub-config.yaml
+# Source: kubeshark/templates/13-config-map.yaml
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: kubeshark-hub-config
+  name: kubeshark-config-map
   namespace: default
   labels:
     app.kubeshark.co/app: hub
@@ -233,7 +233,7 @@ spec:
           name: kubeshark-worker-daemon-set
           envFrom:
             - secretRef:
-                name: kubeshark-hub-secret
+                name: kubeshark-secret
           resources:
             limits:
               cpu: 750m
@@ -330,9 +330,9 @@ spec:
             
           envFrom:
             - configMapRef:
-                name: kubeshark-hub-config
+                name: kubeshark-config-map
             - secretRef:
-                name: kubeshark-hub-secret
+                name: kubeshark-secret
           image: 'docker.io/kubeshark/hub:latest'
           imagePullPolicy: Always
           readinessProbe:
@@ -416,6 +416,6 @@ spec:
       volumes:
         - name: nginx-config
           configMap:
-            name: kubeshark-nginx-config
+            name: kubeshark-nginx-config-map
       dnsPolicy: ClusterFirstWithHostNet
       serviceAccountName: kubeshark-service-account