diff --git a/charts/matrix-hookshot/Chart.yaml b/charts/matrix-hookshot/Chart.yaml
index 813d578..4f617f3 100644
--- a/charts/matrix-hookshot/Chart.yaml
+++ b/charts/matrix-hookshot/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: matrix-hookshot
-version: 0.0.4
+version: 0.0.5
 description: Chart for Matrix Hookshot
 keywords:
   - matrix
diff --git a/charts/matrix-hookshot/templates/deployment.yaml b/charts/matrix-hookshot/templates/deployment.yaml
index 932f110..4052ba2 100644
--- a/charts/matrix-hookshot/templates/deployment.yaml
+++ b/charts/matrix-hookshot/templates/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   name: matrix-hookshot
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-hookshot
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
@@ -27,7 +27,7 @@ spec:
       serviceAccountName: {{ .Release.Name }}
       automountServiceAccountToken: true
       containers:
-        - name: {{ .Release.Name }}
+        - name: matrix-hookshot
           image: "{{ .Values.deployment.image.repository }}:{{ .Values.deployment.image.tag }}"
           imagePullPolicy: {{ .Values.deployment.image.imagePullPolicy }}
           ports:
diff --git a/charts/matrix-hookshot/templates/ingress.yaml b/charts/matrix-hookshot/templates/ingress.yaml
index de7afc5..302178d 100644
--- a/charts/matrix-hookshot/templates/ingress.yaml
+++ b/charts/matrix-hookshot/templates/ingress.yaml
@@ -2,10 +2,10 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: "{{ .Release.Name }}-webhook"
+  name: matrix-hookshot-webhook
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: "{{ .Release.Name }}-webhook"
+    app.kubernetes.io/name: matrix-hookshot-webhook
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
@@ -36,10 +36,10 @@ spec:
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: "{{ .Release.Name }}-appservice"
+  name: matrix-hookshot-appservice
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: "{{ .Release.Name }}-appservice"
+    app.kubernetes.io/name: matrix-hookshot-appservice
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
diff --git a/charts/matrix-hookshot/templates/pod.yaml b/charts/matrix-hookshot/templates/pod.yaml
index 0b49715..80a3205 100644
--- a/charts/matrix-hookshot/templates/pod.yaml
+++ b/charts/matrix-hookshot/templates/pod.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 kind: Pod
 metadata:
-  name: "{{ .Release.Name }}-test-connection"
+  name: matrix-hookshot-test-connection
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-hookshot-test-connection
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
@@ -16,7 +16,7 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args: ['{{ .Release.Name }}:{{ .Values.service.webhook.port }}']
+      args: ['matrix-hookshot:{{ .Values.service.webhook.port }}']
       resources:
         limits:
           cpu: 500m
diff --git a/charts/matrix-hookshot/templates/service-account.yaml b/charts/matrix-hookshot/templates/service-account.yaml
index a437092..a1cf930 100644
--- a/charts/matrix-hookshot/templates/service-account.yaml
+++ b/charts/matrix-hookshot/templates/service-account.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ .Release.Name }}
+  name: matrix-hookshot
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-hookshot
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
diff --git a/charts/matrix-hookshot/templates/service.yaml b/charts/matrix-hookshot/templates/service.yaml
index 6913eee..3732da4 100644
--- a/charts/matrix-hookshot/templates/service.yaml
+++ b/charts/matrix-hookshot/templates/service.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Release.Name }}
+  name: matrix-hookshot
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-hookshot
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
@@ -25,5 +25,5 @@ spec:
       protocol: TCP
       name: appservice
   selector:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: matrix-hookshot
     app.kubernetes.io/instance: {{ .Release.Name }}