diff --git a/config.yaml.template b/config.yaml.template
index d8fa574..8b50da5 100644
--- a/config.yaml.template
+++ b/config.yaml.template
@@ -52,6 +52,15 @@ telemetry:
     oc_cli_path: $TELEMETRY_CLI_PATH                             # optional, if not specified will be search in $PATH
     events_backup: $TELEMETRY_EVENTS_BACKUP
 
-elastic: 
-    elastic_url: $ELASTIC_SERVER
-    elastic_index: $ELASTIC_INDEX
+elastic:
+    enable_elastic: $ENABLE_ES
+    collect_metrics: $ES_COLLECT_METRICS
+    collect_alerts: $ES_COLLECT_ALERTS
+    verify_certs: $ES_VERIFY_CERTS
+    elastic_url: "$ES_SERVER"                                         # To track results in elasticsearch, give url to server here; will post telemetry details when url and index not blank
+    elastic_port: $ES_PORT
+    username: "$ES_USERNAME"
+    password: "$ES_PASSWORD"
+    metrics_index: "$ES_METRICS_INDEX"
+    alerts_index: "$ES_ALERTS_INDEX"
+    telemetry_index: "$ES_TELEMETRY_INDEX"
\ No newline at end of file
diff --git a/env.sh b/env.sh
index dda4cca..d91b861 100755
--- a/env.sh
+++ b/env.sh
@@ -17,7 +17,22 @@ export DEPLOY_DASHBOARDS=${DEPLOY_DASHBOARDS:=False}
 export CAPTURE_METRICS=${CAPTURE_METRICS:=False}
 export ENABLE_ALERTS=${ENABLE_ALERTS:=False}
 export ALERTS_PATH=${ALERTS_PATH:=config/alerts.yaml}
-export ES_SERVER=${ES_SERVER:=http://0.0.0.0:9200}
+
+
+export ENABLE_ES=${ENABLE_ES:=False}
+export ES_SERVER=${ES_SERVER:=http://0.0.0.0}
+export ES_PORT=${ES_PORT:=443}
+export ES_COLLECT_METRICS=${ES_COLLECT_METRICS:=False}
+export ES_COLLECT_ALERTS=${ES_COLLECT_ALERTS:=False}
+export ES_USERNAME=${ES_USERNAME:=elastic}
+export ES_PASSWORD=${ES_PASSWORD}
+export ES_VERIFY_CERTS=${ES_VERIFY_CERTS:=False}
+
+export ES_METRICS_INDEX=${ES_METRICS_INDEX:=krkn-metrics}
+export ES_ALERTS_INDEX=${ES_ALERTS_INDEX:=krkn-alerts}
+export ES_TELEMETRY_INDEX=${ES_TELEMETRY_INDEX:=krkn-telemetry}
+
+
 export CHECK_CRITICAL_ALERTS=${CHECK_CRITICAL_ALERTS:=False}
 export KUBE_BURNER_URL=${KUBE_BURNER_URL:=https://github.com/cloud-bulldozer/kube-burner/releases/download/v1.7.0/kube-burner-1.7.0-Linux-x86_64.tar.gz}
 export TELEMETRY_ENABLED=${TELEMETRY_ENABLED:=False}