diff --git a/helmchart/single-sign-on/templates/job-create-admin-user.yaml b/helmchart/single-sign-on/templates/job-create-admin-user.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..89542074255baaa3b5e856811d0b914dbdf61837
--- /dev/null
+++ b/helmchart/single-sign-on/templates/job-create-admin-user.yaml
@@ -0,0 +1,36 @@
+apiVersion: batch/v1
+kind: Job
+metadata:
+  name: {{ include "single-sign-on.fullname" . }}-create-admin-user
+  labels:
+{{ include "single-sign-on.labels" . | indent 4 }}
+  annontations:
+    "helm.sh/hook": post-install
+    "helm.sh/hook-weight": "-5"
+    "helm.sh/hook-delete-policy": hook-succeeded
+spec:
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/managed-by: {{.Release.Service | quote }}
+        app.kubernetes.io/instance: {{.Release.Name | quote }}
+        helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
+    spec:
+      restartPolicy: Never
+      containers:
+      - name: create-admin-user
+        image: "open.greenhost.net:4567/openappstack/user-panel/backend:minimal-frontend"
+        env:
+        - name: USERNAME
+          value: {{ .Values.userbackend.username }}
+        - name: PASSWORD
+          value: {{ .Values.userbackend.password }}
+        - name: EMAIL
+          value: {{ .Values.userbackend.email }}
+        command: ["/bin/bash", "-c"]
+        args:
+        - /bin/bash ./utils/create-user.bash $USERNAME "$PASSWORD" $EMAIL {{ include "single-sign-on.fullname" . }}-userbackend 80 &&
+          /bin/bash ./utils/create-role.bash admin {{ include "single-sign-on.fullname" . }}-userbackend 80 &&
+          /bin/bash ./utils/create-application.bash user-panel {{ include "single-sign-on.fullname" . }}-userbackend 80 &&
+          /bin/bash ./utils/assign-role.bash $USERNAME admin {{ include "single-sign-on.fullname" . }}-userbackend 80 &&
+          /bin/bash ./utils/grant-access.bash $USERNAME user-panel {{ include "single-sign-on.fullname" . }}-userbackend 80
diff --git a/helmchart/single-sign-on/templates/job-create-user-panel-user.yaml b/helmchart/single-sign-on/templates/job-create-user-panel-user.yaml
deleted file mode 100644
index d943c841dcf9d58aafbd573b13c8e9ccf39103d7..0000000000000000000000000000000000000000
--- a/helmchart/single-sign-on/templates/job-create-user-panel-user.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: {{ include "single-sign-on.fullname" . }}-create-user-job
-  labels:
-{{ include "single-sign-on.labels" . | indent 4 }}
-  annontations:
-    "helm.sh/hook": post-install
-    "helm.sh/hook-weight": "-5"
-    "helm.sh/hook-delete-policy": hook-succeeded
-spec:
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/managed-by: {{.Release.Service | quote }}
-        app.kubernetes.io/instance: {{.Release.Name | quote }}
-        helm.sh/chart: "{{.Chart.Name}}-{{.Chart.Version}}"
-    spec:
-      restartPolicy: Never
-      containers:
-      - name: create-initial-user-job
-        image: "open.greenhost.net:4567/openappstack/user-panel/backend:minimal-frontend"
-        env:
-        - name: USERNAME
-          value: oas_admin
-        - name: PASSWORD
-          value: secret
-        - name: EMAIL
-          value: oas_admin@example.net
-        command: ["/bin/bash", "-c"]
-        args:
-        - /bin/bash ./utils/create-user.sh $USERNAME $PASSWORD $EMAIL {{ include "single-sign-on.fullname" . }}-userbackend 80 &&
-          /bin/bash ./utils/create-role.sh admin {{ include "single-sign-on.fullname" . }}-userbackend 80 &&
-          /bin/bash ./utils/create-application.sh user-panel {{ include "single-sign-on.fullname" . }}-userbackend 80 &&
-          /bin/bash ./utils/assign-role.sh $USERNAME admin {{ include "single-sign-on.fullname" . }}-userbackend 80 &&
-          /bin/bash ./utils/grant-access.sh $USERNAME user-panel {{ include "single-sign-on.fullname" . }}-userbackend 80
diff --git a/helmchart/single-sign-on/templates/service-userpanel-frontend.yaml b/helmchart/single-sign-on/templates/service-userfrontend.yaml
similarity index 62%
rename from helmchart/single-sign-on/templates/service-userpanel-frontend.yaml
rename to helmchart/single-sign-on/templates/service-userfrontend.yaml
index 14f4d6a1bf0a9370d3d66ffc3630d88af69104db..0dc90890884bddf613807a0964e0c3eda21ee20d 100644
--- a/helmchart/single-sign-on/templates/service-userpanel-frontend.yaml
+++ b/helmchart/single-sign-on/templates/service-userfrontend.yaml
@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "single-sign-on.fullname" . }}-userpanel-frontend
+  name: {{ include "single-sign-on.fullname" . }}-userpanel
   labels:
 {{ include "single-sign-on.labels" . | indent 4 }}
 spec:
   ports:
     - port: 3000
-      targetPort: frontend
+      targetPort: userpanel
       protocol: TCP
-      name: frontend
+      name: userpanel
   selector:
-    app.kubernetes.io/name: {{ include "single-sign-on.name" . }}-userpanel-frontend
+    app.kubernetes.io/name: {{ include "single-sign-on.name" . }}-userpanel