diff --git a/flexget/CHANGELOG.md b/flexget/CHANGELOG.md
new file mode 100644
index 000000000..b4ffc2860
--- /dev/null
+++ b/flexget/CHANGELOG.md
@@ -0,0 +1,2 @@
+
+- :arrow_up: Initial release
diff --git a/flexget/Dockerfile b/flexget/Dockerfile
new file mode 100644
index 000000000..a3e3a31de
--- /dev/null
+++ b/flexget/Dockerfile
@@ -0,0 +1,69 @@
+ARG BUILD_FROM
+ARG BUILD_VERSION
+ARG BUILD_UPSTREAM="3.1.120"
+FROM wiserain/flexget:${BUILD_UPSTREAM}
+
+RUN \
+    ##################
+    # Install bashio #
+    ##################
+    apk add --no-cache \
+    jq \
+    curl \
+    cifs-utils \
+    \
+    && curl -J -L -o /tmp/bashio.tar.gz \
+    "https://github.com/hassio-addons/bashio/archive/v0.13.0.tar.gz" \
+    && mkdir /tmp/bashio \
+    && tar zxvf \
+    /tmp/bashio.tar.gz \
+    --strip 1 -C /tmp/bashio \
+    \
+    && mv /tmp/bashio/lib /usr/lib/bashio \
+    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
+    && rm -fr \
+    /tmp/* \
+    \
+    ###############
+    # Adapt image #
+    ###############
+    # 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 \
+	\
+	# Correct config folder
+	&& grep -rl "/config" /etc/cont-init.d | xargs sed -i 's|/config|/config/flexget|g' \
+	\
+	# Set password
+    && sed -i 's/bash/bashio/g' /etc/cont-init.d/20-config \
+	&& sed -i 's/# set FG_WEBUI_PASSWD/if bashio::config.has_value "WebuiPass"; then FG_WEBUI_PASSWD=$(bashio::config "WebuiPass"); fi/g' /etc/cont-init.d/20-config
+	
+VOLUME [ "/data" ]
+
+### 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/flexget/README.md b/flexget/README.md
new file mode 100644
index 000000000..5720c92e7
--- /dev/null
+++ b/flexget/README.md
@@ -0,0 +1,22 @@
+# Hass.io Add-ons: ResilioSync
+
+NOT READY
+
+## About
+ResilioSync
+
+## Requirements
+- Home Assistant
+
+
+## Config
+
+
+## Start
+
+- Start the addon. Wait a while and check the log for any errors.
+- Open yourdomain.com:8888 (where ":8888" is the port configured in the ResilioSync addon).
+
+## Troubleshooting
+
+If you have in issue with your installation, please be sure to checkout github.
diff --git a/flexget/config.json b/flexget/config.json
new file mode 100644
index 000000000..3cdada70c
--- /dev/null
+++ b/flexget/config.json
@@ -0,0 +1,36 @@
+{
+    "name": "Flexget",
+    "version": "3.1.120",
+	"upstream": "3.1.120",
+    "slug": "flexget",
+    "description": "FlexGet is a multipurpose automation tool for all of your media",
+    "url": "https://github.com/alexbelgium/hassio-addons",
+    "webui": "http://[HOST]:[PORT:5050]",
+    "ports": {
+        "5050/tcp": 5050
+    },
+    "ports_description": {
+        "5050/tcp": "Web interface"
+    },
+    "map": [
+        "share:rw",
+		"config:rw"
+    ],
+    "environment": {
+    },
+    "options": {
+    "PUID": 0,
+    "PGID": 0
+    },
+    "schema": {
+    "PUID": "int",
+    "PGID": "int",
+	"WebuiPass": "str?"
+    },
+    "arch": [
+        "aarch64",
+        "amd64",
+        "armhf",
+        "armv7"
+    ]
+}
diff --git a/flexget/icon.png b/flexget/icon.png
new file mode 100644
index 000000000..5d7595932
Binary files /dev/null and b/flexget/icon.png differ
diff --git a/flexget/logo.png b/flexget/logo.png
new file mode 100644
index 000000000..5d7595932
Binary files /dev/null and b/flexget/logo.png differ
diff --git a/resiliosync/config.json b/resiliosync/config.json
index d8670e06e..70a2ddcc6 100644
--- a/resiliosync/config.json
+++ b/resiliosync/config.json
@@ -1,6 +1,7 @@
 {
     "name": "ResilioSync",
     "version": "2.7.2.1375-ls90",
+	"upstream": "2.7.2.1375-ls90",
     "slug": "resiliosync",
     "description": "Self-hosted file share and collaboration platform on the web",
     "url": "https://github.com/tyjtyj/hassio-addons",