diff --git a/lib/exec_in_chroot.sh b/lib/exec_in_chroot.sh
index 6d52112..e1d8057 100755
--- a/lib/exec_in_chroot.sh
+++ b/lib/exec_in_chroot.sh
@@ -64,10 +64,10 @@ default_prebuild(){
 	get_git_source
 }
 
+source /tmp/src/debmaker
 
 if [ ! "$1" == "" ];
-then 
-	source /tmp/src/debmaker
+then
 	FUNC=$1
 	shift
 	${FUNC} $*
diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker
index 64a0983..007dde5 100755
--- a/ressources/adguardhome/debmaker
+++ b/ressources/adguardhome/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.108.0-b.12
+VERSION=0.108.0-b.14
 APP=adguardhome
 DEPOT=https://github.com/AdguardTeam/AdGuardHome.git
 GIT_VERSION=v${VERSION}
diff --git a/ressources/authelia/debmaker b/ressources/authelia/debmaker
index a569b81..6cf3824 100755
--- a/ressources/authelia/debmaker
+++ b/ressources/authelia/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=4.36.4
+VERSION=4.36.7
 APP=authelia
 DEPOT=https://github.com/authelia/authelia.git
 GIT_VERSION=v${VERSION}
diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker
index db968dd..2f3d37d 100755
--- a/ressources/element-web/debmaker
+++ b/ressources/element-web/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.11.3
+VERSION=1.11.4
 APP=element-web
 DEPOT=https://github.com/vector-im/element-web.git
 GIT_VERSION=v${VERSION}
diff --git a/ressources/gitea/debmaker b/ressources/gitea/debmaker
index 3962ad2..3742a69 100755
--- a/ressources/gitea/debmaker
+++ b/ressources/gitea/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.17.0
+VERSION=1.17.2
 APP=gitea
 DEPOT=https://github.com/go-gitea/gitea.git
 GIT_VERSION=v${VERSION}
diff --git a/ressources/gotify/debmaker b/ressources/gotify/debmaker
index 489183d..6fd05d4 100755
--- a/ressources/gotify/debmaker
+++ b/ressources/gotify/debmaker
@@ -1,18 +1,20 @@
 #!/bin/bash
 
 APP=gotify
-VERSION=2.1.5
+VERSION=2.1.6
 GIT_VERSION=v$VERSION
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=6
+DEPOT=https://github.com/gotify/server.git
+PACKAGE_DEPENDENCY="build-essential nodejs yarn"
 
 STEP="base_package_upgrade envinit get_git_source build makedeb"
 
 envinit() {
 	configure_depot_yarn
 	configure_depot_nodejs
-	apt install -y --no-install-recommends build-essential nodejs yarn
+	install_package_dependency
 	install_go
 }
 
@@ -31,6 +33,7 @@ makedeb(){
 	PATH_DEB=/tmp/src/rootfs
 
 	cp /tmp/${APP}/gotify-server ${PATH_DEB}/usr/bin/
+	chmod +x ${PATH_DEB}/usr/bin/gotify-server
 	cp /tmp/${APP}/config.example.yml ${PATH_DEB}/etc/gotify/config.yml
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
diff --git a/ressources/gotify/rootfs/usr/lib/systemd/system/gotify.service b/ressources/gotify/rootfs/usr/lib/systemd/system/gotify.service
index a347207..fb04a74 100644
--- a/ressources/gotify/rootfs/usr/lib/systemd/system/gotify.service
+++ b/ressources/gotify/rootfs/usr/lib/systemd/system/gotify.service
@@ -7,7 +7,7 @@ After=network.target
 User=gotify
 Group=gotify
 ExecStart=/usr/bin/gotify-server
-WorkingDirectory=/var/lib/gotify-server
+WorkingDirectory=/var/lib/gotify
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ressources/joplin-desktop/debmaker b/ressources/joplin-desktop/debmaker
index e6b674f..f409761 100755
--- a/ressources/joplin-desktop/debmaker
+++ b/ressources/joplin-desktop/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.9.2
+VERSION=2.9.4
 APP=joplin-desktop
 GIT_VERSION=v${VERSION}
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker
index 55adc3f..c6213d4 100755
--- a/ressources/metabase/debmaker
+++ b/ressources/metabase/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.44.1
+VERSION=0.44.2
 APP=metabase
 DEPOT=https://github.com/metabase/metabase.git
 GIT_VERSION=v$VERSION
diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker
index c9d7a22..b044b2b 100755
--- a/ressources/zigbee2mqtt/debmaker
+++ b/ressources/zigbee2mqtt/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.27.0
+VERSION=1.27.2
 APP=zigbee2mqtt
 DEPOT=https://github.com/Koenkk/zigbee2mqtt.git
 GIT_VERSION=${VERSION}