diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker
index 4ebab00..c100a7f 100755
--- a/ressources/element-web/debmaker
+++ b/ressources/element-web/debmaker
@@ -1,14 +1,13 @@
 #!/bin/bash
 
-VERSION=1.10.8
-RELEASE=1
+VERSION=1.10.9
 
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
 APP=element-web
 DEPOT=https://github.com/vector-im/element-web.git
 GIT_VERSION=v${VERSION}
-DEB_VERSION=${VERSION}-${RELEASE}
+DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=4
 
diff --git a/ressources/joplin/debmaker b/ressources/joplin/debmaker
index 2d4102d..cdbdbc5 100755
--- a/ressources/joplin/debmaker
+++ b/ressources/joplin/debmaker
@@ -1,39 +1,43 @@
 #!/bin/bash
 
+GIT_VERSION=v2.8.1
+DEB_VERSION_DESKTOP=2.8.1-$(date +%Y%m%d%H%M)
+DEB_VERSION_SERVER=2.7.4-$(date +%Y%m%d%H%M)
+
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
 APP=joplin
-
-GIT_VERSION=v2.7.14
-DEB_VERSION_DESKTOP=2.7.15-1
-DEB_VERSION_SERVER=2.7.4-4
-
+DEPOT=https://github.com/laurent22/joplin.git
 DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=12
 
 STEP="envinit prebuild build makedeb"
 
 envinit() {
-	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
+	if [ $(dpkg -l | grep -e 'ii  build-essential ' | wc -l) -eq 1 ];
+	then 
+		apt-get dist-upgrade -y
+	else
+		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
+	fi
 }
 
-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
+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}
+	rm -fr /tmp/${APP}/packages/app-mobile
 }
 
 build() {
-	cd /tmp/joplin/
+	cd /tmp/${APP}/
 	BUILD_SEQUENCIAL=1 yarn install
 	cd packages/app-desktop
 	npm run dist
@@ -56,6 +60,7 @@ makedeb(){
 	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