diff --git a/docker/elasticsearch/Dockerfile b/docker/elasticsearch/Dockerfile
index 644f031c..35ba6880 100644
--- a/docker/elasticsearch/Dockerfile
+++ b/docker/elasticsearch/Dockerfile
@@ -1,2 +1,2 @@
-FROM docker.elastic.co/elasticsearch/elasticsearch:7.8.0
+FROM docker.elastic.co/elasticsearch/elasticsearch:7.16.2
 RUN /usr/share/elasticsearch/bin/elasticsearch-plugin install --batch repository-s3
diff --git a/helm-charts/elk/Chart.yaml b/helm-charts/elk/Chart.yaml
index a0bcbc6c..8c110d73 100644
--- a/helm-charts/elk/Chart.yaml
+++ b/helm-charts/elk/Chart.yaml
@@ -1,6 +1,6 @@
 name: elastic-stack
-version: 0.0.1
-appVersion: 7.8.0
+version: 0.1.0
+appVersion: 7.16.2
 description: Elasticsearch stack
 keywords:
 - elasticsearch
@@ -9,4 +9,3 @@ keywords:
 - logstash
 - metricbeat
 - apm
-
diff --git a/helm-charts/elk/charts/apm-server-7.16.2.tgz b/helm-charts/elk/charts/apm-server-7.16.2.tgz
new file mode 100644
index 00000000..ba314df3
Binary files /dev/null and b/helm-charts/elk/charts/apm-server-7.16.2.tgz differ
diff --git a/helm-charts/elk/charts/apm-server-7.8.0.tgz b/helm-charts/elk/charts/apm-server-7.8.0.tgz
deleted file mode 100644
index b827bec1..00000000
Binary files a/helm-charts/elk/charts/apm-server-7.8.0.tgz and /dev/null differ
diff --git a/helm-charts/elk/charts/elasticsearch-7.16.2.tgz b/helm-charts/elk/charts/elasticsearch-7.16.2.tgz
new file mode 100644
index 00000000..39362cd3
Binary files /dev/null and b/helm-charts/elk/charts/elasticsearch-7.16.2.tgz differ
diff --git a/helm-charts/elk/charts/elasticsearch-7.8.0.tgz b/helm-charts/elk/charts/elasticsearch-7.8.0.tgz
deleted file mode 100644
index 811c385a..00000000
Binary files a/helm-charts/elk/charts/elasticsearch-7.8.0.tgz and /dev/null differ
diff --git a/helm-charts/elk/charts/filebeat-7.16.2.tgz b/helm-charts/elk/charts/filebeat-7.16.2.tgz
new file mode 100644
index 00000000..c6bc91ca
Binary files /dev/null and b/helm-charts/elk/charts/filebeat-7.16.2.tgz differ
diff --git a/helm-charts/elk/charts/filebeat-7.8.0.tgz b/helm-charts/elk/charts/filebeat-7.8.0.tgz
deleted file mode 100644
index eab2e440..00000000
Binary files a/helm-charts/elk/charts/filebeat-7.8.0.tgz and /dev/null differ
diff --git a/helm-charts/elk/charts/kibana-7.16.2.tgz b/helm-charts/elk/charts/kibana-7.16.2.tgz
new file mode 100644
index 00000000..ea0ac698
Binary files /dev/null and b/helm-charts/elk/charts/kibana-7.16.2.tgz differ
diff --git a/helm-charts/elk/charts/kibana-7.8.0.tgz b/helm-charts/elk/charts/kibana-7.8.0.tgz
deleted file mode 100644
index a602e0fa..00000000
Binary files a/helm-charts/elk/charts/kibana-7.8.0.tgz and /dev/null differ
diff --git a/helm-charts/elk/charts/logstash-7.16.2.tgz b/helm-charts/elk/charts/logstash-7.16.2.tgz
new file mode 100644
index 00000000..ad8659ed
Binary files /dev/null and b/helm-charts/elk/charts/logstash-7.16.2.tgz differ
diff --git a/helm-charts/elk/charts/logstash-7.8.0.tgz b/helm-charts/elk/charts/logstash-7.8.0.tgz
deleted file mode 100644
index a642a87f..00000000
Binary files a/helm-charts/elk/charts/logstash-7.8.0.tgz and /dev/null differ
diff --git a/helm-charts/elk/charts/metricbeat-7.16.2.tgz b/helm-charts/elk/charts/metricbeat-7.16.2.tgz
new file mode 100644
index 00000000..e0e3d7dd
Binary files /dev/null and b/helm-charts/elk/charts/metricbeat-7.16.2.tgz differ
diff --git a/helm-charts/elk/charts/metricbeat-7.8.0.tgz b/helm-charts/elk/charts/metricbeat-7.8.0.tgz
deleted file mode 100644
index 3d3bd1f3..00000000
Binary files a/helm-charts/elk/charts/metricbeat-7.8.0.tgz and /dev/null differ
diff --git a/helm-charts/elk/requirements.lock b/helm-charts/elk/requirements.lock
index ed60832a..a030af48 100644
--- a/helm-charts/elk/requirements.lock
+++ b/helm-charts/elk/requirements.lock
@@ -1,21 +1,21 @@
 dependencies:
 - name: elasticsearch
   repository: https://helm.elastic.co
-  version: 7.8.0
+  version: 7.16.2
 - name: filebeat
   repository: https://helm.elastic.co
-  version: 7.8.0
+  version: 7.16.2
 - name: kibana
   repository: https://helm.elastic.co
-  version: 7.8.0
+  version: 7.16.2
 - name: logstash
   repository: https://helm.elastic.co
-  version: 7.8.0
+  version: 7.16.2
 - name: metricbeat
   repository: https://helm.elastic.co
-  version: 7.8.0
+  version: 7.16.2
 - name: apm-server
   repository: https://helm.elastic.co
-  version: 7.8.0
-digest: sha256:93d6018bc284e28a64311a40359056708699afabf81c53731b64aa2e30662a6d
-generated: "2020-07-17T20:50:28.177348+06:00"
+  version: 7.16.2
+digest: sha256:c224fbba0c5c3212fb2d9165d962ef4f991e1eeb2146037f550fcb9f35988ea8
+generated: "2021-12-23T14:11:17.881693+06:00"
diff --git a/helm-charts/elk/requirements.yaml b/helm-charts/elk/requirements.yaml
index 2a439b99..1fb6406c 100644
--- a/helm-charts/elk/requirements.yaml
+++ b/helm-charts/elk/requirements.yaml
@@ -1,25 +1,25 @@
 dependencies:
 - name: elasticsearch
   repository: https://helm.elastic.co
-  version: 7.8.0
+  version: 7.16.2
   condition: elasticsearch.enabled
 - name: filebeat
   repository: https://helm.elastic.co
-  version: 7.8.0
+  version: 7.16.2
   condition: filebeat.enabled
 - name: kibana
   repository: https://helm.elastic.co
-  version: 7.8.0
+  version: 7.16.2
   condition: kibana.enabled
 - name: logstash
   repository: https://helm.elastic.co
-  version: 7.8.0
+  version: 7.16.2
   condition: logstash.enabled
 - name: metricbeat
   repository: https://helm.elastic.co
-  version: 7.8.0
+  version: 7.16.2
   condition: metricbeat.enabled
 - name: apm-server
   repository: https://helm.elastic.co
-  version: 7.8.0
-  condition: apm-server.enabled
\ No newline at end of file
+  version: 7.16.2
+  condition: apm-server.enabled
diff --git a/terraform/layer2-k8s/eks-elk.tf b/terraform/layer2-k8s/eks-elk.tf
index 7adbb334..df9ef700 100644
--- a/terraform/layer2-k8s/eks-elk.tf
+++ b/terraform/layer2-k8s/eks-elk.tf
@@ -18,8 +18,8 @@ locals {
   elk_elasticsearch_values    = <<VALUES
 elasticsearch:
   enabled: true
-  image: "public.ecr.aws/o7m5y2d9/elasticsearch" # Used this dockerfile https://github.com/maddevsio/aws-eks-base/blob/main/docker/elasticsearch/Dockerfile
-  imageTag: 7.8.0
+  image: "public.ecr.aws/o7m5y2d9/elasticsearch" # Uses this dockerfile https://github.com/maddevsio/aws-eks-base/blob/main/docker/elasticsearch/Dockerfile
+  imageTag: 7.16.2
   esMajorVersion: 7
   replicas: 1
   clusterHealthCheckParams: "wait_for_status=yellow&timeout=1s"
@@ -101,8 +101,8 @@ kibana:
 
   ingress:
     enabled: true
+    className: nginx
     annotations:
-      kubernetes.io/ingress.class: nginx
       nginx.ingress.kubernetes.io/backend-protocol: "HTTPS"
     path: /
     hosts:
diff --git a/terraform/layer2-k8s/helm-releases.yaml b/terraform/layer2-k8s/helm-releases.yaml
index f3c3a9ef..17309455 100644
--- a/terraform/layer2-k8s/helm-releases.yaml
+++ b/terraform/layer2-k8s/helm-releases.yaml
@@ -80,14 +80,14 @@ releases:
   - id: istio-operator-resources
     enabled: false
     chart: ../../helm-charts/istio/istio-operator-resources
-    repository: 
+    repository:
     chart_version:
     namespace: istio-system
   - id: istio-resources
     enabled: false
     chart: ../../helm-charts/istio/istio-resources
     repository:
-    chart_version: 
+    chart_version:
     namespace: istio-system
   - id: keda
     enabled: false