diff --git a/webtrees/Dockerfile b/webtrees/Dockerfile
new file mode 100644
index 000000000..1c2f843e5
--- /dev/null
+++ b/webtrees/Dockerfile
@@ -0,0 +1,40 @@
+ARG BUILD_VERSION
+FROM nathanvaughn/webtrees:latest
+
+VOLUME [ "/data" ]
+
+USER root
+
+RUN rm -R /var/www/webtrees/data \
+    && ln -s /data /var/www/webtrees
+
+#RUN touch /data/database.sqlite \
+#    && chown webtrees /data/database.sqlite \
+#    && ln -s /data/database.sqlite /home/webtrees/db
+
+### 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/webtrees/README.md b/webtrees/README.md
new file mode 100644
index 000000000..ff2ab051e
--- /dev/null
+++ b/webtrees/README.md
@@ -0,0 +1,45 @@
+# Hass.io Add-ons: webtrees
+
+![Supports aarch64 Architecture][aarch64-shield] ![Supports amd64 Architecture][amd64-shield]
+
+## About
+
+[webtrees](https://github.com/webtrees-project/webtrees) Workout Manager is a free, open source web application that helps you manage your personal workouts, weight and diet plans and can also be used as a simple gym management utility. It offers a REST API as well, for easy integration with other projects and tools.
+
+## 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
+
+- Start the addon. Wait a while and check the log for any errors.
+- Open yourdomain.com:8000 (where ":8000" is the port configured in the addon).
+- Default
+  - Username: `admin`
+  - Password: `adminadmin`
+
+```yaml
+
+```
+
+## Support
+
+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
diff --git a/webtrees/config.json b/webtrees/config.json
new file mode 100644
index 000000000..769f8a911
--- /dev/null
+++ b/webtrees/config.json
@@ -0,0 +1,32 @@
+{
+  "arch": ["aarch64", "amd64", "armv7", "armhf"],
+  "boot": "auto",
+  "description": "web's leading on-line collaborative genealogy application",
+  "environment": {
+    "DB_TYPE": "sqlite",
+    "DB_NAME": "/data/database",
+    "WT_USER": "admin",
+    "WT_NAME": "admin",
+    "WT_PASS": "pleasechange",
+    "WT_EMAIL": "please@change.com",
+    "DB_PASS": "pleasechange"
+  },
+  "map": [],
+  "name": "Webtrees",
+  "options": {},
+  "ports": {
+    "80/tcp": "9999",
+    "443/tcp": null
+  },
+  "ports_description": {
+    "80/tcp": "Web interface",
+    "443/tcp": "Https web interface"
+  },
+  "schema": {},
+  "slug": "webtrees",
+  "startup": "services",
+  "upstream": "2.0.17",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "2.1",
+  "webui": "[PROTO:ssl]://[HOST]:[PORT:80]"
+}
diff --git a/webtrees/icon.png b/webtrees/icon.png
new file mode 100644
index 000000000..365262aaa
Binary files /dev/null and b/webtrees/icon.png differ
diff --git a/webtrees/logo.png b/webtrees/logo.png
new file mode 100644
index 000000000..365262aaa
Binary files /dev/null and b/webtrees/logo.png differ