diff --git a/charts/lagoon-remote/templates/ssh-portal.clusterrole.yaml b/charts/lagoon-remote/templates/ssh-portal.clusterrole.yaml
index f3070b64..92df849d 100644
--- a/charts/lagoon-remote/templates/ssh-portal.clusterrole.yaml
+++ b/charts/lagoon-remote/templates/ssh-portal.clusterrole.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.sshPortal.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -42,4 +41,3 @@ rules:
   - pods/exec
   verbs:
   - create
-{{- end }}
diff --git a/charts/lagoon-remote/templates/ssh-portal.clusterrolebinding.yaml b/charts/lagoon-remote/templates/ssh-portal.clusterrolebinding.yaml
index 23421e6b..c0d78076 100644
--- a/charts/lagoon-remote/templates/ssh-portal.clusterrolebinding.yaml
+++ b/charts/lagoon-remote/templates/ssh-portal.clusterrolebinding.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.sshPortal.enabled -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
@@ -13,4 +12,3 @@ roleRef:
   kind: ClusterRole
   name: {{ include "lagoon-remote.sshPortal.fullname" . }}
   apiGroup: rbac.authorization.k8s.io
-{{- end }}
diff --git a/charts/lagoon-remote/templates/ssh-portal.serviceaccount.secret.yaml b/charts/lagoon-remote/templates/ssh-portal.serviceaccount.secret.yaml
new file mode 100644
index 00000000..e805a8c2
--- /dev/null
+++ b/charts/lagoon-remote/templates/ssh-portal.serviceaccount.secret.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+type: kubernetes.io/service-account-token
+metadata:
+  name: {{ include "lagoon-remote.sshPortal.fullname" . }}-token
+  labels:
+    {{- include "lagoon-remote.sshPortal.labels" . | nindent 4 }}
+  annotations:
+    kubernetes.io/service-account.name: {{ include "lagoon-remote.sshPortal.serviceAccountName" . }}
diff --git a/charts/lagoon-remote/templates/ssh-portal.serviceaccount.yaml b/charts/lagoon-remote/templates/ssh-portal.serviceaccount.yaml
index 1333475d..54f6e97f 100644
--- a/charts/lagoon-remote/templates/ssh-portal.serviceaccount.yaml
+++ b/charts/lagoon-remote/templates/ssh-portal.serviceaccount.yaml
@@ -1,4 +1,3 @@
-{{- if .Values.sshPortal.enabled -}}
 apiVersion: v1
 kind: ServiceAccount
 metadata:
@@ -9,4 +8,3 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-{{- end }}