diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000..70e0d3d
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1 @@
+ko_fi: mathesonsteplock
\ No newline at end of file
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index 5d0a29d..5995044 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -21,6 +21,8 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Publish
         uses: home-assistant/builder@master
+        env:
+          CAS_API_KEY: ${{ secrets.CAS_API_KEY }}
         with:
           args: |
             --amd64 \
diff --git a/README.md b/README.md
index a761766..f6451fa 100644
--- a/README.md
+++ b/README.md
@@ -9,9 +9,7 @@ This add-on can be added via my [Home Assistant Add-on repository](https://githu
 # [Documentation](https://addons.mathesonsteplock.ca/docs/addons/tdm/basic-config)
 
 # Support Me 
-[![Buy me a coffee][buymeacoffee-logo]][buymeacoffee]
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/mathesonsteplock)
 
-[buymeacoffee-logo]: https://cdn.buymeacoffee.com/buttons/default-black.png
-[buymeacoffee]: https://www.buymeacoffee.com/mathesonstep
 [here]: https://www.home-assistant.io/hassio/installing_third_party_addons/
 [deCONZ]: https://github.com/home-assistant/hassio-addons/tree/master/deconz
diff --git a/tdm/CHANGELOG.md b/tdm/CHANGELOG.md
index a230267..9d3b880 100644
--- a/tdm/CHANGELOG.md
+++ b/tdm/CHANGELOG.md
@@ -1,3 +1,12 @@
+# 2022.5.0
+
+- Switch to `ghcr.io`
+- Sign images with Codenotary CAS
+- Updates to support S6-Overlay 3.x
+- Switch to ko-fi for donations
+  
+**Full Changelog**: https://github.com/ikifar2012/tasmota-device-manager-addon/compare/2022.2.0...2022.5.0
+
 # 2022.2.0
 
 - Added MQTT auto configuration
diff --git a/tdm/DOCS.md b/tdm/DOCS.md
index 065d425..7b0b1cc 100644
--- a/tdm/DOCS.md
+++ b/tdm/DOCS.md
@@ -4,7 +4,4 @@ Please visit the documentation at [addons.mathesonsteplock.ca](https://addons.ma
 
 # Support Me
 
-[![Buy me a coffee][buymeacoffee-logo]][buymeacoffee]
-
-[buymeacoffee-logo]: https://cdn.buymeacoffee.com/buttons/default-black.png
-[buymeacoffee]: https://www.buymeacoffee.com/mathesonstep
\ No newline at end of file
+[![ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/mathesonsteplock)
\ No newline at end of file
diff --git a/tdm/build.yaml b/tdm/build.yaml
index 3ebb20e..0a0c177 100644
--- a/tdm/build.yaml
+++ b/tdm/build.yaml
@@ -1,2 +1,5 @@
 build_from:
-  amd64: homeassistant/amd64-base-debian:bullseye
\ No newline at end of file
+  amd64: ghcr.io/home-assistant/amd64-base-debian:bullseye
+codenotary:
+  base_image: notary@home-assistant.io
+  signer: cas@mathesonsteplock.ca
\ No newline at end of file
diff --git a/tdm/config.yaml b/tdm/config.yaml
index b7dd83b..88bfb4c 100644
--- a/tdm/config.yaml
+++ b/tdm/config.yaml
@@ -1,10 +1,11 @@
 name: Tasmota Device Manager
-version: '2022.2.0'
+version: '2022.5.0'
 slug: tdm
 description: GUI application to discover and monitor devices flashed with Tasmota
 arch:
   - amd64
 url: https://github.com/ikifar2012/tasmota-device-manager-addon
+codenotary: cas@mathesonsteplock.ca
 startup: application
 boot: auto
 services:
diff --git a/tdm/rootfs/etc/services.d/nginx/finish b/tdm/rootfs/etc/services.d/nginx/finish
index a29ced9..5227c34 100644
--- a/tdm/rootfs/etc/services.d/nginx/finish
+++ b/tdm/rootfs/etc/services.d/nginx/finish
@@ -5,4 +5,4 @@
 if { s6-test ${1} -ne 0 }
 if { s6-test ${1} -ne 256 }
 
-s6-svscanctl -t /var/run/s6/services
+/run/s6/basedir/bin/halt
diff --git a/tdm/rootfs/etc/services.d/tdm/finish b/tdm/rootfs/etc/services.d/tdm/finish
index a29ced9..5227c34 100644
--- a/tdm/rootfs/etc/services.d/tdm/finish
+++ b/tdm/rootfs/etc/services.d/tdm/finish
@@ -5,4 +5,4 @@
 if { s6-test ${1} -ne 0 }
 if { s6-test ${1} -ne 256 }
 
-s6-svscanctl -t /var/run/s6/services
+/run/s6/basedir/bin/halt