diff --git a/debmaker b/debmaker
index ff4f78f..293500d 100755
--- a/debmaker
+++ b/debmaker
@@ -1,5 +1,4 @@
 #!/bin/bash
-source ./lib/function.sh
 case $1 in
 list)
   ls ressources;;
diff --git a/lib/exec_in_chroot.sh b/lib/exec_in_chroot.sh
index e1d8057..9256eef 100755
--- a/lib/exec_in_chroot.sh
+++ b/lib/exec_in_chroot.sh
@@ -1,23 +1,13 @@
 #!/bin/bash
 
-base_package_upgrade(){
+minimum_package() {
 	apt update
-	apt dist-upgrade -y
-	apt install -y git wget ca-certificates dpkg fakeroot gnupg2
+	apt install -y git wget ca-certificates dpkg fakeroot gnupg
 }
 
-install_package_dependency(){
-	apt-get install -y --no-install-recommends ${PACKAGE_DEPENDENCY}
-}
-
-get_git_source(){
+default_prebuild(){
         [ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
-		if [ "${GIT_VERSION}" = "last" ] ;
-		then
-			git clone --depth 1 ${DEPOT}  /tmp/${APP}
-		else
-			git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/${APP}
-		fi
+        git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/${APP}
 }
 
 configure_depot_yarn() {
@@ -51,23 +41,10 @@ install_rust() {
 	bash /tmp/rustup -qy
 }
 
-install_rust() {
-	wget -qO - https://download.clojure.org/install/linux-install-1.11.1.1155.sh | bash
-}
-
-
-minimum_package() {
-	base_package_upgrade
-}
-
-default_prebuild(){
-	get_git_source
-}
-
-source /tmp/src/debmaker
 
 if [ ! "$1" == "" ];
-then
+then 
+	source /tmp/src/debmaker
 	FUNC=$1
 	shift
 	${FUNC} $*
diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker
index 007dde5..c126a60 100755
--- a/ressources/adguardhome/debmaker
+++ b/ressources/adguardhome/debmaker
@@ -1,15 +1,30 @@
 #!/bin/bash
 
-VERSION=0.108.0-b.14
+VERSION=0.108.0-b.11
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=adguardhome
 DEPOT=https://github.com/AdguardTeam/AdGuardHome.git
 GIT_VERSION=v${VERSION}
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
-PACKAGE_DEPENDENCY="build-essential nodejs yarn"
+STEP="envinit prebuild build makedeb"
 
-STEP="base_package_upgrade configure_depot_yarn configure_depot_nodejs install_package_dependency install_go get_git_source build makedeb"
+envinit() {
+	configure_depot_yarn
+	configure_depot_nodejs
+	apt-get update
+	apt-get dist-upgrade -y
+	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot nodejs yarn
+	install_go
+}
+
+prebuild(){
+	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
+}
 
 build() {
 	cd /tmp/${APP}
diff --git a/ressources/authelia/debmaker b/ressources/authelia/debmaker
index 6cf3824..0ee8fe4 100755
--- a/ressources/authelia/debmaker
+++ b/ressources/authelia/debmaker
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-VERSION=4.36.7
+VERSION=4.36.4
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=authelia
 DEPOT=https://github.com/authelia/authelia.git
 GIT_VERSION=v${VERSION}
@@ -8,10 +11,12 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=6
 
-STEP="base_package_upgrade envinit get_git_source build makedeb"
+STEP="minimum_package envinit default_prebuild build makedeb"
 
 envinit() {
 	configure_depot_nodejs
+	apt-get update
+	apt-get dist-upgrade -y
 	apt install -y --no-install-recommends build-essential nodejs
 	install_go
 	wget -qO - https://get.pnpm.io/install.sh | sh -
diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker
index f4ad272..c20f554 100755
--- a/ressources/bitwarden-desktop/debmaker
+++ b/ressources/bitwarden-desktop/debmaker
@@ -1,15 +1,25 @@
 #!/bin/bash
 
 VERSION=2022.8.1
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=bitwarden-desktop
 DEPOT=https://github.com/bitwarden/clients.git
 GIT_VERSION=desktop-v${VERSION}
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=10
-PACKAGE_DEPENDENCY="pkg-config libsecret-1-dev yarn nodejs"
 
-STEP="base_package_upgrade configure_depot_yarn configure_depot_nodejs install_package_dependency get_git_source build makedeb"
+STEP="minimum_package envinit default_prebuild build makedeb"
+
+envinit() {
+	configure_depot_yarn
+	configure_depot_nodejs
+	apt-get update
+	apt-get dist-upgrade -y
+	apt install -y --no-install-recommends build-essential pkg-config libsecret-1-dev yarn nodejs
+}
 
 build() {
 	cd /tmp/${APP}
diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker
index 2f3d37d..7f13054 100755
--- a/ressources/element-web/debmaker
+++ b/ressources/element-web/debmaker
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-VERSION=1.11.4
+VERSION=1.11.2
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=element-web
 DEPOT=https://github.com/vector-im/element-web.git
 GIT_VERSION=v${VERSION}
@@ -8,14 +11,22 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
 
-STEP="base_package_upgrade envinit get_git_source build makedeb"
+STEP="envinit prebuild build makedeb"
 
 envinit() {
+	minimum_package
 	configure_depot_yarn
 	configure_depot_nodejs
+	apt-get update
+	apt-get dist-upgrade -y
 	apt install -y --no-install-recommends yarn nodejs
 }
 
+prebuild(){
+	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT}  /tmp/${APP}
+}
+
 build() {
 	cd /tmp/${APP}
 	yarn install
diff --git a/ressources/flame/debmaker b/ressources/flame/debmaker
index 4b29b0c..e05a5ff 100755
--- a/ressources/flame/debmaker
+++ b/ressources/flame/debmaker
@@ -1,15 +1,34 @@
 #!/bin/bash
 
 VERSION=2.3.0
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=flame
 DEPOT=https://github.com/pawelmalak/flame.git
 GIT_VERSION=v${VERSION}
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=3
-PACKAGE_DEPENDENCY="build-essential nodejs npm"
 
-STEP="base_package_upgrade install_package_dependency get_git_source build makedeb"
+STEP="envinit prebuild build makedeb"
+
+envinit() {
+	apt-get update
+	if [ $(dpkg -l | grep -e 'ii  nodejs ' | wc -l) -eq 1 ];
+	then 
+		apt-get dist-upgrade -y
+	else
+		apt install -y --no-install-recommends  git wget ca-certificates dpkg fakeroot build-essential nodejs npm
+	fi
+}
+
+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}
+}
 
 build() {
 	cd /tmp/${APP}/
diff --git a/ressources/gitea/debmaker b/ressources/gitea/debmaker
index 3742a69..ccce49c 100755
--- a/ressources/gitea/debmaker
+++ b/ressources/gitea/debmaker
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-VERSION=1.17.2
+VERSION=1.17.0
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=gitea
 DEPOT=https://github.com/go-gitea/gitea.git
 GIT_VERSION=v${VERSION}
@@ -8,10 +11,13 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=5
 
-STEP="base_package_upgrade envinit default_prebuild build makedeb"
+STEP="envinit default_prebuild build makedeb"
 
 envinit() {
+	minimum_package
 	configure_depot_nodejs
+	apt-get update
+	apt-get dist-upgrade -y
 	apt install -y --no-install-recommends build-essential nodejs
 	install_go
 }
diff --git a/ressources/glpi/debmaker b/ressources/glpi/debmaker
index aadaf75..3a94aed 100755
--- a/ressources/glpi/debmaker
+++ b/ressources/glpi/debmaker
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 VERSION=10.0.2
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=glpi
 DEPOT=https://github.com/glpi-project/glpi.git
 GIT_VERSION=${VERSION}
@@ -8,11 +11,25 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
 
-STEP="base_package_upgrade envinit get_git_source build makedeb"
+STEP="envinit prebuild build makedeb"
 
 envinit() {
-	configure_depot_nodejs
-	apt install -y --no-install-recommends patch composer php-json php-xml php-curl php-gd php-intl php-ldap php-zip php-mysql gettext
+	apt-get update
+	if [ $(dpkg -l | grep -e 'ii  composer ' | wc -l) -eq 1 ];
+	then 
+		apt-get dist-upgrade -y
+	else
+		apt install -y --no-install-recommends git fakeroot dpkg patch composer php-json php-xml php-curl php-gd php-intl php-ldap php-zip php-mysql wget gettext
+		wget -qO - https://deb.nodesource.com/setup_16.x | bash
+		apt install nodejs
+	fi
+}
+
+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 -fr /tmp/git/. /tmp/${APP}
 }
 
 build(){
diff --git a/ressources/gotify/debmaker b/ressources/gotify/debmaker
index 6fd05d4..94732f0 100755
--- a/ressources/gotify/debmaker
+++ b/ressources/gotify/debmaker
@@ -1,21 +1,30 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=gotify
-VERSION=2.1.6
+VERSION=2.1.5
 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"
+STEP="envinit prebuild build makedeb"
 
 envinit() {
-	configure_depot_yarn
-	configure_depot_nodejs
-	install_package_dependency
-	install_go
+	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.18.1.linux-amd64.tar.gz | tar -C /usr/local -xz
+}
+
+prebuild(){
+	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+	git clone --depth 1 -b ${GIT_VERSION} https://github.com/gotify/server.git /tmp/${APP}
 }
 
 build() {
@@ -33,7 +42,6 @@ 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 fb04a74..a347207 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
+WorkingDirectory=/var/lib/gotify-server
 
 [Install]
 WantedBy=multi-user.target
diff --git a/ressources/grocy/debmaker b/ressources/grocy/debmaker
index c59644b..0fb0e40 100755
--- a/ressources/grocy/debmaker
+++ b/ressources/grocy/debmaker
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 VERSION=3.3.1
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=grocy
 DEPOT=https://github.com/grocy/grocy.git
 GIT_VERSION=v$VERSION
@@ -8,11 +11,27 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=sid
 IMAGE_SIZE=4
 
-STEP="base_package_upgrade envinit get_git_source build makedeb"
+STEP="envinit prebuild build makedeb"
 
 envinit() {
-	configure_depot_yarn
-	apt-get install -y --no-install-recommends composer php-simplexml php-gd unzip yarn
+	apt-get update
+		if [ $(dpkg -l | grep -e 'ii  php-simplexml ' | wc -l) -eq 1 ];
+	then
+		apt-get dist-upgrade -y
+	else
+		apt-get install -y --no-install-recommends wget ca-certificates gnupg2 composer git php-simplexml php-gd fakeroot dpkg unzip
+		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 yarn 
+	fi
+}
+
+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}
 }
 
 build() {
diff --git a/ressources/joplin-desktop/debmaker b/ressources/joplin-desktop/debmaker
index f409761..3d026b2 100755
--- a/ressources/joplin-desktop/debmaker
+++ b/ressources/joplin-desktop/debmaker
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-VERSION=2.9.4
+VERSION=2.9.2
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=joplin-desktop
 GIT_VERSION=v${VERSION}
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
@@ -8,11 +11,13 @@ DEPOT=https://github.com/laurent22/joplin.git
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=10
 
-STEP="base_package_upgrade envinit get_git_source build makedeb"
+STEP="minimum_package envinit default_prebuild build makedeb"
 
 envinit() {
 	configure_depot_yarn
 	configure_depot_nodejs
+	apt-get update
+	apt-get dist-upgrade -y
 	apt install -y --no-install-recommends build-essential python nodejs rsync yarn
 }
 
diff --git a/ressources/joplin-server/debmaker b/ressources/joplin-server/debmaker
index 6cf4c73..9f862e1 100755
--- a/ressources/joplin-server/debmaker
+++ b/ressources/joplin-server/debmaker
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 VERSION=2.7.4
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=joplin-server
 GIT_VERSION=server-v${VERSION}
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
@@ -8,11 +11,13 @@ DEPOT=https://github.com/laurent22/joplin.git
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=8
 
-STEP="base_package_upgrade envinit default_prebuild build makedeb"
+STEP="minimum_package envinit default_prebuild build makedeb"
 
 envinit() {
 	configure_depot_yarn
 	configure_depot_nodejs
+	apt-get update
+	apt-get dist-upgrade -y
 	apt install -y --no-install-recommends build-essential python nodejs rsync yarn
 }
 
diff --git a/ressources/libretranslate/debmaker b/ressources/libretranslate/debmaker
index a626c1e..0f08119 100755
--- a/ressources/libretranslate/debmaker
+++ b/ressources/libretranslate/debmaker
@@ -3,6 +3,8 @@
 VERSION=1.2.7 
 RELEASE=1
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=libretranslate
 DEPOT=https://github.com/LibreTranslate/LibreTranslate.git
 GIT_VERSION=v${VERSION}
diff --git a/ressources/mailhog/debmaker b/ressources/mailhog/debmaker
index d26b75f..0b00fc9 100755
--- a/ressources/mailhog/debmaker
+++ b/ressources/mailhog/debmaker
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 VERSION=1.1.0
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=mailhog
 DEPOT=https://github.com/mailhog/MailHog.git
 GIT_VERSION=v$VERSION-beta1
@@ -8,11 +11,18 @@ DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=2
 
-STEP="base_package_upgrade envinit base_package_upgrade build makedeb"
+STEP="envinit prebuild build makedeb"
 
 envinit() {
-	apt install -y --no-install-recommends build-essential
-	install_go
+	apt-get update
+	apt-get dist-upgrade -y
+	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot 
+	wget -qO - https://go.dev/dl/go1.18.linux-amd64.tar.gz | tar -C /usr/local -xz
+}
+
+prebuild(){
+	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
 }
 
 build() {
diff --git a/ressources/mautrix-syncproxy/debmaker b/ressources/mautrix-syncproxy/debmaker
index 46fe23f..814c273 100755
--- a/ressources/mautrix-syncproxy/debmaker
+++ b/ressources/mautrix-syncproxy/debmaker
@@ -1,22 +1,28 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=mautrix-syncproxy
-VERSION=last
+VERSION=0.0.1
 GIT_VERSION=$VERSION
-DEB_VERSION=0.1-$(date +%Y%m%d%H%M)
+DEB_VERSION=$VERSION-1
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=2
-DEPOT=https://github.com/mautrix/syncproxy.git
 
-STEP="base_package_upgrade envinit get_git_source build makedeb"
+STEP="envinit prebuild build makedeb"
 
 envinit() {
-	apt install -y --no-install-recommends build-essential
-	install_go
+	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot
+	wget -qO - https://go.dev/dl/go1.17.7.linux-amd64.tar.gz | tar -C /usr/local -xz
+}
+
+prebuild(){
+	GIT_VERSION=$1
+	git clone --depth 1 https://github.com/mautrix/syncproxy.git /tmp/mautrix-syncproxy
 }
 
 build() {
-	cd /tmp/${APP}
+	cd /tmp/mautrix-syncproxy/
 	PATH=$PATH:/usr/local/go/bin
 	go build -o mautrix-syncproxy
 }
diff --git a/ressources/mautrix-whatsapp/debian/changelog b/ressources/mautrix-whatsapp/debian/changelog
index f004ca7..83e5814 100644
--- a/ressources/mautrix-whatsapp/debian/changelog
+++ b/ressources/mautrix-whatsapp/debian/changelog
@@ -1,9 +1,3 @@
-mautrix-whatsapp (0.6.1) UNRELEASED; urgency=medium
-
-  * First deb version
-
- -- Thomas Legay <thomas@lgy.fr>  Mon, 17 Jul 2022 21:08:37 +0200
-
 mautrix-whatsapp (0.6.0) UNRELEASED; urgency=medium
 
   * First deb version
diff --git a/ressources/mautrix-whatsapp/debmaker b/ressources/mautrix-whatsapp/debmaker
index a962422..6889d82 100755
--- a/ressources/mautrix-whatsapp/debmaker
+++ b/ressources/mautrix-whatsapp/debmaker
@@ -1,8 +1,11 @@
 #!/bin/bash
 
-VERSION=0.6.1
+VERSION=0.6.0
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=mautrix-whatsapp
-DEPOT=https://github.com/mautrix/whatsapp.git
+DEPOT=https://github.com/mautrix/whatsapp.git 
 GIT_VERSION=v${VERSION}
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
diff --git a/ressources/mautrix-wsproxy/debmaker b/ressources/mautrix-wsproxy/debmaker
index d730820..731ba8c 100755
--- a/ressources/mautrix-wsproxy/debmaker
+++ b/ressources/mautrix-wsproxy/debmaker
@@ -1,32 +1,39 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=mautrix-wsproxy
 VERSION=1.0.0
-GIT_VERSION=last
-DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
+GIT_VERSION=$VERSION
+DEB_VERSION=$VERSION-1
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=2
-DEPOT=https://github.com/mautrix/wsproxy.git
 
-STEP="base_package_upgrade envinit get_git_source build makedeb"
+STEP="envinit prebuild build makedeb"
 
 envinit() {
-	apt install -y --no-install-recommends build-essential
-	install_go
+	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot
+	wget -qO - https://go.dev/dl/go1.17.7.linux-amd64.tar.gz | tar -C /usr/local -xz
+}
+
+prebuild(){
+	GIT_VERSION=$1
+	git clone --depth 1 https://github.com/mautrix/wsproxy.git /tmp/mautrix-wsproxy
 }
 
 build() {
-	cd /tmp/${APP}
+	cd /tmp/mautrix-wsproxy/
 	PATH=$PATH:/usr/local/go/bin
 	go build -o mautrix-wsproxy
 }
 
 makedeb(){
+	GIT_VERSION=$1
+	DEB_VERSION=$2
 	PATH_DEB=/tmp/src/rootfs
 
-	cp /tmp/${APP}/mautrix-wsproxy ${PATH_DEB}/usr/bin/mautrix-wsproxy
-	cp /tmp/${APP}/example-config.yaml ${PATH_DEB}/etc/mautrix-wsproxy.yaml
-	
+	cp /tmp/mautrix-wsproxy/mautrix-wsproxy ${PATH_DEB}/usr/bin/mautrix-wsproxy
+	cp /tmp/mautrix-wsproxy/example-config.yaml ${PATH_DEB}/etc/mautrix-wsproxy.yaml
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
 }
diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker
index c6213d4..5229701 100755
--- a/ressources/metabase/debmaker
+++ b/ressources/metabase/debmaker
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-VERSION=0.44.2
+VERSION=0.44
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=metabase
 DEPOT=https://github.com/metabase/metabase.git
 GIT_VERSION=v$VERSION
@@ -8,13 +11,25 @@ DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=10
 
-STEP="base_package_upgrade envinit get_git_source build makedeb"
+STEP="envinit prebuild build makedeb"
 
 envinit() {
-	configure_depot_yarn
-	configure_depot_nodejs
-	apt install -y --no-install-recommends build-essential openjdk-17-jdk curl nodejs yarn
-        wget -qO - https://download.clojure.org/install/linux-install-1.11.1.1155.sh | bash
+	apt-get update
+	apt-get dist-upgrade -y
+	apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot openjdk-17-jdk curl
+	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
+	curl https://download.clojure.org/install/linux-install-1.11.1.1149.sh | bash
+}
+
+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}
 }
 
 build() {
diff --git a/ressources/roundcubemail/debmaker b/ressources/roundcubemail/debmaker
index a324b12..d98b69a 100755
--- a/ressources/roundcubemail/debmaker
+++ b/ressources/roundcubemail/debmaker
@@ -1,15 +1,23 @@
 #!/bin/bash
 
 VERSION=1.6.0
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=roundcubemail
 DEPOT=https://github.com/roundcube/roundcubemail.git
 GIT_VERSION=${VERSION}
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
-PACKAGE_DEPENDENCY="make curl npm nodejs jq php-xml php-pear php-mbstring unzip"
 
-STEP="base_package_upgrade install_package_dependency default_prebuild build makedeb"
+STEP="minimum_package envinit default_prebuild build makedeb"
+
+envinit() {
+	apt-get update
+	apt-get dist-upgrade -y
+	apt-get install -y --no-install-recommends make curl npm nodejs jq php-xml php-pear php-mbstring unzip
+}
 
 build() {
 	cd /tmp/${APP}
diff --git a/ressources/rss-bridge/debmaker b/ressources/rss-bridge/debmaker
index 91caff0..371f082 100755
--- a/ressources/rss-bridge/debmaker
+++ b/ressources/rss-bridge/debmaker
@@ -1,6 +1,9 @@
 #!/bin/bash
 
 VERSION=2022-06-14
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=rss-bridge
 DEPOT=https://github.com/RSS-Bridge/rss-bridge.git
 GIT_VERSION=$VERSION
@@ -8,12 +11,24 @@ DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=1
 
-STEP="base_package_upgrade  default_prebuild makedeb"
+STEP="envinit prebuild makedeb"
+
+envinit() {
+	apt-get update
+	apt-get dist-upgrade -y
+	apt install -y --no-install-recommends git fakeroot dpkg git
+}
+
+prebuild(){
+	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+	git clone --depth 1 -b ${GIT_VERSION} ${DEPOT} /tmp/${APP}
+	
+}
 
 makedeb(){
 	PATH_DEB=/tmp/src/rootfs
 
-	cp -fr /tmp/${APP} ${PATH_DEB}/usr/share/
+	cp -fr /tmp/rss-bridge ${PATH_DEB}/usr/share/
 
 	cp ${PATH_DEB}/usr/share/rss-bridge/config.default.ini.php ${PATH_DEB}/etc/rss-bridge/config.ini.php 
 	cp ${PATH_DEB}/usr/share/rss-bridge/whitelist.default.txt ${PATH_DEB}/etc/rss-bridge/whitelist.txt
diff --git a/ressources/rustdesk-server/debmaker b/ressources/rustdesk-server/debmaker
index 847ae29..9e3342c 100755
--- a/ressources/rustdesk-server/debmaker
+++ b/ressources/rustdesk-server/debmaker
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=rustdesk-server
 VERSION=1.1.5-1
 GIT_VERSION=$VERSION
@@ -8,14 +10,25 @@ DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=5
 DEPOT=https://github.com/rustdesk/rustdesk-server.git
 
-STEP="minimum_package envinit prebuild build makedeb"
+STEP="envinit prebuild build makedeb"
+
+envinit() {
+	apt-get update
+	apt-get dist-upgrade -y
+	apt install -y --no-install-recommends wget fakeroot dpkg ca-certificates build-essential git
+	apt clean
+}
+
+STEP="envinit prebuild build makedeb"
 
 envinit() {
         apt-get update
         apt-get dist-upgrade -y
-        apt install -y --no-install-recommends build-essential 
+        apt install -y --no-install-recommends build-essential git wget fakeroot dpkg ca-certificates
+        cd /tmp
+        wget -qO - https://sh.rustup.rs > rustup
+        bash rustup -qy
         apt clean
-        install_rust
 }
 
 prebuild(){
diff --git a/ressources/tt-rss/debmaker b/ressources/tt-rss/debmaker
index 7877668..05b37a3 100755
--- a/ressources/tt-rss/debmaker
+++ b/ressources/tt-rss/debmaker
@@ -1,29 +1,47 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=tt-rss
 VERSION=$(date +%Y%m.%d.%H%M)
-GIT_VERSION=last
+GIT_VERSION=$VERSION
 DEB_VERSION=$VERSION
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=1
-DEPOT=https://git.tt-rss.org/fox/tt-rss.git
 
-STEP="base_package_upgrade get_git_source makedeb"
+STEP="envinit prebuild makedeb"
+# build 
+
+envinit() {
+	apt-get update
+	apt-get dist-upgrade -y
+	apt-get install -y --no-install-recommends wget ca-certificates fakeroot dpkg git
+	apt clean
+}
+
+prebuild(){
+	[ -e /tmp/${APP} ] && rm -fr /tmp/${APP}
+	git clone --depth 1 https://git.tt-rss.org/fox/tt-rss.git /tmp/${APP}
+}
+
+build() {
+	cd /tmp/${APP}
+}
 
 makedeb(){
 	PATH_DEB=/tmp/src/rootfs
 
-	cp -fr /tmp/${APP}/* ${PATH_DEB}/usr/share/tt-rss/
-	
-	mv ${PATH_DEB}/usr/share/tt-rss/{cache,feed-icons,lock} ${PATH_DEB}/var/lib/tt-rss/
+	cp -fr /tmp/tt-rss/* ${PATH_DEB}/usr/share/tt-rss/
+	mv ${PATH_DEB}/usr/share/tt-rss/cache ${PATH_DEB}/var/lib/tt-rss/
+	mv ${PATH_DEB}/usr/share/tt-rss/feed-icons ${PATH_DEB}/var/lib/tt-rss/
+	mv ${PATH_DEB}/usr/share/tt-rss/lock ${PATH_DEB}/var/lib/tt-rss/
 	mv ${PATH_DEB}/usr/share/tt-rss/config.php-dist ${PATH_DEB}/etc/tt-rss/config.php
-
+	
 	ln -s /var/lib/tt-rss/cache ${PATH_DEB}/usr/share/tt-rss/cache
 	ln -s /var/lib/tt-rss/feed-icons ${PATH_DEB}/usr/share/tt-rss/feed-icons
 	ln -s /var/lib/tt-rss/lock ${PATH_DEB}/usr/share/tt-rss/lock
-
+	
 	ln -s /etc/tt-rss/config.php ${PATH_DEB}/usr/share/tt-rss/config.php
-
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
 }
diff --git a/ressources/vaultwarden-web/debmaker b/ressources/vaultwarden-web/debmaker
index eab9aa9..0ce13bd 100755
--- a/ressources/vaultwarden-web/debmaker
+++ b/ressources/vaultwarden-web/debmaker
@@ -1,15 +1,25 @@
 #!/bin/bash
 
 VERSION=2022.6.2
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=vaultwarden-web
 GIT_VERSION=v$VERSION
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=5
 DEPOT=https://github.com/dani-garcia/bw_web_builds.git
-PACKAGE_DEPENDENCY="build-essential python nodejs"
 
-STEP="base_package_upgrade configure_depot_nodejs install_package_dependency get_git_source build makedeb"
+STEP="minimum_package envinit default_prebuild build makedeb"
+
+envinit() {
+	configure_depot_yarn
+	configure_depot_nodejs
+	apt-get update
+	apt-get dist-upgrade -y
+	apt install -y --no-install-recommends build-essential python nodejs
+}
 
 build() {
 	cd /tmp/${APP}
diff --git a/ressources/vaultwarden/debmaker b/ressources/vaultwarden/debmaker
index dadc9e4..c6dbeaf 100755
--- a/ressources/vaultwarden/debmaker
+++ b/ressources/vaultwarden/debmaker
@@ -1,15 +1,24 @@
 #!/bin/bash
 
 VERSION=1.25.2
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=vaultwarden
 GIT_VERSION=$VERSION
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=8
 DEPOT=https://github.com/dani-garcia/vaultwarden.git
-PACKAGE_DEPENDENCY="build-essential libmariadb-dev libpq-dev pkg-config libmysql++-dev"
 
-STEP="base_package_upgrade install_package_dependency install_rust default_prebuild build makedeb"
+STEP="minimum_package envinit default_prebuild build makedeb"
+
+envinit() {
+	apt-get update
+	apt-get dist-upgrade -y
+	apt install -y --no-install-recommends build-essential libmariadb-dev libpq-dev pkg-config libmysql++-dev
+	install_rust
+}
 
 build() {
 	cd /tmp/${APP}
diff --git a/ressources/wallabag/debmaker b/ressources/wallabag/debmaker
index 3422c57..3ac5b1b 100755
--- a/ressources/wallabag/debmaker
+++ b/ressources/wallabag/debmaker
@@ -1,19 +1,26 @@
 #!/bin/bash
 
-VERSION=2.5.1
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=wallabag
+VERSION=2.5.1
 GIT_VERSION=$VERSION
 DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
 DEPOT=https://github.com/wallabag/wallabag.git
 
-STEP="base_package_upgrade envinit prebuild build makedeb"
+STEP="envinit prebuild build makedeb"
 
 envinit() {
-	configure_depot_yarn
-	configure_depot_nodejs
-	apt-get install -y --no-install-recommends php-common php-xml php-json php-gd php-mbstring php-xml php-tidy php-curl  php-tokenizer php-bcmath php-intl php-fpm unzip make yarn nodejs
+	apt-get update
+	apt-get dist-upgrade -y
+	apt-get install -y --no-install-recommends wget ca-certificates git php-common php-xml php-json php-gd php-mbstring php-xml php-tidy php-curl  php-tokenizer php-bcmath php-intl php-fpm unzip fakeroot dpkg gpg make
+	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 yarn nodejs
 }
 
 prebuild(){
diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker
index b044b2b..7fffd37 100755
--- a/ressources/zigbee2mqtt/debmaker
+++ b/ressources/zigbee2mqtt/debmaker
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-VERSION=1.27.2
+VERSION=1.27.0
+
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
 APP=zigbee2mqtt
 DEPOT=https://github.com/Koenkk/zigbee2mqtt.git
 GIT_VERSION=${VERSION}