diff --git a/omec/omec-control-plane/Chart.yaml b/omec/omec-control-plane/Chart.yaml
index a0aac72..f678e2f 100644
--- a/omec/omec-control-plane/Chart.yaml
+++ b/omec/omec-control-plane/Chart.yaml
@@ -10,4 +10,4 @@
 name: omec-control-plane
 icon: https://guide.opencord.org/logos/cord.svg
 
-version: 0.4.0
+version: 0.5.0
diff --git a/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl b/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
index 443b3c2..a6e67d8 100644
--- a/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
+++ b/omec/omec-control-plane/templates/bin/_hss-bootstrap.sh.tpl
@@ -85,6 +85,12 @@
     echo -e "Added mme $id\n"
 }
 
+until cqlsh --file /opt/c3po/hssdb/oai_db.cql {{ .Values.config.hss.hssdb }};
+    do echo "Provisioning HSSDB";
+    sleep 2;
+done
+
+{{- if .Values.config.hss.bootstrap.enabled }}
 {{- range .Values.config.hss.bootstrap.users }}
 provision_users \
     {{ .count }} \
@@ -122,3 +128,5 @@
     {{ .unreachability }} \
     {{ $.Values.config.hss.hssdb }}
 {{- end }}
+{{- end }}
+
diff --git a/omec/omec-control-plane/templates/job-hss-bootstrap.yaml b/omec/omec-control-plane/templates/job-hss-bootstrap.yaml
deleted file mode 100644
index 3855495..0000000
--- a/omec/omec-control-plane/templates/job-hss-bootstrap.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-{{/*
-# Copyright 2019-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- if .Values.config.hss.deploy }}
-{{- if .Values.config.hss.bootstrap }}
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: job-hss-bootstrap
-  labels:
-{{ tuple "hss" . | include "omec-control-plane.metadata_labels" | indent 4 }}
-spec:
-  template:
-    metadata:
-{{ tuple "hss" . | include "omec-control-plane.metadata_labels" | indent 8 }}
-    spec:
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.hss.label }}: {{ .Values.nodeSelectors.hss.value }}
-    {{- end }}
-      restartPolicy: OnFailure
-      serviceAccountName: hss
-      initContainers:
-      - name: job-bootstrap-dep-check
-        image: {{ .Values.images.tags.depCheck | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        securityContext:
-          allowPrivilegeEscalation: false
-          readOnlyRootFilesystem: false
-          runAsUser: 0
-        env:
-          - name: NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
-          - name: PATH
-            value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/
-          - name: COMMAND
-            value: "echo done"
-          - name: DEPENDENCY_JOBS
-            value: job-hss-db-sync
-        command:
-          - kubernetes-entrypoint
-        volumeMounts:
-          []
-      containers:
-      - name: hss-bootstrap
-        image: {{ .Values.images.tags.hssdb }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        command: ["/opt/c3po/hss/hss-bootstrap.sh"]
-        volumeMounts:
-        - name: hss-script
-          mountPath: /opt/c3po/hss/hss-bootstrap.sh
-          subPath: hss-bootstrap.sh
-      volumes:
-      - name: hss-script
-        configMap:
-          name: hss
-          defaultMode: 493
-{{- end }}
-{{- end }}
diff --git a/omec/omec-control-plane/templates/job-hss-db-sync.yaml b/omec/omec-control-plane/templates/job-hss-db-sync.yaml
deleted file mode 100644
index b1396b0..0000000
--- a/omec/omec-control-plane/templates/job-hss-db-sync.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-{{/*
-# Copyright 2019-present Open Networking Foundation
-
-# SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
-*/}}
-
-{{- if .Values.config.hss.deploy }}
----
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: job-hss-db-sync
-  labels:
-{{ tuple "hss" . | include "omec-control-plane.metadata_labels" | indent 4 }}
-spec:
-  template:
-    metadata:
-{{ tuple "hss" . | include "omec-control-plane.metadata_labels" | indent 8 }}
-    spec:
-    {{- if .Values.nodeSelectors.enabled }}
-      nodeSelector:
-        {{ .Values.nodeSelectors.hss.label }}: {{ .Values.nodeSelectors.hss.value }}
-    {{- end }}
-      restartPolicy: OnFailure
-      serviceAccountName: hss
-      initContainers:
-    {{- if .Values.cassandra.deploy }}
-      - name: job-db-sync-dep-check
-        image: {{ .Values.images.tags.depCheck | quote }}
-        imagePullPolicy: {{ .Values.images.pullPolicy }}
-        securityContext:
-          allowPrivilegeEscalation: false
-          readOnlyRootFilesystem: false
-          runAsUser: 0
-        env:
-          - name: NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
-          - name: PATH
-            value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/
-          - name: COMMAND
-            value: "echo done"
-          - name: DEPENDENCY_SERVICE
-            value: {{ .Values.config.hss.hssdb }}
-        command:
-          - kubernetes-entrypoint
-        volumeMounts:
-          []
-    {{- end }}
-      containers:
-        - name: hss-db-sync
-          image: {{ .Values.images.tags.hssdb }}
-          imagePullPolicy: {{ .Values.images.pullPolicy }}
-          command: ["bash", "-xc"]
-          args:
-            - until cqlsh --file /opt/c3po/hssdb/oai_db.cql {{ .Values.config.hss.hssdb }}; do echo "Provisioning HSSDB"; sleep 2;done
-{{- end }}
diff --git a/omec/omec-control-plane/templates/statefulset-hss.yaml b/omec/omec-control-plane/templates/statefulset-hss.yaml
index 709274d..cedd809 100644
--- a/omec/omec-control-plane/templates/statefulset-hss.yaml
+++ b/omec/omec-control-plane/templates/statefulset-hss.yaml
@@ -38,33 +38,14 @@
     {{- end }}
       serviceAccountName: hss
       initContainers:
-      - name: hss-dep-check
-        image: {{ .Values.images.tags.depCheck | quote }}
+      - name: hss-bootstrap
+        image: {{ .Values.images.tags.hssdb }}
         imagePullPolicy: {{ .Values.images.pullPolicy }}
-        securityContext:
-          allowPrivilegeEscalation: false
-          readOnlyRootFilesystem: false
-          runAsUser: 0
-        env:
-          - name: NAMESPACE
-            valueFrom:
-              fieldRef:
-                apiVersion: v1
-                fieldPath: metadata.namespace
-          - name: PATH
-            value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/
-          - name: COMMAND
-            value: "echo done"
-          - name: DEPENDENCY_JOBS
-          {{- if .Values.config.hss.bootstrap }}
-            value: job-hss-db-sync,job-hss-bootstrap
-          {{- else }}
-            value: job-hss-db-sync
-          {{- end }}
-        command:
-          - kubernetes-entrypoint
+        command: ["/opt/c3po/hss/hss-bootstrap.sh"]
         volumeMounts:
-          []
+        - name: hss-script
+          mountPath: /opt/c3po/hss/hss-bootstrap.sh
+          subPath: hss-bootstrap.sh
     {{- if .Values.config.coreDump.enabled }}
 {{ tuple "hss" . | include "omec-control-plane.coredump_init" | indent 6 }}
     {{- end }}