diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile
new file mode 100644
index 000000000..dfef97bca
--- /dev/null
+++ b/elasticsearch/Dockerfile
@@ -0,0 +1,28 @@
+FROM elasticsearch
+
+### LABELS
+ARG BUILD_ARCH
+ARG BUILD_DATE
+ARG BUILD_DESCRIPTION
+ARG BUILD_NAME
+ARG BUILD_REF
+ARG BUILD_REPOSITORY
+ARG BUILD_VERSION
+LABEL \
+    io.hass.name="${BUILD_NAME}" \
+    io.hass.description="${BUILD_DESCRIPTION}" \
+    io.hass.arch="${BUILD_ARCH}" \
+    io.hass.type="addon" \
+    io.hass.version=${BUILD_VERSION} \
+    maintainer="alexbelgium (https://github.com/alexbelgium)" \
+    org.opencontainers.image.title="${BUILD_NAME}" \
+    org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
+    org.opencontainers.image.vendor="Home Assistant Add-ons" \
+    org.opencontainers.image.authors="alexbelgium (https://github.com/alexbelgium)" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.url="https://github.com/alexbelgium" \
+    org.opencontainers.image.source="https://github.com/${BUILD_REPOSITORY}" \
+    org.opencontainers.image.documentation="https://github.com/${BUILD_REPOSITORY}/blob/main/README.md" \
+    org.opencontainers.image.created=${BUILD_DATE} \
+    org.opencontainers.image.revision=${BUILD_REF} \
+    org.opencontainers.image.version=${BUILD_VERSION}
diff --git a/elasticsearch/README.md b/elasticsearch/README.md
new file mode 100644
index 000000000..cbeaebc06
--- /dev/null
+++ b/elasticsearch/README.md
@@ -0,0 +1 @@
+See https://hub.docker.com/_/elasticsearch
diff --git a/elasticsearch/apparmor.txt b/elasticsearch/apparmor.txt
new file mode 100644
index 000000000..4b9ced9e4
--- /dev/null
+++ b/elasticsearch/apparmor.txt
@@ -0,0 +1,38 @@
+#include <tunables/global>
+
+profile inadyn_addon flags=(attach_disconnected,mediate_deleted) {
+  #include <abstractions/base>
+  
+  capability,
+  file,
+  mount,
+  umount,
+  remount,
+  capability setgid,
+  capability setuid,
+
+
+# S6-Overlay
+  /bin/** ix,
+  /usr/bin/** ix,
+  /usr/lib/bashio/** ix,
+  /etc/s6/** rix,
+  /run/s6/** rix,
+  /etc/services.d/** rwix,
+  /etc/cont-init.d/** rwix,
+  /etc/cont-finish.d/** rwix,
+  /init rix,
+  /var/run/** mrwkl,
+  /var/run/ mrwkl,
+  /dev/i2c-1 mrwkl, 
+  
+  # Data access
+  /data/** rw, 
+
+  # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
+  ptrace (trace,read) peer=docker-default,
+ 
+  # docker daemon confinement requires explict allow rule for signal
+  signal (receive) set=(kill,term) peer=/usr/bin/docker,
+
+}
diff --git a/elasticsearch/config.json b/elasticsearch/config.json
new file mode 100644
index 000000000..3ccc1e340
--- /dev/null
+++ b/elasticsearch/config.json
@@ -0,0 +1,19 @@
+{
+  "arch": ["aarch64", "amd64"],
+  "description": "elasticsearch server",
+  "name": "Elasticsearch server DO NOT USE",
+  "options": {},
+  "ports": {
+    "9200/tcp": 9200,
+    "9300/tcp": 9300
+  },
+  "ports_description": {
+    "9200/tcp": "web interface",
+    "9300/tcp": "web interface"
+  },
+  "schema": {},
+  "slug": "elasticsearch",
+  "upstream": "",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "6.8.20"
+}