diff --git a/ressources/cloudbeaver/debmaker b/ressources/cloudbeaver/debmaker
index 9803d04..f91463c 100755
--- a/ressources/cloudbeaver/debmaker
+++ b/ressources/cloudbeaver/debmaker
@@ -9,7 +9,13 @@ DEBIAN_VERSION_CODENAME=bullseye
 IMAGE_SIZE=5
 PACKAGE_DEPENDENCY="nodejs yarn maven openjdk-11-jdk"
 
-STEP="base_package_upgrade envinit get_git_source build makedeb"
+main(){
+	base_package_upgrade
+	envinit
+	get_git_source
+	build
+	makedeb
+}
 
 envinit() {
 	configure_depot_yarn
@@ -31,6 +37,10 @@ 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 f593c15..276d0b2 100644
--- a/ressources/cloudbeaver/rootfs/DEBIAN/conffiles
+++ b/ressources/cloudbeaver/rootfs/DEBIAN/conffiles
@@ -1 +1,5 @@
-/etc/default/cloudbeaver
+/etc/cloudbeaver/cloudbeaver.conf
+/etc/cloudbeaver/logback.xml
+/etc/cloudbeaver/initial-data-sources.conf
+/etc/cloudbeaver/initial-data.conf
+/etc/cloudbeaver/product.conf
diff --git a/ressources/cloudbeaver/rootfs/DEBIAN/control b/ressources/cloudbeaver/rootfs/DEBIAN/control
index 95dab01..30ac3f4 100644
--- a/ressources/cloudbeaver/rootfs/DEBIAN/control
+++ b/ressources/cloudbeaver/rootfs/DEBIAN/control
@@ -3,5 +3,6 @@ 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
deleted file mode 100644
index a31f759..0000000
--- a/ressources/cloudbeaver/rootfs/etc/default/cloudbeaver
+++ /dev/null
@@ -1 +0,0 @@
-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 9c64fe2..a8980d5 100644
--- a/ressources/cloudbeaver/rootfs/usr/lib/systemd/system/cloudbeaver.service
+++ b/ressources/cloudbeaver/rootfs/usr/lib/systemd/system/cloudbeaver.service
@@ -2,11 +2,14 @@
 Description=cloudbeaver
  
 [Service]
-Type=exec
 User=cloudbeaver
-EnvironmentFile=-/etc/default/cloudbeaver
+Group=cloudbeaver
 ExecStart=/usr/share/cloudbeaver/run-server.sh
-WorkingDirectory=/var/lib/cloudbeaver
+WorkingDirectory=/usr/share/cloudbeaver
+PrivateTmp=true
+PrivateDevices=true
+ProtectHome=true
+ProtectSystem=strict
 Restart=on-failure
 RestartSec=30s
 ReadWritePaths=/var/lib/cloudbeaver