diff --git a/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/templates/job-pre-apply-cleanup.yaml b/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/templates/job-pre-apply-cleanup.yaml
new file mode 100644
index 0000000..b08bb79
--- /dev/null
+++ b/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/templates/job-pre-apply-cleanup.yaml
@@ -0,0 +1,10 @@
+{{/*
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+*/}}
+
+{{- if .Values.manifests.job_pre_apply_cleanup }}
+{{- $preApplyCleanupJob := dict "envAll" . "serviceName" "fm-rest-api" -}}
+{{ $preApplyCleanupJob | include "helm-toolkit.manifests.job_pre_apply_cleanup" }}
+{{- end }}
\ No newline at end of file
diff --git a/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml b/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml
index e546bf2..a860569 100644
--- a/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml
+++ b/fm-rest-api/fm-rest-api/helm-charts/fm-rest-api/values.yaml
@@ -25,6 +25,7 @@ images:
     db_init: docker.io/starlingx/stx-heat:master-centos-stable-latest
     db_drop: docker.io/starlingx/stx-heat:master-centos-stable-latest
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
+    pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest
   pullPolicy: IfNotPresent
   local_registry:
     active: false
@@ -183,6 +184,7 @@ manifests:
   configmap_etc: true
   deployment_fm_rest_api: true
   ingress: true
+  job_pre_apply_cleanup: true
   job_ks_endpoints: true
   job_db_init: true
   job_db_sync: true