diff --git a/README.MD b/README.MD
index bb3f260..61db22a 100644
--- a/README.MD
+++ b/README.MD
@@ -8,24 +8,25 @@ All package are install with chroot environnement.
 To create deb file you just need to run the bellow command :
 
 ```bash
-. joplin-server2deb
+. ressources/joplin/joplin
 debmaker_run
 ```
+This commande create joplin and joplin-server packages
 
 ### packages available in shared repository
 
-  - [adguardhome](#adguardhome)
-  - [authelia](#authelia)
-  - [element-web](#element-web)
-  - [gotify](#gotify)
-  - [grocy](#grocy)
-  - [joplin-server](#joplin-server)
-  - [mautrix-syncproxy and mautrix-wsproxy](#mautrix-syncproxy-and-mautrix-wsproxy)
-  - [rss-bridge](#rss-bridge)
-  - [tt-rss](#tt-rss)
-  - [vaultwarden and vaultwarden-web](#vaultwarden-and-vaultwarden-web)
-  - [wallabag](#wallabag)
-  - [zigbee2mqtt](#zigbee2mqtt)
+  - [adguardhome](#adguardhome) [site](https://adguard.com/fr/adguard-home/overview.html)
+  - [authelia](#authelia) [site](https://www.authelia.com/)
+  - [element-web](#element-web) [site](https://element.io/)
+  - [gotify](#gotify) [site](https://gotify.net/)
+  - [grocy](#grocy) [site](https://grocy.info/)
+  - [joplin-server](#joplin-server) [site](https://joplinapp.org/)
+  - [mautrix-syncproxy and mautrix-wsproxy](#mautrix-syncproxy-and-mautrix-wsproxy) [site](https://docs.mau.fi/bridges/go/imessage/android/setup.html)
+  - [rss-bridge](#rss-bridge) [site](https://github.com/rss-bridge/rss-bridge)
+  - [tt-rss](#tt-rss) [site](https://tt-rss.org/)
+  - [vaultwarden and vaultwarden-web](#vaultwarden-and-vaultwarden-web) [site](https://github.com/dani-garcia/vaultwarden)
+  - [wallabag](#wallabag) [site](https://www.wallabag.it/)
+  - [zigbee2mqtt](#zigbee2mqtt) [site](https://www.zigbee2mqtt.io/)
 
 #### adguardhome
 ```bash
diff --git a/adguardhome2deb b/adguardhome2deb
deleted file mode 100755
index ba99ac9..0000000
--- a/adguardhome2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=adguardhome
-VERSION=0.108.0-b.3 
-GIT_VERSION=v$VERSION
-DEB_VERSION=$VERSION-1
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=4
-
-source ./lib/function.sh
diff --git a/authelia2deb b/authelia2deb
deleted file mode 100755
index 4db1ad9..0000000
--- a/authelia2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=authelia
-VERSION=4.33.2 
-GIT_VERSION=v$VERSION
-DEB_VERSION=$VERSION-4
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=4
-
-source ./lib/function.sh
diff --git a/element-web2deb b/element-web2deb
deleted file mode 100755
index 5a2bb75..0000000
--- a/element-web2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=element-web
-VERSION=1.10.4
-GIT_VERSION=v$VERSION
-DEB_VERSION=$VERSION-1
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=
-
-source ./lib/function.sh
diff --git a/gotify2deb b/gotify2deb
deleted file mode 100755
index ac5a7e2..0000000
--- a/gotify2deb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-APP=gotify
-VERSION=2.1.4
-GIT_VERSION=v$VERSION
-DEB_VERSION=$VERSION-2
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=4
-
-source ./lib/function.sh
-
diff --git a/grocy2deb b/grocy2deb
deleted file mode 100755
index 19baa6d..0000000
--- a/grocy2deb
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-APP=grocy
-VERSION=3.2.0
-GIT_VERSION=v$VERSION
-DEB_VERSION=$VERSION-5
-DEBIAN_VERSION_CODENAME=sid
-IMAGE_SIZE=
-
-source ./lib/function.sh
diff --git a/joplin-server2deb b/joplin-server2deb
deleted file mode 100755
index 76ee72c..0000000
--- a/joplin-server2deb
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-
-APP=joplin-server
-VERSION=2.7.4
-GIT_VERSION=server-v$VERSION
-DEB_VERSION=$VERSION-2
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=6
-
-source ./lib/function.sh
diff --git a/joplin2deb b/joplin2deb
deleted file mode 100755
index ebcd4a0..0000000
--- a/joplin2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=joplin
-VERSION=2.7.13
-GIT_VERSION=$VERSION
-DEB_VERSION=$VERSION-1
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=
-
-source ./lib/function.sh
diff --git a/lib/function.sh b/lib/function.sh
index c1a0c34..f4de886 100644
--- a/lib/function.sh
+++ b/lib/function.sh
@@ -1,6 +1,5 @@
 #!/bin/bash
 
-source ressources/${APP}/${APP}
 DEBOOTSTRAP_DIR=cache/debootstrap/
 MOUNT_PATH=/mnt/debmaker
 
@@ -48,7 +47,7 @@ zdebmaker_inject(){
 	sudo mkdir -p ${MOUNT_PATH}/${APP}/tmp/src
 	sudo cp -fr ressources/${APP}/* ${MOUNT_PATH}/${APP}/tmp/src
 	sudo cp -fr lib/exec_in_chroot.sh ${MOUNT_PATH}/${APP}/tmp/src
-	find ${MOUNT_PATH}/${APP}/tmp/src -name .gitkeep -exec rm {} \;
+	sudo find ${MOUNT_PATH}/${APP}/tmp/src -name .gitkeep -exec rm {} \;
 	sudo umount  ${MOUNT_PATH}/${APP}/
 }
 
diff --git a/mautrix-syncproxy2deb b/mautrix-syncproxy2deb
deleted file mode 100755
index 6cd16cb..0000000
--- a/mautrix-syncproxy2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=mautrix-syncproxy
-VERSION=0.0.1
-GIT_VERSION=$VERSION
-DEB_VERSION=$VERSION-1
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=2
-
-source ./lib/function.sh
diff --git a/mautrix-whatsapp2deb b/mautrix-whatsapp2deb
deleted file mode 100755
index a974010..0000000
--- a/mautrix-whatsapp2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=mautrix-whatsapp
-VERSION=0.2.4
-GIT_VERSION=v$VERSION
-DEB_VERSION=$VERSION-3
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=
-
-source ./lib/function.sh
diff --git a/mautrix-wsproxy2deb b/mautrix-wsproxy2deb
deleted file mode 100755
index e15beb5..0000000
--- a/mautrix-wsproxy2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=mautrix-wsproxy
-VERSION=1.0.0
-GIT_VERSION=$VERSION
-DEB_VERSION=$VERSION-1
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=2
-
-source ./lib/function.sh
diff --git a/ressources/adguardhome/adguardhome b/ressources/adguardhome/adguardhome
index 367c400..df85112 100755
--- a/ressources/adguardhome/adguardhome
+++ b/ressources/adguardhome/adguardhome
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+APP=adguardhome
+
+VERSION=0.108.0-b.3 
+GIT_VERSION=v$VERSION
+DEB_VERSION=$VERSION-1
+
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=4
 STEP="envinit prebuild build makedeb"
 
 envinit() {
@@ -13,7 +22,6 @@ envinit() {
 }
 
 prebuild(){
-	GIT_VERSION=$1
 	git clone --depth 1 -b ${GIT_VERSION} https://github.com/AdguardTeam/AdGuardHome.git /tmp/adguardhome
 }
 
@@ -24,8 +32,6 @@ build() {
 }
 
 makedeb(){
-	GIT_VERSION=$1
-	DEB_VERSION=$2
 	PATH_DEB=/tmp/src/rootfs
 
 	cp /tmp/adguardhome/AdGuardHome ${PATH_DEB}/usr/bin/adguardhome
diff --git a/ressources/authelia/authelia b/ressources/authelia/authelia
index 0dff869..7fe6d7f 100755
--- a/ressources/authelia/authelia
+++ b/ressources/authelia/authelia
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=authelia
+VERSION=4.33.2 
+GIT_VERSION=v$VERSION
+DEB_VERSION=$VERSION-4
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=4
+
 STEP="envinit prebuild build makedeb"
 
 envinit() {
diff --git a/ressources/element-web/element-web b/ressources/element-web/element-web
index 6f50ffb..499bae0 100755
--- a/ressources/element-web/element-web
+++ b/ressources/element-web/element-web
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=element-web
+VERSION=1.10.4
+GIT_VERSION=v$VERSION
+DEB_VERSION=$VERSION-1
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=
+
 STEP="envinit prebuild build makedeb"
 
 envinit() {
diff --git a/ressources/gotify/gotify b/ressources/gotify/gotify
index 0a784db..aa320dc 100755
--- a/ressources/gotify/gotify
+++ b/ressources/gotify/gotify
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=gotify
+VERSION=2.1.4
+GIT_VERSION=v$VERSION
+DEB_VERSION=$VERSION-2
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=4
+
 STEP="envinit prebuild build makedeb"
 
 envinit() {
diff --git a/ressources/grocy/grocy b/ressources/grocy/grocy
index a9710e6..bf6a4ad 100755
--- a/ressources/grocy/grocy
+++ b/ressources/grocy/grocy
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=grocy
+VERSION=3.2.0
+GIT_VERSION=v$VERSION
+DEB_VERSION=$VERSION-5
+DEBIAN_VERSION_CODENAME=sid
+IMAGE_SIZE=
+
 STEP="envinit prebuild build makedeb"
 
 envinit() {
diff --git a/ressources/joplin-server/joplin-server b/ressources/joplin-server/joplin-server
deleted file mode 100755
index 401dd93..0000000
--- a/ressources/joplin-server/joplin-server
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-STEP="envinit prebuild build makedeb"
-
-envinit() {
-	apt install -y --no-install-recommends build-essential git python wget ca-certificates
-	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(){
-	GIT_VERSION=$1
-	git clone --depth 1 -b ${GIT_VERSION} https://github.com/laurent22/joplin.git /tmp/joplin
-	cd /tmp/joplin
-	rm -fr packages/app*
-	rm -fr packages/generator-joplin 
-	rm -fr packages/plugin-repo-cli
-	rm -fr packages/plugins
-}
-
-build() {
-	cd /tmp/joplin/
-	BUILD_SEQUENCIAL=1 yarn install
-}
-
-makedeb(){
-	GIT_VERSION=$1
-	DEB_VERSION=$2
-	PATH_DEB=/tmp/src/rootfs
-
-	cp -fr /tmp/joplin/packages/* ${PATH_DEB}/usr/lib/joplin-server/
-	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
-	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
-}
-
diff --git a/ressources/joplin/joplin b/ressources/joplin/joplin
index 2e76d30..dc995ac 100755
--- a/ressources/joplin/joplin
+++ b/ressources/joplin/joplin
@@ -1,20 +1,64 @@
 #!/bin/bash
 
-STEP="envinit makedeb"
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=joplin
+
+GIT_VERSION=v2.7.14
+DEB_VERSION_DESKTOP=2.7.14-4
+DEB_VERSION_SERVER=2.7.4-4
+
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=12
+
+STEP="envinit prebuild build makedeb"
 
 envinit() {
-	apt-get install -y --no-install-recommends wget ca-certificates fakeroot dpkg
+	apt install -y --no-install-recommends build-essential git python wget ca-certificates rsync fakeroot dpkg 
+	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(){
+	git clone --depth 1 -b ${GIT_VERSION} https://github.com/laurent22/joplin.git /tmp/joplin
+	cd /tmp/joplin
+#	rm -fr packages/app*
+#	rm -fr packages/generator-joplin 
+#	rm -fr packages/plugin-repo-cli
+#	rm -fr packages/plugins
+	rm -fr packages/app-mobile
+}
+
+build() {
+	cd /tmp/joplin/
+	BUILD_SEQUENCIAL=1 yarn install
+	cd packages/app-desktop
+	npm run dist
+}
 
 makedeb(){
-	GIT_VERSION=$1
-	DEB_VERSION=$2
-	PATH_DEB=/tmp/src/rootfs
+	PATH_DEB=/tmp/src/rootfs-server/
 
-	wget https://github.com/laurent22/joplin/releases/download/v${GIT_VERSION}/Joplin-${GIT_VERSION}.AppImage -qO ${PATH_DEB}/usr/share/joplin/Joplin.AppImage
-	chmod +x ${PATH_DEB}/usr/share/joplin/Joplin.AppImage
-	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
+	cp -fr /tmp/joplin/packages/lib ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/turndown-plugin-gfm ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/turndown ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/htmlpack ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/fork-uslug ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/fork-sax ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/renderer ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/fork-htmlparser2 ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/tools ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin/packages/server ${PATH_DEB}/usr/share/joplin-server/
+	sed -i "s/%VERSION%/$DEB_VERSION_SERVER/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
+
+	PATH_DEB=/tmp/src/rootfs-desktop/
+	cp /tmp/joplin/packages/app-desktop/dist/Joplin-*.AppImage ${PATH_DEB}/usr/share/joplin/Joplin.AppImage
+	sed -i "s/%VERSION%/$DEB_VERSION_DESKTOP/" ${PATH_DEB}/DEBIAN/control
+	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
+
 }
 
diff --git a/ressources/joplin-server/rootfs/DEBIAN/changelog b/ressources/joplin/rootfs-desktop/DEBIAN/changelog
similarity index 100%
rename from ressources/joplin-server/rootfs/DEBIAN/changelog
rename to ressources/joplin/rootfs-desktop/DEBIAN/changelog
diff --git a/ressources/joplin/rootfs/DEBIAN/control b/ressources/joplin/rootfs-desktop/DEBIAN/control
similarity index 74%
rename from ressources/joplin/rootfs/DEBIAN/control
rename to ressources/joplin/rootfs-desktop/DEBIAN/control
index 9944ad5..976f5ec 100644
--- a/ressources/joplin/rootfs/DEBIAN/control
+++ b/ressources/joplin/rootfs-desktop/DEBIAN/control
@@ -3,5 +3,6 @@ Version: %VERSION%
 Section: base
 Priority: optional
 Architecture: all
+Depends: nodejs
 Maintainer: Thomas Legay <thomas@syngate.fr>
-Description: joplin 
+Description: joplin desktop
diff --git a/ressources/joplin/rootfs/usr/bin/joplin b/ressources/joplin/rootfs-desktop/usr/bin/joplin
similarity index 100%
rename from ressources/joplin/rootfs/usr/bin/joplin
rename to ressources/joplin/rootfs-desktop/usr/bin/joplin
diff --git a/ressources/joplin/rootfs/usr/share/applications/joplin.desktop b/ressources/joplin/rootfs-desktop/usr/share/applications/joplin.desktop
similarity index 100%
rename from ressources/joplin/rootfs/usr/share/applications/joplin.desktop
rename to ressources/joplin/rootfs-desktop/usr/share/applications/joplin.desktop
diff --git a/ressources/joplin/rootfs/usr/share/joplin/joplin.png b/ressources/joplin/rootfs-desktop/usr/share/joplin/joplin.png
similarity index 100%
rename from ressources/joplin/rootfs/usr/share/joplin/joplin.png
rename to ressources/joplin/rootfs-desktop/usr/share/joplin/joplin.png
diff --git a/ressources/joplin/rootfs/DEBIAN/changelog b/ressources/joplin/rootfs-server/DEBIAN/changelog
similarity index 100%
rename from ressources/joplin/rootfs/DEBIAN/changelog
rename to ressources/joplin/rootfs-server/DEBIAN/changelog
diff --git a/ressources/joplin-server/rootfs/DEBIAN/conffiles b/ressources/joplin/rootfs-server/DEBIAN/conffiles
similarity index 100%
rename from ressources/joplin-server/rootfs/DEBIAN/conffiles
rename to ressources/joplin/rootfs-server/DEBIAN/conffiles
diff --git a/ressources/joplin-server/rootfs/DEBIAN/control b/ressources/joplin/rootfs-server/DEBIAN/control
similarity index 100%
rename from ressources/joplin-server/rootfs/DEBIAN/control
rename to ressources/joplin/rootfs-server/DEBIAN/control
diff --git a/ressources/joplin-server/rootfs/DEBIAN/postinst b/ressources/joplin/rootfs-server/DEBIAN/postinst
similarity index 100%
rename from ressources/joplin-server/rootfs/DEBIAN/postinst
rename to ressources/joplin/rootfs-server/DEBIAN/postinst
diff --git a/ressources/joplin-server/rootfs/etc/default/joplin-server b/ressources/joplin/rootfs-server/etc/default/joplin-server
similarity index 100%
rename from ressources/joplin-server/rootfs/etc/default/joplin-server
rename to ressources/joplin/rootfs-server/etc/default/joplin-server
diff --git a/ressources/joplin-server/rootfs/etc/systemd/system/joplin-server.service b/ressources/joplin/rootfs-server/etc/systemd/system/joplin-server.service
similarity index 100%
rename from ressources/joplin-server/rootfs/etc/systemd/system/joplin-server.service
rename to ressources/joplin/rootfs-server/etc/systemd/system/joplin-server.service
diff --git a/ressources/joplin-server/rootfs/usr/lib/joplin-server/.gitkeep b/ressources/joplin/rootfs-server/usr/share/joplin-server/.gitkeep
similarity index 100%
rename from ressources/joplin-server/rootfs/usr/lib/joplin-server/.gitkeep
rename to ressources/joplin/rootfs-server/usr/share/joplin-server/.gitkeep
diff --git a/ressources/mautrix-syncproxy/mautrix-syncproxy b/ressources/mautrix-syncproxy/mautrix-syncproxy
index 9d17dd7..814c273 100755
--- a/ressources/mautrix-syncproxy/mautrix-syncproxy
+++ b/ressources/mautrix-syncproxy/mautrix-syncproxy
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=mautrix-syncproxy
+VERSION=0.0.1
+GIT_VERSION=$VERSION
+DEB_VERSION=$VERSION-1
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=2
+
 STEP="envinit prebuild build makedeb"
 
 envinit() {
diff --git a/ressources/mautrix-whatsapp/mautrix-whatsapp b/ressources/mautrix-whatsapp/mautrix-whatsapp
index 140f418..465038b 100755
--- a/ressources/mautrix-whatsapp/mautrix-whatsapp
+++ b/ressources/mautrix-whatsapp/mautrix-whatsapp
@@ -1,5 +1,15 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=mautrix-whatsapp
+VERSION=0.2.4
+GIT_VERSION=v$VERSION
+DEB_VERSION=$VERSION-3
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=
+
+
 STEP="envinit prebuild build makedeb"
 
 envinit() {
diff --git a/ressources/mautrix-wsproxy/mautrix-wsproxy b/ressources/mautrix-wsproxy/mautrix-wsproxy
index 625c481..731ba8c 100755
--- a/ressources/mautrix-wsproxy/mautrix-wsproxy
+++ b/ressources/mautrix-wsproxy/mautrix-wsproxy
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=mautrix-wsproxy
+VERSION=1.0.0
+GIT_VERSION=$VERSION
+DEB_VERSION=$VERSION-1
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=2
+
 STEP="envinit prebuild build makedeb"
 
 envinit() {
diff --git a/ressources/rss-bridge/rss-bridge b/ressources/rss-bridge/rss-bridge
index 04acdc3..bdfe90c 100755
--- a/ressources/rss-bridge/rss-bridge
+++ b/ressources/rss-bridge/rss-bridge
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=rss-bridge
+VERSION=2022-01-20
+GIT_VERSION=$VERSION
+DEB_VERSION=$VERSION-3
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=1
+
 STEP="envinit prebuild makedeb"
 
 envinit() {
diff --git a/ressources/tt-rss/tt-rss b/ressources/tt-rss/tt-rss
index fede619..e8e8cab 100755
--- a/ressources/tt-rss/tt-rss
+++ b/ressources/tt-rss/tt-rss
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=tt-rss
+VERSION=$(date +%Y%m.%d.%H%M)
+GIT_VERSION=$VERSION
+DEB_VERSION=$VERSION
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=1
+
 STEP="envinit prebuild makedeb"
 # build 
 
diff --git a/ressources/vaultwarden-web/vaultwarden-web b/ressources/vaultwarden-web/vaultwarden-web
index 7b7cd8d..cf22a8e 100755
--- a/ressources/vaultwarden-web/vaultwarden-web
+++ b/ressources/vaultwarden-web/vaultwarden-web
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=vaultwarden-web
+VERSION=2.25.1
+GIT_VERSION=v$VERSION
+DEB_VERSION=$VERSION-2
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=
+
 STEP="envinit prebuild build makedeb"
 
 envinit() {
diff --git a/ressources/vaultwarden/rootfs/var/lib/vaultwarden/.gitkeep b/ressources/vaultwarden/rootfs/var/lib/vaultwarden/.gitkeep
deleted file mode 100644
index 8b13789..0000000
--- a/ressources/vaultwarden/rootfs/var/lib/vaultwarden/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ressources/vaultwarden/rootfs/var/lib/vaultwarden/.keep b/ressources/vaultwarden/rootfs/var/lib/vaultwarden/.keep
new file mode 100644
index 0000000..e69de29
diff --git a/ressources/vaultwarden/vaultwarden b/ressources/vaultwarden/vaultwarden
index d678ef3..87dd3d1 100755
--- a/ressources/vaultwarden/vaultwarden
+++ b/ressources/vaultwarden/vaultwarden
@@ -1,9 +1,19 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=vaultwarden
+VERSION=1.24.0
+GIT_VERSION=$VERSION
+DEB_VERSION=$VERSION-1
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=6
+
+
 STEP="envinit prebuild build makedeb"
 
 envinit() {
-	apt install -y --no-install-recommends build-essential git wget fakeroot dpkg ca-certificates libmariadb-dev libpq-dev pkg-config libmysql++-dev
+	apt install -y --no-install-recommends build-essential git wget fakeroot dpkg ca-certificates libmariadb-dev libpq-dev pkg-config libmysql++-dev 
 	cd /tmp 
 	wget -qO - https://sh.rustup.rs > rustup
 	bash rustup -qy
diff --git a/ressources/wallabag/wallabag b/ressources/wallabag/wallabag
index 867e263..51cdf46 100755
--- a/ressources/wallabag/wallabag
+++ b/ressources/wallabag/wallabag
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=wallabag
+VERSION=2.4.3
+GIT_VERSION=$VERSION
+DEB_VERSION=$VERSION-3
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=2
+
 STEP="envinit prebuild build makedeb"
 
 envinit() {
diff --git a/ressources/zigbee2mqtt/zigbee2mqtt b/ressources/zigbee2mqtt/zigbee2mqtt
index fe498f7..aab5c06 100755
--- a/ressources/zigbee2mqtt/zigbee2mqtt
+++ b/ressources/zigbee2mqtt/zigbee2mqtt
@@ -1,5 +1,14 @@
 #!/bin/bash
 
+[ -e ./lib/function.sh ] && source ./lib/function.sh
+
+APP=zigbee2mqtt
+VERSION=1.23.0
+GIT_VERSION=$VERSION
+DEB_VERSION=$VERSION-3
+DEBIAN_VERSION_CODENAME=bullseye
+IMAGE_SIZE=
+
 STEP="envinit prebuild build makedeb"
 
 envinit() {
diff --git a/rss-bridge2deb b/rss-bridge2deb
deleted file mode 100755
index e8e096f..0000000
--- a/rss-bridge2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=rss-bridge
-VERSION=2022-01-20
-GIT_VERSION=$VERSION
-DEB_VERSION=$VERSION-3
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=1
-
-source ./lib/function.sh
diff --git a/tt-rss2deb b/tt-rss2deb
deleted file mode 100755
index 37b710c..0000000
--- a/tt-rss2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=tt-rss
-VERSION=$(date +%Y%m.%d.%H%M)
-GIT_VERSION=$VERSION
-DEB_VERSION=$VERSION
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=1
-
-source ./lib/function.sh
diff --git a/vaultwarden-web2deb b/vaultwarden-web2deb
deleted file mode 100755
index cdeea93..0000000
--- a/vaultwarden-web2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=vaultwarden-web
-VERSION=2.25.1
-GIT_VERSION=v$VERSION
-DEB_VERSION=$VERSION-2
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=
-
-source ./lib/function.sh
diff --git a/vaultwarden2deb b/vaultwarden2deb
deleted file mode 100755
index 56811de..0000000
--- a/vaultwarden2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=vaultwarden
-VERSION=1.24.0
-GIT_VERSION=$VERSION
-DEB_VERSION=$VERSION-1
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=6
-
-source ./lib/function.sh
diff --git a/wallabag2deb b/wallabag2deb
deleted file mode 100755
index 4f6e357..0000000
--- a/wallabag2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=wallabag
-VERSION=2.4.3
-GIT_VERSION=$VERSION
-DEB_VERSION=$VERSION-3
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=2
-
-source ./lib/function.sh
diff --git a/zigbee2mqtt2deb b/zigbee2mqtt2deb
deleted file mode 100755
index f564f5d..0000000
--- a/zigbee2mqtt2deb
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-APP=zigbee2mqtt
-VERSION=1.23.0
-GIT_VERSION=$VERSION
-DEB_VERSION=$VERSION-3
-DEBIAN_VERSION_CODENAME=bullseye
-IMAGE_SIZE=
-
-source ./lib/function.sh