diff --git a/bin/export_kibana-objects.sh b/bin/deprecated/export_kibana-objects.sh
similarity index 100%
rename from bin/export_kibana-objects.sh
rename to bin/deprecated/export_kibana-objects.sh
diff --git a/bin/import_kibana-objects.sh b/bin/deprecated/import_kibana-objects.sh
similarity index 100%
rename from bin/import_kibana-objects.sh
rename to bin/deprecated/import_kibana-objects.sh
diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile
index 2dc44ef9..f828dcc4 100644
--- a/docker/elk/elasticsearch/Dockerfile
+++ b/docker/elk/elasticsearch/Dockerfile
@@ -7,8 +7,6 @@ ENV ES_VER=7.16.2 \
 # Include dist
 ADD dist/ /root/dist/
 #
-# Setup env and apt
-#RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
 RUN apk -U --no-cache add \
              aria2 \
              bash \
diff --git a/docker/elk/elasticsearch/dist/elasticsearch.yml b/docker/elk/elasticsearch/dist/elasticsearch.yml
index 9ba25044..a5ccd137 100644
--- a/docker/elk/elasticsearch/dist/elasticsearch.yml
+++ b/docker/elk/elasticsearch/dist/elasticsearch.yml
@@ -2,7 +2,6 @@ cluster.name: tpotcluster
 node.name: "tpotcluster-node-01"
 xpack.ml.enabled: false
 xpack.security.enabled: false
-#xpack.ilm.enabled: false
 path:
     logs: /data/elk/log
     data: /data/elk/data
@@ -10,7 +9,5 @@ http.host: 0.0.0.0
 http.cors.enabled: true
 http.cors.allow-origin: "*"
 indices.query.bool.max_clause_count: 2000
-cluster.initial_master_nodes:
-- "tpotcluster-node-01"
-discovery.zen.ping.unicast.hosts:
-- localhost 
+cluster.routing.allocation.disk.watermark.enable_for_single_data_node: true
+discovery.type: single-node
diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile
index a11240c7..1b44422b 100644
--- a/docker/elk/kibana/Dockerfile
+++ b/docker/elk/kibana/Dockerfile
@@ -6,7 +6,6 @@ ENV KB_VER=7.16.2
 # Include dist
 ADD dist/ /root/dist/
 #
-# Setup env and apt
 RUN apk -U --no-cache add \
             aria2 \
             curl \
@@ -27,25 +26,12 @@ RUN apk -U --no-cache add \
 #
 # Setup user, groups and configs
     sed -i 's/#server.basePath: ""/server.basePath: "\/kibana"/' /usr/share/kibana/config/kibana.yml && \
-    sed -i 's/#kibana.defaultAppId: "home"/kibana.defaultAppId: "dashboards"/' /usr/share/kibana/config/kibana.yml && \
     sed -i 's/#server.host: "localhost"/server.host: "0.0.0.0"/' /usr/share/kibana/config/kibana.yml && \
     sed -i 's/#elasticsearch.hosts: \["http:\/\/localhost:9200"\]/elasticsearch.hosts: \["http:\/\/elasticsearch:9200"\]/' /usr/share/kibana/config/kibana.yml && \
     sed -i 's/#server.rewriteBasePath: false/server.rewriteBasePath: false/' /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.infra.enabled: false" >> /usr/share/kibana/config/kibana.yml && \ 
-    echo "xpack.logstash.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.canvas.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.spaces.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.apm.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.security.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.uptime.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.securitySolution.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.ml.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
-    echo "xpack.fleet.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
+    echo "xpack.reporting.roles.enabled: false" >> /usr/share/kibana/config/kibana.yml && \
     echo "elasticsearch.requestTimeout: 60000" >> /usr/share/kibana/config/kibana.yml && \
     echo "elasticsearch.shardTimeout: 60000" >> /usr/share/kibana/config/kibana.yml && \
-# There is no switch to disable Enterprise Search, so we need to remove it
-# In order to remove all X-Pack features we need to use OSS versions
-    rm -rf /usr/share/kibana/x-pack/plugins/enterprise_search && \
     rm -rf /usr/share/kibana/optimize/bundles/* && \
     /usr/share/kibana/bin/kibana --optimize --allow-root && \
     addgroup -g 2000 kibana && \
diff --git a/etc/objects/elkbase.tgz b/etc/objects/elkbase.tgz
index 42d2712a..67e47aba 100644
Binary files a/etc/objects/elkbase.tgz and b/etc/objects/elkbase.tgz differ
diff --git a/etc/objects/kibana-objects.tgz b/etc/objects/kibana-objects.tgz
deleted file mode 100644
index 67ba76f1..00000000
Binary files a/etc/objects/kibana-objects.tgz and /dev/null differ
diff --git a/etc/objects/kibana_export.ndjson.zip b/etc/objects/kibana_export.ndjson.zip
index 6851c45e..b70fc204 100644
Binary files a/etc/objects/kibana_export.ndjson.zip and b/etc/objects/kibana_export.ndjson.zip differ