diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker
index 6273fab..591cfad 100755
--- a/ressources/adguardhome/debmaker
+++ b/ressources/adguardhome/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.108.0-b.9
+VERSION=0.108.0-b.11
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
diff --git a/ressources/authelia/debmaker b/ressources/authelia/debmaker
index eb7d484..123939c 100755
--- a/ressources/authelia/debmaker
+++ b/ressources/authelia/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=4.36.2
+VERSION=4.36.3
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker
index 3ba07d8..1d64ea5 100755
--- a/ressources/bitwarden-desktop/debmaker
+++ b/ressources/bitwarden-desktop/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2022.6.1
+VERSION=2022.6.2
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker
index ded23fb..402f337 100755
--- a/ressources/element-web/debmaker
+++ b/ressources/element-web/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.11.0
+VERSION=1.11.2
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
diff --git a/ressources/gitea/debmaker b/ressources/gitea/debmaker
index 6fa20cd..7d3e13c 100755
--- a/ressources/gitea/debmaker
+++ b/ressources/gitea/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.16.9
+VERSION=1.17.0
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
@@ -20,14 +20,12 @@ envinit() {
 	wget -qO - https://deb.nodesource.com/setup_16.x | bash
 	apt-get update
 	apt-get install -y nodejs
-	wget -qO - https://go.dev/dl/go1.17.7.linux-amd64.tar.gz | tar -C /usr/local -xz
+	wget -qO - https://go.dev/dl/go1.18.1.linux-amd64.tar.gz | tar -C /usr/local -xz
 }
 
 prebuild(){
-	[ -e /tmp/git ] && rm -fr /tmp/git
-	[ -e /tmp/${APP} ] || mkdir /tmp/${APP}
-	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/git
-	cp -r /tmp/git/. /tmp/${APP}
+	[ -e /tmp/git ] && rm -fr /tmp/${APP}
+	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/${APP}
 }
 
 build() {
diff --git a/ressources/gotify/debmaker b/ressources/gotify/debmaker
index aa320dc..94732f0 100755
--- a/ressources/gotify/debmaker
+++ b/ressources/gotify/debmaker
@@ -3,31 +3,32 @@
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
 APP=gotify
-VERSION=2.1.4
+VERSION=2.1.5
 GIT_VERSION=v$VERSION
-DEB_VERSION=$VERSION-2
+DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=4
+IMAGE_SIZE=6
 
 STEP="envinit prebuild build makedeb"
 
 envinit() {
-	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot
+	apt-get update
+	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot gnupg2
 	wget -qO - https://deb.nodesource.com/setup_16.x | bash
 	wget -qO - https://dl.yarnpkg.com/debian/pubkey.gpg | gpg --dearmor  > /usr/share/keyrings/yarnkey.gpg
 	echo "deb [signed-by=/usr/share/keyrings/yarnkey.gpg] https://dl.yarnpkg.com/debian stable main" > /etc/apt/sources.list.d/yarn.list
 	apt-get update
 	apt-get install -y nodejs yarn
-	wget -qO - https://go.dev/dl/go1.17.7.linux-amd64.tar.gz | tar -C /usr/local -xz
+	wget -qO - https://go.dev/dl/go1.18.1.linux-amd64.tar.gz | tar -C /usr/local -xz
 }
 
 prebuild(){
-	GIT_VERSION=$1
-	git clone --depth 1 -b ${GIT_VERSION} https://github.com/gotify/server.git /tmp/server
+	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+	git clone --depth 1 -b ${GIT_VERSION} https://github.com/gotify/server.git /tmp/${APP}
 }
 
 build() {
-	cd /tmp/server/
+	cd /tmp/${APP}
 	PATH=${PATH}:/usr/local/go/bin
 	export GO111MODULE=on
 	make download-tools
@@ -38,12 +39,10 @@ build() {
 }
 
 makedeb(){
-	GIT_VERSION=$1
-	DEB_VERSION=$2
 	PATH_DEB=/tmp/src/rootfs
-	
-	cp /tmp/server/gotify-server ${PATH_DEB}/usr/bin/
-	cp /tmp/server/config.example.yml ${PATH_DEB}/etc/gotify/config.yml
+
+	cp /tmp/${APP}/gotify-server ${PATH_DEB}/usr/bin/
+	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/DEBIAN/postinst b/ressources/gotify/rootfs/DEBIAN/postinst
index 4752511..7659bf4 100755
--- a/ressources/gotify/rootfs/DEBIAN/postinst
+++ b/ressources/gotify/rootfs/DEBIAN/postinst
@@ -2,4 +2,4 @@
 
 id gotify &> /dev/null || useradd gotify	-r -s /bin/false -md /var/lib/gotify
 
-chown -R www-data:www-data /var/lib/grocy/data/
+chown -R www-data:www-data /var/lib/gotify/data/
diff --git a/ressources/joplin/debmaker b/ressources/joplin/debmaker
index d66ccb6..dbdfe0a 100755
--- a/ressources/joplin/debmaker
+++ b/ressources/joplin/debmaker
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-GIT_VERSION=v2.8.8
-DEB_VERSION_DESKTOP=2.8.8-$(date +%Y%m%d%H%M)
+GIT_VERSION=v2.9.1
+DEB_VERSION_DESKTOP=2.9.1-$(date +%Y%m%d%H%M)
 DEB_VERSION_SERVER=2.7.8-$(date +%Y%m%d%H%M)
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
diff --git a/ressources/mautrix-whatsapp/debian/changelog b/ressources/mautrix-whatsapp/debian/changelog
index 65f3a89..83e5814 100644
--- a/ressources/mautrix-whatsapp/debian/changelog
+++ b/ressources/mautrix-whatsapp/debian/changelog
@@ -1,10 +1,16 @@
+mautrix-whatsapp (0.6.0) UNRELEASED; urgency=medium
+
+  * First deb version
+
+ -- Thomas Legay <thomas@lgy.fr>  Mon, 17 Jul 2022 21:08:37 +0200
+
 mautrix-whatsapp (0.5.0) UNRELEASED; urgency=medium
 
   * First deb version
 
  -- Thomas Legay <thomas@lgy.fr>  Mon, 03 Jul 2022 21:08:37 +0200
  
- mautrix-whatsapp (0.4.0) UNRELEASED; urgency=medium
+mautrix-whatsapp (0.4.0) UNRELEASED; urgency=medium
 
   * First deb version
 
diff --git a/ressources/mautrix-whatsapp/debmaker b/ressources/mautrix-whatsapp/debmaker
index a1c14f2..6889d82 100755
--- a/ressources/mautrix-whatsapp/debmaker
+++ b/ressources/mautrix-whatsapp/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.5.0
+VERSION=0.6.0
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker
index fc650a6..5229701 100755
--- a/ressources/metabase/debmaker
+++ b/ressources/metabase/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.43.4
+VERSION=0.44
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
diff --git a/ressources/rustdesk-server/debmaker b/ressources/rustdesk-server/debmaker
index c41e310..9e3342c 100755
--- a/ressources/rustdesk-server/debmaker
+++ b/ressources/rustdesk-server/debmaker
@@ -3,7 +3,7 @@
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
 APP=rustdesk-server
-VERSION=1.1.5
+VERSION=1.1.5-1
 GIT_VERSION=$VERSION
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker
index 7c36726..b55b1d6 100755
--- a/ressources/zigbee2mqtt/debmaker
+++ b/ressources/zigbee2mqtt/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.26.0
+VERSION=1.27.0
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh