diff --git a/signalk/CHANGELOG.md b/signalk/CHANGELOG.md
new file mode 100644
index 000000000..66f7e8b76
--- /dev/null
+++ b/signalk/CHANGELOG.md
@@ -0,0 +1 @@
+- Initial release
diff --git a/signalk/Dockerfile b/signalk/Dockerfile
new file mode 100644
index 000000000..629ffd8f2
--- /dev/null
+++ b/signalk/Dockerfile
@@ -0,0 +1,110 @@
+#============================#
+#  ALEXBELGIUM'S DOCKERFILE  #
+#============================#
+#           _.------.
+#       _.-`    ('>.-`"""-.
+# '.--'`       _'`   _ .--.)
+#    -'         '-.-';`   `
+#    ' -      _.'  ``'--.
+#        '---`    .-'""`
+#               /`
+#=== Home Assistant Addon ===#
+
+#################
+# 1 Build Image #
+#################
+
+ARG BUILD_FROM
+ARG BUILD_VERSION
+ARG BUILD_FROM
+FROM ${BUILD_FROM}
+
+##################
+# 2 Modify Image #
+##################
+
+# Set S6 wait time
+ENV S6_CMD_WAIT_FOR_SERVICES=1 \
+    S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0 \
+    S6_SERVICES_GRACETIME=0
+
+##################
+# 3 Install apps #
+##################
+
+# Copy local files
+COPY rootfs/ /
+
+# Modules
+ARG MODULES="00-banner.sh 01-custom_script.sh 00-global_var.sh 01-config_yaml.sh"
+
+# Automatic modules download
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_automodules.sh" "/ha_automodules.sh"
+RUN chmod 744 /ha_automodules.sh && /ha_automodules.sh "$MODULES" && rm /ha_automodules.sh
+
+# Manual apps
+ENV PACKAGES=""
+
+# Automatic apps & bashio
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_autoapps.sh" "/ha_autoapps.sh"
+RUN chmod 744 /ha_autoapps.sh && /ha_autoapps.sh "$PACKAGES" && rm /ha_autoapps.sh
+
+################
+# 4 Entrypoint #
+################
+
+# Add entrypoint
+ENV S6_STAGE2_HOOK=/ha_entrypoint.sh
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint.sh" "/ha_entrypoint.sh"
+
+# Entrypoint modifications
+ADD "https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.templates/ha_entrypoint_modif.sh" "/ha_entrypoint_modif.sh"
+RUN chmod 777 /ha_entrypoint.sh /ha_entrypoint_modif.sh && /ha_entrypoint_modif.sh && rm /ha_entrypoint_modif.sh
+
+
+ENTRYPOINT [ "/usr/bin/env" ]
+CMD [ "/ha_entrypoint.sh" ]
+WORKDIR /config
+
+############
+# 5 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}
+
+#################
+# 6 Healthcheck #
+#################
+
+ENV HEALTH_PORT="8080" \
+    HEALTH_URL="/health"
+HEALTHCHECK \
+    --interval=5s \
+    --retries=5 \
+    --start-period=30s \
+    --timeout=25s \
+    CMD curl --fail "http://127.0.0.1:${HEALTH_PORT}${HEALTH_URL}" &>/dev/null || exit 1
diff --git a/signalk/README.md b/signalk/README.md
new file mode 100644
index 000000000..6c39f945a
--- /dev/null
+++ b/signalk/README.md
@@ -0,0 +1,50 @@
+# Home assistant add-on: signalk
+
+[![Donate][donation-badge]](https://www.buymeacoffee.com/alexbelgium)
+
+![Version](https://img.shields.io/badge/dynamic/json?label=Version&query=%24.version&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fsignalk%2Fconfig.json)
+![Ingress](https://img.shields.io/badge/dynamic/json?label=Ingress&query=%24.ingress&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fsignalk%2Fconfig.json)
+![Arch](https://img.shields.io/badge/dynamic/json?color=success&label=Arch&query=%24.arch&url=https%3A%2F%2Fraw.githubusercontent.com%2Falexbelgium%2Fhassio-addons%2Fmaster%2Fsignalk%2Fconfig.json)
+
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/9c6cf10bdbba45ecb202d7f579b5be0e)](https://www.codacy.com/gh/alexbelgium/hassio-addons/dashboard?utm_source=github.com&utm_medium=referral&utm_content=alexbelgium/hassio-addons&utm_campaign=Badge_Grade)
+[![GitHub Super-Linter](https://img.shields.io/github/actions/workflow/status/alexbelgium/hassio-addons/weekly-supelinter.yaml?label=Lint%20code%20base)](https://github.com/alexbelgium/hassio-addons/actions/workflows/weekly-supelinter.yaml)
+[![Builder](https://img.shields.io/github/actions/workflow/status/alexbelgium/hassio-addons/onpush_builder.yaml?label=Builder)](https://github.com/alexbelgium/hassio-addons/actions/workflows/onpush_builder.yaml)
+
+[donation-badge]: https://img.shields.io/badge/Buy%20me%20a%20coffee-%23d32f2f?logo=buy-me-a-coffee&style=flat&logoColor=white
+
+_Thanks to everyone having starred my repo! To star it click on the image below, then it will be on top right. Thanks!_
+
+[![Stargazers repo roster for @alexbelgium/hassio-addons](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/.github/stars2.svg)](https://github.com/alexbelgium/hassio-addons/stargazers)
+
+![downloads evolution](https://raw.githubusercontent.com/alexbelgium/hassio-addons/master/signalk/stats.png)
+
+## About
+
+[Signal K Server](https://github.com/SignalK/signalk-server) is a server application that runs on a central hub in a boat. If you use or develop marine electronics, Signal K Server has something to offer for you.
+
+## Configuration
+
+No optional variables
+
+## Installation
+
+The installation of this add-on is pretty straightforward and not different in comparison to installing any other add-on.
+
+1. Add my add-ons repository to your home assistant instance (in supervisor addons store at top right, or click button below if you have configured my HA)
+   [![Open your Home Assistant instance and show the add add-on repository dialog with a specific repository URL pre-filled.](https://my.home-assistant.io/badges/supervisor_add_addon_repository.svg)](https://my.home-assistant.io/redirect/supervisor_add_addon_repository/?repository_url=https%3A%2F%2Fgithub.com%2Falexbelgium%2Fhassio-addons)
+1. Install this add-on.
+1. Click the `Save` button to store your configuration.
+1. Set the add-on options to your preferences
+1. Start the add-on.
+1. Check the logs of the add-on to see if everything went well.
+1. Open the webUI and adapt the software options
+
+## Support
+
+Create an issue on github
+
+## Illustration
+
+![illustration](https://raw.githubusercontent.com/firefly-iii/firefly-iii/develop/.github/assets/img/imac-complete.png)
+
+[repository]: https://github.com/alexbelgium/hassio-addons
diff --git a/signalk/apparmor.txt b/signalk/apparmor.txt
new file mode 100644
index 000000000..4a5aca057
--- /dev/null
+++ b/signalk/apparmor.txt
@@ -0,0 +1,66 @@
+#include <tunables/global>
+
+profile signalk_addon flags=(attach_disconnected,mediate_deleted) {
+  #include <abstractions/base>
+
+  capability,
+  file,
+  signal,
+  mount,
+  umount,
+  remount,
+  network udp,
+  network tcp,
+  network dgram,
+  network stream,
+  network inet,
+  network inet6,
+  network netlink raw,
+  network unix dgram,
+
+  capability setgid,
+  capability setuid,
+  capability sys_admin,
+  capability dac_read_search,
+  # capability dac_override,
+  # capability sys_rawio,
+
+# S6-Overlay
+  /init ix,
+  /run/{s6,s6-rc*,service}/** ix,
+  /package/** ix,
+  /command/** ix,
+  /run/{,**} rwk,
+  /dev/tty rw,
+  /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/fuse mrwkl,
+  /dev/sda1 mrwkl,
+  /dev/sdb1 mrwkl,
+  /dev/nvme0 mrwkl,
+  /dev/nvme1 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/signalk/build.json b/signalk/build.json
new file mode 100644
index 000000000..6e91c4ace
--- /dev/null
+++ b/signalk/build.json
@@ -0,0 +1,10 @@
+{
+    "build_from": {
+      "aarch64": "ghcr.io/signalk/signalk-server:latest",
+      "amd64": "ghcr.io/signalk/signalk-server:latest",
+      "armv7": "ghcr.io/signalk/signalk-server:latest"
+    },
+    "codenotary": {
+      "signer": "alexandrep.github@gmail.com"
+    }
+  }
diff --git a/signalk/config.json b/signalk/config.json
new file mode 100644
index 000000000..b0b33d004
--- /dev/null
+++ b/signalk/config.json
@@ -0,0 +1,38 @@
+{
+  "arch": [
+    "aarch64",
+    "amd64",
+    "armv7"
+  ],
+  "codenotary": "alexandrep.github@gmail.com",
+  "description": "An implementation of a Signal K central server for boats",
+  "environment": {
+    "PORT": "3000",
+    "SSLPORT": "3443",
+    "NMEA0183PORT": "10110",
+    "TCPSTREAMPORT": "8375"
+  },
+  "image": "ghcr.io/alexbelgium/signalk-{arch}",
+  "map": [
+    "config:rw",
+    "share:rw",
+    "ssl"
+  ],
+  "name": "Signalk",
+  "ports": {
+    "3000/tcp": 3000,
+    "3443/tcp": 3443,
+    "10110/tcp": 10110,
+    "8375/tcp": 8375
+  },
+  "ports_description": {
+    "3000/tcp": "web interface",
+    "3443/tcp": "ssl web interface",
+    "10110/tcp": "NMEA0183 port",
+    "8375/tcp": "TCPSTREAM port"
+  },
+  "slug": "signalk",
+  "url": "https://github.com/alexbelgium/hassio-addons",
+  "version": "1.0",
+  "webui": "http://[HOST]:[PORT:3000]"
+}
diff --git a/signalk/icon.png b/signalk/icon.png
new file mode 100644
index 000000000..1508e3f3b
Binary files /dev/null and b/signalk/icon.png differ
diff --git a/signalk/logo.png b/signalk/logo.png
new file mode 100644
index 000000000..1508e3f3b
Binary files /dev/null and b/signalk/logo.png differ
diff --git a/signalk/rootfs/etc/cont-init.d/99-run.sh b/signalk/rootfs/etc/cont-init.d/99-run.sh
new file mode 100644
index 000000000..05665fcb4
--- /dev/null
+++ b/signalk/rootfs/etc/cont-init.d/99-run.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bashio
+# shellcheck shell=bash
+set -e
+# hadolint ignore=SC2155
+
+bashio::log.info "Setting folder"
+cp -rnf /home/node/.signalk/* /config/
+
+bashio::log.info "Starting application"
+/./home/node/signalk/startup.sh
\ No newline at end of file
diff --git a/signalk/stats.png b/signalk/stats.png
new file mode 100644
index 000000000..2750e170a
Binary files /dev/null and b/signalk/stats.png differ
diff --git a/signalk/updater.json b/signalk/updater.json
new file mode 100644
index 000000000..064b4f2be
--- /dev/null
+++ b/signalk/updater.json
@@ -0,0 +1,8 @@
+{
+  "last_update": "04-11-2023",
+  "repository": "alexbelgium/hassio-addons",
+  "slug": "signalk",
+  "source": "github",
+  "upstream_repo": "SignalK/signalk-server",
+  "upstream_version": "1.0"
+}