diff --git a/ombi/CHANGELOG.md b/ombi/CHANGELOG.md
new file mode 100644
index 000000000..66f7e8b76
--- /dev/null
+++ b/ombi/CHANGELOG.md
@@ -0,0 +1 @@
+- Initial release
diff --git a/ombi/Dockerfile b/ombi/Dockerfile
new file mode 100644
index 000000000..a2e5d4d3c
--- /dev/null
+++ b/ombi/Dockerfile
@@ -0,0 +1,72 @@
+ARG BUILD_FROM
+ARG BUILD_VERSION
+ARG BUILD_UPSTREAM="2.7.2.1375"
+FROM ${BUILD_FROM}${BUILD_UPSTREAM}
+
+RUN \
+    ################
+    # Install apps #
+    ################
+    apt-get update \
+    && apt-get install -y --no-install-recommends \
+    jq \
+    curl \
+    # Backup if change
+    || apk add --no-cache jq curl \
+    \
+    ##################
+    # Install bashio #
+    ##################
+    && 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/ombi|g' || true \
+    && grep -rl " /config" /etc/services.d | xargs sed -i 's|/config|/config/ombi|g' || true \
+    && sed -i 's=/config/ombi=/config/ombi || true=g' /etc/cont-init.d/10-adduser || true
+
+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="tyjtyj (https://github.com/tyjtyj)" \
+    org.opencontainers.image.title="${BUILD_NAME}" \
+    org.opencontainers.image.description="${BUILD_DESCRIPTION}" \
+    org.opencontainers.image.vendor="Home Assistant Add-ons" \
+    org.opencontainers.image.authors="tyjtyj (https://github.com/tyjtyj)" \
+    org.opencontainers.image.licenses="MIT" \
+    org.opencontainers.image.url="https://github.com/tyjtyj" \
+    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/ombi/README.md b/ombi/README.md
new file mode 100644
index 000000000..df6b4e1de
--- /dev/null
+++ b/ombi/README.md
@@ -0,0 +1,41 @@
+# Home assistant add-on: Ombi
+![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield]
+![Supports smb mounts][smb-shield] ![Supports openvpn][openvpn-shield] ![Supports ingress][ingress-shield] ![Supports ssl][ssl-shield]
+
+## About
+
+Self-hosted Plex Request and user management system.
+This addon is based on the [docker image](https://github.com/linuxserver/ombi) from linuxserver.io.
+
+## Installation
+
+The installation of this add-on is pretty straightforward and not different in
+comparison to installing any other Hass.io add-on.
+
+1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance.
+1. Install this add-on.
+1. Click the `Save` button to store your configuration.
+1. Start the add-on.
+1. Check the logs of the add-on to see if everything went well.
+1. Carefully configure the add-on to your preferences, see the official documentation for for that.
+
+## Configuration
+Webui can be found at <http://your-ip:3579>.
+
+```yaml
+GUID: user
+GPID: user
+```
+
+## Support
+Create an issue on github
+
+[repository]: https://github.com/alexbelgium/hassio-addons
+[smb-shield]: https://img.shields.io/badge/smb-yes-green.svg
+[openvpn-shield]: https://img.shields.io/badge/openvpn-yes-green.svg
+[ingress-shield]: https://img.shields.io/badge/ingress-yes-green.svg
+[ssl-shield]: https://img.shields.io/badge/ssl-yes-green.svg
+[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg
diff --git a/ombi/build.json b/ombi/build.json
new file mode 100644
index 000000000..0ce7e75d7
--- /dev/null
+++ b/ombi/build.json
@@ -0,0 +1,8 @@
+{
+  "build_from": {
+    "armhf" : "linuxserver/ombi:arm32v7-",
+    "armv7": "linuxserver/ombi:arm32v7-",
+    "aarch64": "linuxserver/ombi:arm64v8-",
+    "amd64" : "linuxserver/ombi:amd64-"
+  }
+}
diff --git a/ombi/config.json b/ombi/config.json
new file mode 100644
index 000000000..ceaf59343
--- /dev/null
+++ b/ombi/config.json
@@ -0,0 +1,34 @@
+{
+  "name": "Ombi",
+  "version": "v4.0.1430-ls97",
+  "upstream": "v4.0.1430-ls97",
+  "slug": "ombi",
+  "description": "Self-hosted Plex Request and user management system",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "webui": "http://[HOST]:[PORT:3579]",
+  "ports": {
+    "3579/tcp": 3579
+  },
+  "ports_description": {
+    "3579/tcp": "Web interface"
+  },
+  "map": [
+    "config:rw"
+  ],
+  "environment": {
+  },
+  "options": {
+    "PUID": 0,
+    "PGID": 0
+  },
+  "schema": {
+    "PUID": "int",
+    "PGID": "int"
+  },
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armhf",
+    "armv7"
+  ]
+}
diff --git a/ombi/icon.png b/ombi/icon.png
new file mode 100644
index 000000000..da16e990d
Binary files /dev/null and b/ombi/icon.png differ
diff --git a/ombi/logo.png b/ombi/logo.png
new file mode 100644
index 000000000..da16e990d
Binary files /dev/null and b/ombi/logo.png differ
diff --git a/resiliosync/README.md b/resiliosync/README.md
index 5720c92e7..f395526e1 100644
--- a/resiliosync/README.md
+++ b/resiliosync/README.md
@@ -1,22 +1,41 @@
-# Hass.io Add-ons: ResilioSync
-
-NOT READY
+# Home assistant add-on: Ombi
+![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield] ![Supports armhf Architecture][armhf-shield] ![Supports armv7 Architecture][armv7-shield]
+![Supports smb mounts][smb-shield] ![Supports openvpn][openvpn-shield] ![Supports ingress][ingress-shield] ![Supports ssl][ssl-shield]
 
 ## About
-ResilioSync
 
-## Requirements
-- Home Assistant
+Self-hosted file share and collaboration platform on the web.
+This addon is based on the [docker image](https://github.com/linuxserver/resilio-sync) from linuxserver.io.
 
+## Installation
 
-## Config
+The installation of this add-on is pretty straightforward and not different in
+comparison to installing any other Hass.io add-on.
 
+1. [Add my Hass.io add-ons repository][repository] to your Hass.io instance.
+1. Install this add-on.
+1. Click the `Save` button to store your configuration.
+1. Start the add-on.
+1. Check the logs of the add-on to see if everything went well.
+1. Carefully configure the add-on to your preferences, see the official documentation for for that.
 
-## Start
+## Configuration
+Webui can be found at <http://your-ip:8888>.
 
-- 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).
+```yaml
+GUID: user
+GPID: user
+```
 
-## Troubleshooting
+## Support
+Create an issue on github
 
-If you have in issue with your installation, please be sure to checkout github.
+[repository]: https://github.com/alexbelgium/hassio-addons
+[smb-shield]: https://img.shields.io/badge/smb-yes-green.svg
+[openvpn-shield]: https://img.shields.io/badge/openvpn-yes-green.svg
+[ingress-shield]: https://img.shields.io/badge/ingress-yes-green.svg
+[ssl-shield]: https://img.shields.io/badge/ssl-yes-green.svg
+[aarch64-shield]: https://img.shields.io/badge/aarch64-yes-green.svg
+[amd64-shield]: https://img.shields.io/badge/amd64-yes-green.svg
+[armhf-shield]: https://img.shields.io/badge/armhf-yes-green.svg
+[armv7-shield]: https://img.shields.io/badge/armv7-yes-green.svg