diff --git a/lib/function.sh b/lib/function.sh
index f81e976..fae6eb3 100644
--- a/lib/function.sh
+++ b/lib/function.sh
@@ -87,18 +87,13 @@ debmaker_chroot() {
 
 debmaker_run(){
 	zdebmaker_getDep
-	[ -f cache/${APP} ] || zdebmaker_createAppOS
+	[ -f cache/${APP} ]  || zdebmaker_createAppOS
 	zdebmaker_inject
 	debmaker_mount_proc_sys cache/${APP} ${MOUNT_PATH}/${APP}/
-	if [ "$STEP" == "" ]
-	then
-		sudo chroot ${MOUNT_PATH}/${APP}/ /tmp/src/exec_in_chroot.sh main
-	else
-		for CURRENT_STEP in ${STEP}
-		do
-			sudo chroot ${MOUNT_PATH}/${APP}/ /tmp/src/exec_in_chroot.sh ${CURRENT_STEP}
-		done
-	fi
+	for CURRENT_STEP in ${STEP}
+	do
+		sudo chroot ${MOUNT_PATH}/${APP}/ /tmp/src/exec_in_chroot.sh ${CURRENT_STEP}
+	done
 	rm -fr dist/${APP}*
 	find ${MOUNT_PATH}/${APP}/tmp/dist/ -name *.deb -exec cp -v {} dist/ \;
 	debmaker_umount_proc_sys ${MOUNT_PATH}/${APP}/
diff --git a/ressources/cloudbeaver/debmaker b/ressources/cloudbeaver/debmaker
index f91463c..9803d04 100755
--- a/ressources/cloudbeaver/debmaker
+++ b/ressources/cloudbeaver/debmaker
@@ -9,13 +9,7 @@ DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=5
 PACKAGE_DEPENDENCY="nodejs yarn maven openjdk-11-jdk"
 
-main(){
-	base_package_upgrade
-	envinit
-	get_git_source
-	build
-	makedeb
-}
+STEP="base_package_upgrade envinit get_git_source build makedeb"
 
 envinit() {
 	configure_depot_yarn
@@ -37,10 +31,6 @@ makedeb(){
 	mv ${PATH_DEB}/usr/share/cloudbeaver/workspace   ${PATH_DEB}/var/lib/cloudbeaver/
 	ln -s /var/lib/cloudbeaver/workspace ${PATH_DEB}/usr/share/cloudbeaver/workspace
 
-	mkdir ${PATH_DEB}/etc/
-	mv ${PATH_DEB}/usr/share/cloudbeaver/conf   ${PATH_DEB}/etc/cloudbeaver/
-	ln -s /etc/cloudbeaver ${PATH_DEB}/usr/share/cloudbeaver/conf
-
 	sed -i "s/%VERSION%/$DEB_VERSION/" ${PATH_DEB}/DEBIAN/control
 	fakeroot dpkg-deb -Z gzip --build ${PATH_DEB} /tmp/dist
 }
diff --git a/ressources/cloudbeaver/rootfs/DEBIAN/conffiles b/ressources/cloudbeaver/rootfs/DEBIAN/conffiles
index 276d0b2..f593c15 100644
--- a/ressources/cloudbeaver/rootfs/DEBIAN/conffiles
+++ b/ressources/cloudbeaver/rootfs/DEBIAN/conffiles
@@ -1,5 +1 @@
-/etc/cloudbeaver/cloudbeaver.conf
-/etc/cloudbeaver/logback.xml
-/etc/cloudbeaver/initial-data-sources.conf
-/etc/cloudbeaver/initial-data.conf
-/etc/cloudbeaver/product.conf
+/etc/default/cloudbeaver
diff --git a/ressources/cloudbeaver/rootfs/DEBIAN/control b/ressources/cloudbeaver/rootfs/DEBIAN/control
index 30ac3f4..95dab01 100644
--- a/ressources/cloudbeaver/rootfs/DEBIAN/control
+++ b/ressources/cloudbeaver/rootfs/DEBIAN/control
@@ -3,6 +3,5 @@ Version: %VERSION%
 Section: base
 Priority: optional
 Architecture: all
-Depends: default-jre-headless
 Maintainer: Thomas Legay <thomas@lgy.fr>
 Description: cloudbeaver
diff --git a/ressources/cloudbeaver/rootfs/etc/default/cloudbeaver b/ressources/cloudbeaver/rootfs/etc/default/cloudbeaver
new file mode 100644
index 0000000..a31f759
--- /dev/null
+++ b/ressources/cloudbeaver/rootfs/etc/default/cloudbeaver
@@ -0,0 +1 @@
+CLOUDBEAVER_HOME=/usr/share/cloudbeaver/
diff --git a/ressources/cloudbeaver/rootfs/usr/lib/systemd/system/cloudbeaver.service b/ressources/cloudbeaver/rootfs/usr/lib/systemd/system/cloudbeaver.service
index a8980d5..9c64fe2 100644
--- a/ressources/cloudbeaver/rootfs/usr/lib/systemd/system/cloudbeaver.service
+++ b/ressources/cloudbeaver/rootfs/usr/lib/systemd/system/cloudbeaver.service
@@ -2,14 +2,11 @@
 Description=cloudbeaver
  
 [Service]
+Type=exec
 User=cloudbeaver
-Group=cloudbeaver
+EnvironmentFile=-/etc/default/cloudbeaver
 ExecStart=/usr/share/cloudbeaver/run-server.sh
-WorkingDirectory=/usr/share/cloudbeaver
-PrivateTmp=true
-PrivateDevices=true
-ProtectHome=true
-ProtectSystem=strict
+WorkingDirectory=/var/lib/cloudbeaver
 Restart=on-failure
 RestartSec=30s
 ReadWritePaths=/var/lib/cloudbeaver