diff --git a/charts/homepage/Chart.yaml b/charts/homepage/Chart.yaml
index fd299d7..38e82dc 100644
--- a/charts/homepage/Chart.yaml
+++ b/charts/homepage/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: homepage
-version: 0.0.6
+version: 0.0.7
 description: Chart for benphelps homepage
 keywords:
   - dashboard
diff --git a/charts/homepage/templates/cluster-role-binding.yaml b/charts/homepage/templates/cluster-role-binding.yaml
index 6bfc0b0..0c27f64 100644
--- a/charts/homepage/templates/cluster-role-binding.yaml
+++ b/charts/homepage/templates/cluster-role-binding.yaml
@@ -1,18 +1,18 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: homepage
+  name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: homepage
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: homepage
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: homepage
+  name: {{ .Release.Name }}
 subjects:
   - kind: ServiceAccount
     name: homepage
diff --git a/charts/homepage/templates/cluster-role.yaml b/charts/homepage/templates/cluster-role.yaml
index 25563fb..c71cb25 100644
--- a/charts/homepage/templates/cluster-role.yaml
+++ b/charts/homepage/templates/cluster-role.yaml
@@ -1,14 +1,14 @@
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
-  name: homepage
+  name: {{ .Release.Name }}
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: homepage
+    app.kubernetes.io/name: {{ .Release.Name }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
-    app.kubernetes.io/part-of: homepage
+    app.kubernetes.io/part-of: {{ .Release.Name }}
 rules:
   - apiGroups:
       - ""