diff --git a/freqtrade/CHANGELOG.md b/freqtrade/CHANGELOG.md
new file mode 100644
index 000000000..66f7e8b76
--- /dev/null
+++ b/freqtrade/CHANGELOG.md
@@ -0,0 +1 @@
+- Initial release
diff --git a/freqtrade/Dockerfile b/freqtrade/Dockerfile
new file mode 100644
index 000000000..e1edd7047
--- /dev/null
+++ b/freqtrade/Dockerfile
@@ -0,0 +1,54 @@
+ARG BUILD_FROM
+ARG BUILD_VERSION
+FROM freqtradeorg/freqtrade:latest
+ARG BASHIO_VERSION=0.13.1
+
+RUN \
+    ###################
+    # Install bashio #
+    ##################
+    mkdir -p /tmp/bashio \
+    && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v${BASHIO_VERSION}.tar.gz" \
+    | tar -xzf - --strip 1 -C /tmp/bashio \
+    && mv /tmp/bashio/lib /usr/lib/bashio \
+    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
+    && rm -rf /tmp/bashio
+# use /data instead of /config for hass.io environment
+#    && sed -i "s|/config|/share/freqtrade|g" /etc/services.d/freqtrade/run \
+#&& sed -i "s|/config|/share/freqtrade|g" /etc/cont-init.d/50-config \
+#&& sed -i "s|/share/freqtrade/nginx|/config/nginx|g" /etc/cont-init.d/50-config \
+#\
+# Allow UID and GID setting
+#&& sed -i 's/bash/bashio/g' /etc/cont-init.d/10-adduser \
+#&& sed -i 's/{PUID:-911}/(bashio::config "PUID")/g' /etc/cont-init.d/10-adduser \
+#&& sed -i 's/{PGID:-911}/(bashio::config "PGID")/g' /etc/cont-init.d/10-adduser
+
+# copy local files
+COPY root/ / 
+
+### 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/freqtrade/Readme.md b/freqtrade/Readme.md
new file mode 100644
index 000000000..b0202726a
--- /dev/null
+++ b/freqtrade/Readme.md
@@ -0,0 +1 @@
+EXPERIMENTAL - DO NOT USE
diff --git a/freqtrade/apparmor.txt b/freqtrade/apparmor.txt
new file mode 100644
index 000000000..9efe66c73
--- /dev/null
+++ b/freqtrade/apparmor.txt
@@ -0,0 +1,48 @@
+#include <tunables/global>
+
+profile freqtrade_addon flags=(attach_disconnected,mediate_deleted) {
+  #include <abstractions/base>
+  
+  capability,
+  file,
+  mount,
+  umount,
+  remount,
+
+  capability setgid,
+  capability setuid,
+  capability sys_admin, 
+  capability dac_read_search, 
+  # capability dac_override,
+  # capability sys_rawio,
+
+# 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, 
+  # Files required
+  /dev/sda1 mrwkl,
+  /dev/sdb1 mrwkl,
+  /dev/mmcblk0p1 mrwkl,
+  /dev/* mrwkl,
+  /tmp/** mrkwl,
+  
+  # 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/freqtrade/config.json b/freqtrade/config.json
new file mode 100644
index 000000000..4c335ef14
--- /dev/null
+++ b/freqtrade/config.json
@@ -0,0 +1,23 @@
+{
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "boot": "auto",
+  "description": "Simple High frequency trading bot for crypto currencies ",
+  "devices": [],
+  "environment": {},
+  "map": ["share:rw"],
+  "name": "freqtrade web server - DO NOT USE",
+  "options": {},
+  "ports": {
+    "80/tcp": 9191
+  },
+  "ports_description": {
+    "80/tcp": "web interface"
+  },
+  "privileged": [],
+  "schema": {},
+  "slug": "freqtrade",
+  "upstream": "2021.9",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "2021.9",
+  "webui": "http://[HOST]:[PORT:80]"
+}
diff --git a/freqtrade/icon.png b/freqtrade/icon.png
new file mode 100644
index 000000000..caae4a714
Binary files /dev/null and b/freqtrade/icon.png differ
diff --git a/freqtrade/logo.png b/freqtrade/logo.png
new file mode 100644
index 000000000..caae4a714
Binary files /dev/null and b/freqtrade/logo.png differ
diff --git a/freqtrade/root/etc/cont-init.d/00-banner.sh b/freqtrade/root/etc/cont-init.d/00-banner.sh
new file mode 100644
index 000000000..e31d1c507
--- /dev/null
+++ b/freqtrade/root/etc/cont-init.d/00-banner.sh
@@ -0,0 +1,42 @@
+#!/usr/bin/with-contenv bashio
+
+bashio::log.warning "Minimal (advised) system requirements: 2GB RAM, 1GB disk space, 2vCPU"
+
+# ==============================================================================
+# Home Assistant Community Add-on: Base Images
+# Displays a simple add-on banner on startup
+# ==============================================================================
+if bashio::supervisor.ping; then
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+    bashio::log.blue " Add-on: $(bashio::addon.name)"
+    bashio::log.blue " $(bashio::addon.description)"
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+
+    bashio::log.blue " Add-on version: $(bashio::addon.version)"
+    if bashio::var.true "$(bashio::addon.update_available)"; then
+        bashio::log.magenta ' There is an update available for this add-on!'
+        bashio::log.magenta \
+        " Latest add-on version: $(bashio::addon.version_latest)"
+        bashio::log.magenta ' Please consider upgrading as soon as possible.'
+    else
+        bashio::log.green ' You are running the latest version of this add-on.'
+    fi
+
+    bashio::log.blue " System: $(bashio::info.operating_system)" \
+    " ($(bashio::info.arch) / $(bashio::info.machine))"
+    bashio::log.blue " Home Assistant Core: $(bashio::info.homeassistant)"
+    bashio::log.blue " Home Assistant Supervisor: $(bashio::info.supervisor)"
+
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+    bashio::log.blue \
+    ' Please, share the above information when looking for help'
+    bashio::log.blue \
+    ' or support in, e.g., GitHub, forums or the Discord chat.'
+    bashio::log.green \
+    ' https://github.com/alexbelgium/hassio-addons'
+    bashio::log.blue \
+    '-----------------------------------------------------------'
+fi
diff --git a/freqtrade/root/etc/cont-init.d/00-ha-env b/freqtrade/root/etc/cont-init.d/00-ha-env
new file mode 100644
index 000000000..342068f41
--- /dev/null
+++ b/freqtrade/root/etc/cont-init.d/00-ha-env
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bashio
+
+for k in $(bashio::jq "${__BASHIO_ADDON_CONFIG}" 'keys | .[]'); do
+    printf "$(bashio::config $k)" > /var/run/s6/container_environment/$k
+done