diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker
index 82a216a..df8d1ca 100755
--- a/ressources/adguardhome/debmaker
+++ b/ressources/adguardhome/debmaker
@@ -14,9 +14,9 @@ IMAGE_SIZE=4
 STEP="envinit prebuild build makedeb"
 
 envinit() {
+	apt-get update
 	if [ $(dpkg -l | grep -e 'ii  nodejs ' | wc -l) -eq 1 ];
 	then 
-		apt-get update
 		apt-get dist-upgrade -y
 	else
 		apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot
diff --git a/ressources/authelia/debmaker b/ressources/authelia/debmaker
index 17b7cc4..3768b42 100755
--- a/ressources/authelia/debmaker
+++ b/ressources/authelia/debmaker
@@ -15,9 +15,9 @@ IMAGE_SIZE=4
 STEP="envinit prebuild build makedeb"
 
 envinit() {
+	apt-get update
 	if [ $(dpkg -l | grep -e 'ii  nodejs ' | wc -l) -eq 1 ];
 	then 
-		apt-get update
 		apt-get dist-upgrade -y
 	else
 		apt install -y --no-install-recommends  git wget ca-certificates dpkg fakeroot build-essential
diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker
index d0e5b83..4ebab00 100755
--- a/ressources/element-web/debmaker
+++ b/ressources/element-web/debmaker
@@ -15,9 +15,9 @@ IMAGE_SIZE=4
 STEP="envinit prebuild build makedeb"
 
 envinit() {
+	apt-get update
 	if [ $(dpkg -l | grep -e 'ii  nodejs ' | wc -l) -eq 1 ];
 	then 
-		apt-get update
 		apt-get dist-upgrade -y
 	else
 		apt install -y --no-install-recommends  git wget ca-certificates dpkg fakeroot 
diff --git a/ressources/gitea/debmaker b/ressources/gitea/debmaker
index 1efff0b..1e4d0b4 100755
--- a/ressources/gitea/debmaker
+++ b/ressources/gitea/debmaker
@@ -14,9 +14,9 @@ IMAGE_SIZE=5
 STEP="envinit prebuild build makedeb"
 
 envinit() {
+	apt-get update
 	if [ $(dpkg -l | grep -e 'ii  nodejs ' | wc -l) -eq 1 ];
 	then 
-		apt-get update
 		apt-get dist-upgrade -y
 	else
 		apt install -y --no-install-recommends  git wget ca-certificates dpkg fakeroot build-essential
diff --git a/ressources/glpi/debmaker b/ressources/glpi/debmaker
index 5083ef8..7b811d2 100755
--- a/ressources/glpi/debmaker
+++ b/ressources/glpi/debmaker
@@ -14,9 +14,9 @@ IMAGE_SIZE=2
 STEP="envinit prebuild build makedeb"
 
 envinit() {
+	apt-get update
 	if [ $(dpkg -l | grep -e 'ii  composer ' | wc -l) -eq 1 ];
 	then 
-		apt-get update
 		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
diff --git a/ressources/grocy/debmaker b/ressources/grocy/debmaker
index bf6a4ad..76c5844 100755
--- a/ressources/grocy/debmaker
+++ b/ressources/grocy/debmaker
@@ -1,29 +1,37 @@
 #!/bin/bash
 
+VERSION=3.3.0
+
 [ -e ./lib/function.sh ] && source ./lib/function.sh
 
 APP=grocy
-VERSION=3.2.0
+DEPOT=https://github.com/grocy/grocy.git
 GIT_VERSION=v$VERSION
-DEB_VERSION=$VERSION-5
+DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=sid
-IMAGE_SIZE=
+IMAGE_SIZE=4
 
 STEP="envinit prebuild build makedeb"
 
 envinit() {
-	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 
-	apt-get -y dist-upgrade
+		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(){
-	GIT_VERSION=$1
-	[ -d /tmp/grocy/ ] && rm -fr /tmp/grocy/ 
-	git clone --depth 1 -b ${GIT_VERSION} https://github.com/grocy/grocy.git /tmp/grocy/
+	[ -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() {
@@ -34,8 +42,6 @@ build() {
 }
 
 makedeb(){
-	GIT_VERSION=$1
-	DEB_VERSION=$2
 	PATH_DEB=/tmp/src/rootfs
 
 	find /tmp/grocy -name .gitignore -exec rm {} \;
@@ -47,4 +53,3 @@ makedeb(){
 	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 8be7b0c..1dbc164 100755
--- a/ressources/metabase/debmaker
+++ b/ressources/metabase/debmaker
@@ -14,9 +14,9 @@ IMAGE_SIZE=10
 STEP="envinit prebuild build makedeb"
 
 envinit() {
+	apt-get update
 	if [ $(dpkg -l | grep -e 'ii  nodejs ' | wc -l) -eq 1 ];
 	then
-		apt-get update
 		apt-get dist-upgrade -y
 	else
 		apt install -y --no-install-recommends build-essential git wget ca-certificates dpkg fakeroot openjdk-17-jdk curl
diff --git a/ressources/slimbookbattery/debmaker b/ressources/slimbookbattery/debmaker
index a6e4e5f..623c4d6 100755
--- a/ressources/slimbookbattery/debmaker
+++ b/ressources/slimbookbattery/debmaker
@@ -12,9 +12,9 @@ IMAGE_SIZE=1
 STEP="envinit prebuild build makedeb"
 
 envinit() {
+	apt-get update
 	if [ $(dpkg -l | grep -e 'ii  debhelper ' | wc -l) -eq 1 ];
 	then 
-		apt-get update
 		apt-get dist-upgrade -y
 	else
 		apt install -y --no-install-recommends wget ca-certificates debhelper build-essential 
diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker
index d6eccd9..7b1f10b 100755
--- a/ressources/zigbee2mqtt/debmaker
+++ b/ressources/zigbee2mqtt/debmaker
@@ -15,9 +15,9 @@ IMAGE_SIZE=2
 STEP="envinit prebuild build makedeb"
 
 envinit() {
+	apt-get update
 	if [ $(dpkg -l | grep -e 'ii nodejs' | wc -l) -eq 1 ];
 	then
-		apt-get update
 		apt-get dist-upgrade -y
 	else
 		apt install -y --no-install-recommends wget ca-certificates nodejs npm git make g++ gcc fakeroot dpkg