diff --git a/logging/opendistro_setting/templates/configmap-script.yml b/logging/opendistro_setting/templates/configmap-script.yml
index cf9a15c..77715c7 100644
--- a/logging/opendistro_setting/templates/configmap-script.yml
+++ b/logging/opendistro_setting/templates/configmap-script.yml
@@ -19,6 +19,11 @@
     setting_dir=${SETTING_DIR}
     temp_dir=${OUTPUT_DIR:-/opendistro_temp}
 
+    cleanup() {
+      echo "Cleaning up..."
+      exit
+    }
+
     #return destination id if exist
     check_destination() { name=$1
         curl -s -H "content-type: application/json" "$host/_opendistro/_alerting/destinations" | jq -r ".destinations[] | select(.name == \"$name\").id"
@@ -150,4 +155,5 @@
       handle_monitor
     fi
 
-    exit 0
+    trap cleanup INT TERM
+    sleep infinity
diff --git a/logging/opendistro_setting/templates/job.yml b/logging/opendistro_setting/templates/deployment.yml
similarity index 94%
rename from logging/opendistro_setting/templates/job.yml
rename to logging/opendistro_setting/templates/deployment.yml
index 609d6a7..b1e43f4 100644
--- a/logging/opendistro_setting/templates/job.yml
+++ b/logging/opendistro_setting/templates/deployment.yml
@@ -1,18 +1,20 @@
 # Copyright 2020-present Open Networking Foundation
 # SPDX-License-Identifier: LicenseRef-ONF-Member-Only-1.0
 
-apiVersion: batch/v1
-kind: Job
+apiVersion: apps/v1
+kind: Deployment
 metadata:
   name: "{{ .Release.Name }}"
 spec:
-  backoffLimit: 4
-  activeDeadlineSeconds: 100
+  replicas: 1
+  selector:
+    matchLabels:
+      app: opendistro-config
   template:
     metadata:
-      name: "{{ .Release.Name }}"
+      labels:
+        app: opendistro-config
     spec:
-      restartPolicy: OnFailure
       containers:
         - name: config
           image: opennetworking/utils:jq-kubectl-curl