diff --git a/lib/exec_in_chroot.sh b/lib/exec_in_chroot.sh
index a57ce7d..011b6f6 100755
--- a/lib/exec_in_chroot.sh
+++ b/lib/exec_in_chroot.sh
@@ -38,7 +38,7 @@ configure_depot_nodejs() {
 }
 
 install_go() {
-        GO_VERSION=1.19.2
+        GO_VERSION=1.20.4
         [ ! "$1" == "" ] && GO_VERSION=$1
         PATH=$PATH:/usr/local/go/bin
         if [ ! "$(go version)" == "go version go${GO_VERSION} linux/amd64" ] ;
diff --git a/ressources/adguardhome/debmaker b/ressources/adguardhome/debmaker
index 9ebb51c..686275c 100755
--- a/ressources/adguardhome/debmaker
+++ b/ressources/adguardhome/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.108.0-b.34
+VERSION=0.108.0-b.35
 APP=adguardhome
 DEPOT=https://github.com/AdguardTeam/AdGuardHome.git
 GIT_VERSION=v${VERSION}
diff --git a/ressources/babybuddy/debmaker b/ressources/babybuddy/debmaker
index 58d2af0..a37d89c 100755
--- a/ressources/babybuddy/debmaker
+++ b/ressources/babybuddy/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.15.1
+VERSION=1.16.0
 APP=babybuddy
 DEPOT=https://github.com/babybuddy/babybuddy.git
 GIT_VERSION=v${VERSION}
diff --git a/ressources/bitwarden-desktop/debmaker b/ressources/bitwarden-desktop/debmaker
index b04b6ac..b16480c 100755
--- a/ressources/bitwarden-desktop/debmaker
+++ b/ressources/bitwarden-desktop/debmaker
@@ -1,11 +1,11 @@
 #!/bin/bash
 
-VERSION=2023.4.0
+VERSION=2023.5.0
 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
+DEBIAN_VERSION_CODENAME=bookworm
 IMAGE_SIZE=8
 PACKAGE_DEPENDENCY="pkg-config libsecret-1-dev yarn nodejs build-essential libglib2.0-dev"
 
diff --git a/ressources/element-web/debmaker b/ressources/element-web/debmaker
index e891b7f..e24663f 100755
--- a/ressources/element-web/debmaker
+++ b/ressources/element-web/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.11.30
+VERSION=1.11.33
 APP=element-web
 DEPOT=https://github.com/vector-im/element-web.git
 GIT_VERSION=v${VERSION}
diff --git a/ressources/gitea/debmaker b/ressources/gitea/debmaker
index 7c63300..118f773 100755
--- a/ressources/gitea/debmaker
+++ b/ressources/gitea/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=1.19.2
+VERSION=1.19.3
 APP=gitea
 DEPOT=https://github.com/go-gitea/gitea.git
 GIT_VERSION=v${VERSION}
diff --git a/ressources/glpi/debmaker b/ressources/glpi/debmaker
index bf89d0b..1817bc5 100755
--- a/ressources/glpi/debmaker
+++ b/ressources/glpi/debmaker
@@ -27,6 +27,10 @@ makedeb(){
 	PATH_DEB=/tmp/src/rootfs
 	PATH_DEB_INSTALL=/tmp/src/rootfs-install
 
+	mkdir -p ${PATH_DEB}/usr/share/doc/glpi/
+	mkdir -p ${PATH_DEB}/var/lib/glpi/
+	mkdir -p ${PATH_DEB}/etc/
+
 	tar -zxvf /tmp/${APP}-${VERSION}.tgz -C ${PATH_DEB}/usr/share/
 
 	mv ${PATH_DEB}/usr/share/glpi/install ${PATH_DEB_INSTALL}/usr/share/glpi/
@@ -35,14 +39,14 @@ makedeb(){
 	gzip ${PATH_DEB}/usr/share/doc/glpi/*
 
 	mv ${PATH_DEB}/usr/share/glpi/files ${PATH_DEB}/var/lib/glpi/
-	ln -s /var/lib/glpi/files ${PATH_DEB}/usr/share/glpi/files
+	mv ${PATH_DEB}/usr/share/glpi/config ${PATH_DEB}/etc/glpi
 
 	mv ${PATH_DEB}/usr/share/glpi/marketplace ${PATH_DEB}/var/lib/glpi/
 	ln -s /var/lib/glpi/marketplace ${PATH_DEB}/usr/share/glpi/marketplace
 
-	cp -r ${PATH_DEB}/usr/share/glpi/config/. ${PATH_DEB}/etc/glpi/
-	rm -fr ${PATH_DEB}/usr/share/glpi/config/
-	ln -s /etc/glpi/ ${PATH_DEB}/usr/share/glpi/config
+	mv ${PATH_DEB}/downstream.php ${PATH_DEB}/usr/share/glpi/inc/
+	mv ${PATH_DEB}/local_define.php ${PATH_DEB}/etc/glpi
+	mv ${PATH_DEB}/apache2-glpi.conf ${PATH_DEB}/usr/share/doc/glpi/
 
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
diff --git a/ressources/glpi/rootfs/apache2-glpi.conf b/ressources/glpi/rootfs/apache2-glpi.conf
new file mode 100644
index 0000000..8df014d
--- /dev/null
+++ b/ressources/glpi/rootfs/apache2-glpi.conf
@@ -0,0 +1,15 @@
+<VirtualHost *:80>
+	ServerName glpi.domaine.com
+	DocumentRoot /usr/share/glpi/public
+
+	<directory /usr/share/glpi/public>
+		Options FollowSymLinks
+		AllowOverride all
+		Require all granted
+		RewriteEngine On
+
+	        # Redirect all requests to GLPI router, unless file exists.
+		RewriteCond %{REQUEST_FILENAME} !-f
+	        RewriteRule ^(.*)$ index.php [QSA,L]
+	</directory>
+</VirtualHost>
diff --git a/ressources/glpi/rootfs/downstream.php b/ressources/glpi/rootfs/downstream.php
new file mode 100644
index 0000000..f26e783
--- /dev/null
+++ b/ressources/glpi/rootfs/downstream.php
@@ -0,0 +1,6 @@
+<?php
+define('GLPI_CONFIG_DIR', '/etc/glpi/');
+
+if (file_exists(GLPI_CONFIG_DIR . '/local_define.php')) {
+   require_once GLPI_CONFIG_DIR . '/local_define.php';
+}
\ No newline at end of file
diff --git a/ressources/glpi/rootfs/etc/glpi/.gitkeep b/ressources/glpi/rootfs/etc/glpi/.gitkeep
deleted file mode 100644
index 8b13789..0000000
--- a/ressources/glpi/rootfs/etc/glpi/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ressources/glpi/rootfs/local_define.php b/ressources/glpi/rootfs/local_define.php
new file mode 100644
index 0000000..7cca157
--- /dev/null
+++ b/ressources/glpi/rootfs/local_define.php
@@ -0,0 +1,3 @@
+<?php
+define('GLPI_VAR_DIR', '/var/lib/glpi/files/');
+define('GLPI_LOG_DIR', '/var/log/glpi');
diff --git a/ressources/glpi/rootfs/usr/share/doc/glpi/apache2-glpi.conf b/ressources/glpi/rootfs/usr/share/doc/glpi/apache2-glpi.conf
deleted file mode 100644
index 5c5475b..0000000
--- a/ressources/glpi/rootfs/usr/share/doc/glpi/apache2-glpi.conf
+++ /dev/null
@@ -1,10 +0,0 @@
-<VirtualHost *:80>
-	ServerName glpi.domaine.com
-	DocumentRoot /usr/share/glpi
-
-	<directory /usr/share/glpi>
-		Options FollowSymLinks
-		AllowOverride all
-		Require all granted
-	</directory>
-</VirtualHost>
diff --git a/ressources/glpi/rootfs/var/lib/glpi/.gitkeep b/ressources/glpi/rootfs/var/lib/glpi/.gitkeep
deleted file mode 100644
index 8b13789..0000000
--- a/ressources/glpi/rootfs/var/lib/glpi/.gitkeep
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/ressources/joplin-desktop/debmaker b/ressources/joplin-desktop/debmaker
index ef9fee2..ba02689 100755
--- a/ressources/joplin-desktop/debmaker
+++ b/ressources/joplin-desktop/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.11.1
+VERSION=2.11.9
 APP=joplin-desktop
 GIT_VERSION=v${VERSION}
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
diff --git a/ressources/joplin-server/debmaker b/ressources/joplin-server/debmaker
index 1e8d66c..c7c2cd5 100755
--- a/ressources/joplin-server/debmaker
+++ b/ressources/joplin-server/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2.10.11
+VERSION=2.11.1
 APP=joplin-server
 GIT_VERSION=server-v${VERSION}
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
@@ -25,7 +25,7 @@ build() {
 makedeb(){
 	PATH_DEB=/tmp/src/rootfs/
 
-	cp -fr /tmp/joplin-server/packages/{lib,turndown-plugin-gfm,turndown,htmlpack,fork-uslug,fork-sax,renderer,fork-htmlparser2,tools,server} ${PATH_DEB}/usr/share/joplin-server/
+	cp -fr /tmp/joplin-server/packages/{lib,utils,turndown-plugin-gfm,turndown,htmlpack,fork-uslug,fork-sax,renderer,fork-htmlparser2,tools,server} ${PATH_DEB}/usr/share/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/kimai2/debmaker b/ressources/kimai2/debmaker
index b919781..7876193 100755
--- a/ressources/kimai2/debmaker
+++ b/ressources/kimai2/debmaker
@@ -1,7 +1,6 @@
 #!/bin/bash
 
-VERSION=1.30.11
-VERSION=2.0.16
+VERSION=2.0.25
 APP=kimai2
 DEPOT=https://github.com/kevinpapst/kimai2.git
 GIT_VERSION=${VERSION}
diff --git a/ressources/metabase/debmaker b/ressources/metabase/debmaker
index 4a0ec56..a7a8624 100755
--- a/ressources/metabase/debmaker
+++ b/ressources/metabase/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=0.46.2
+VERSION=0.46.4
 APP=metabase
 DEPOT=https://github.com/metabase/metabase.git
 GIT_VERSION=v$VERSION
diff --git a/ressources/rustdesk-server/debmaker b/ressources/rustdesk-server/debmaker
index f808fd2..5a08e33 100755
--- a/ressources/rustdesk-server/debmaker
+++ b/ressources/rustdesk-server/debmaker
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 APP=rustdesk-server
-VERSION=1.1.7-4
+VERSION=1.1.8
 GIT_VERSION=$VERSION
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
 DEBIAN_VERSION_CODENAME=bullseye
diff --git a/ressources/vaultwarden-web/debmaker b/ressources/vaultwarden-web/debmaker
index 81259ce..216fc2b 100755
--- a/ressources/vaultwarden-web/debmaker
+++ b/ressources/vaultwarden-web/debmaker
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-VERSION=2022.12.0
+VERSION=2023.5.0
 APP=vaultwarden-web
 GIT_VERSION=v$VERSION
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
diff --git a/ressources/vaultwarden/debmaker b/ressources/vaultwarden/debmaker
index a9baf60..f337fce 100755
--- a/ressources/vaultwarden/debmaker
+++ b/ressources/vaultwarden/debmaker
@@ -4,7 +4,7 @@ VERSION=1.28.1
 APP=vaultwarden
 GIT_VERSION=$VERSION
 DEB_VERSION=$VERSION-$(date +%Y%m%d%H%M)
-DEBIAN_VERSION_CODENAME=bullseye
+DEBIAN_VERSION_CODENAME=bookworm
 IMAGE_SIZE=8
 DEPOT=https://github.com/dani-garcia/vaultwarden.git
 PACKAGE_DEPENDENCY="build-essential libmariadb-dev libpq-dev pkg-config libmysql++-dev"
diff --git a/ressources/zigbee2mqtt/debmaker b/ressources/zigbee2mqtt/debmaker
index 0549063..7095205 100755
--- a/ressources/zigbee2mqtt/debmaker
+++ b/ressources/zigbee2mqtt/debmaker
@@ -1,18 +1,17 @@
 #!/bin/bash
 
-VERSION=1.30.3
-VERSION=1.30.2
+VERSION=1.31.2
 APP=zigbee2mqtt
 DEPOT=https://github.com/Koenkk/zigbee2mqtt.git
 GIT_VERSION=${VERSION}
-DEB_VERSION=1.30.3.1-$(date +%Y%m%d%H%M)
-DEBIAN_VERSION_CODENAME=bullseye
+DEB_VERSION=${VERSION}-$(date +%Y%m%d%H%M)
+DEBIAN_VERSION_CODENAME=bookworm
 IMAGE_SIZE=2
 PACKAGE_DEPENDENCY="nodejs make g++ gcc"
 
 main(){
 	base_package_upgrade
-	configure_depot_nodejs
+	configure_depot_nodejs 18
 	install_package_dependency
 	get_git_source
 	build