diff --git a/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-metastore.yaml.ftl b/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-metastore.yaml.ftl
index 9d203935..5ef912eb 100644
--- a/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-metastore.yaml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-metastore.yaml.ftl
@@ -45,6 +45,8 @@ spec:
         env:
           - name: "SERVICE_NAME"
             value: "metastore"
+          - name: HADOOP_CONF_DIR
+            value: /opt/edp/${service.serviceName}/conf
           - name: "HIVE_CONF_DIR"
             value: "/opt/edp/${service.serviceName}/conf"
           - name: MEM_LIMIT
diff --git a/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-server2.yaml.ftl b/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-server2.yaml.ftl
index cc606861..11f871a7 100644
--- a/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-server2.yaml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/hive/k8s/hive-server2.yaml.ftl
@@ -45,6 +45,8 @@ spec:
         env:
           - name: "SERVICE_NAME"
             value: "server2"
+          - name: HADOOP_CONF_DIR
+            value: /opt/edp/${service.serviceName}/conf
           - name: "HIVE_CONF_DIR"
             value: "/opt/edp/${service.serviceName}/conf"
           - name: MEM_LIMIT
diff --git a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-historyserver.yaml.ftl b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-historyserver.yaml.ftl
index 3ebed987..8aca5f19 100644
--- a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-historyserver.yaml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-historyserver.yaml.ftl
@@ -65,6 +65,8 @@ spec:
             memory: "${conf['hadop.yarn.hs.container.limit.memory']}Mi"
             cpu: "${conf['hadop.yarn.hs.container.limit.cpu']}"
         env:
+          - name: HADOOP_CONF_DIR
+            value: /opt/edp/${service.serviceName}/conf
           - name: MEM_LIMIT
             valueFrom:
               resourceFieldRef:
diff --git a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-nodemanager.yaml.ftl b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-nodemanager.yaml.ftl
index ec56cd3e..3b32b015 100644
--- a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-nodemanager.yaml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-nodemanager.yaml.ftl
@@ -69,6 +69,8 @@ spec:
             valueFrom:
               resourceFieldRef:
                 resource: limits.memory
+          - name: HADOOP_CONF_DIR
+            value: /opt/edp/${service.serviceName}/conf
           - name: yarnHeapRam
             value: "${conf['yarn.nodemanager.heap.memory']}"
         securityContext:
diff --git a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-resourcemanager.yaml.ftl b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-resourcemanager.yaml.ftl
index ecaf621f..2eaeb05e 100644
--- a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-resourcemanager.yaml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-resourcemanager.yaml.ftl
@@ -65,6 +65,8 @@ spec:
             memory: "${conf['hadop.yarn.rm.container.limit.memory']}Mi"
             cpu: "${conf['hadop.yarn.rm.container.limit.cpu']}"
         env:
+          - name: HADOOP_CONF_DIR
+            value: /opt/edp/${service.serviceName}/conf
           - name: MEM_LIMIT
             valueFrom:
               resourceFieldRef:
diff --git a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-timelineserver.yaml.ftl b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-timelineserver.yaml.ftl
index 8bc7b3b7..527a9dfc 100644
--- a/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-timelineserver.yaml.ftl
+++ b/cloudeon-stack/EDP-1.0.0/yarn/k8s/hadoop-yarn-timelineserver.yaml.ftl
@@ -61,6 +61,8 @@ spec:
             memory: "${conf['hadop.yarn.tl.container.limit.memory']}Mi"
             cpu: "${conf['hadop.yarn.tl.container.limit.cpu']}"
         env:
+          - name: HADOOP_CONF_DIR
+            value: /opt/edp/${service.serviceName}/conf
           - name: MEM_LIMIT
             valueFrom:
               resourceFieldRef: