diff --git a/testing/baculum/APKBUILD b/testing/baculum/APKBUILD
index 2da16f04679639d8288b6361319ef6efc20c6b6c..740a0922da9df6bff061a06c89f2376ebb13b4df 100644
--- a/testing/baculum/APKBUILD
+++ b/testing/baculum/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=baculum
 pkgver=9.6.3
-pkgrel=6
+pkgrel=7
 pkgdesc="API layer to Baculum WebGUI tool for Bacula Community program"
 url="https://bacula.org/"
 arch="noarch"
@@ -49,6 +49,7 @@ subpackages="$pkgname-common:_common
 source="https://downloads.sourceforge.net/project/bacula/bacula/$pkgver/bacula-gui-$pkgver.tar.gz
 	 fix-missing-common-pages.patch
 	 fix-locale-symlinks.patch
+	 shared-config-dir.patch
 	 "
 builddir="$srcdir/"bacula-gui-$pkgver/baculum
 
@@ -70,7 +71,7 @@ package() {
 
 	chgrp -R www-data "$pkgdir"/etc/baculum/Config-*
 	chmod g+w "$pkgdir"/etc/baculum/Config-*
-	chmod g+r "$pkgdir"/etc/baculum/Config-*/baculum.users
+	chmod g+rw "$pkgdir"/etc/baculum/Config-*/baculum.users
 }
 
 _common() {
@@ -87,9 +88,9 @@ _common() {
 		usr/share/baculum/htdocs/index.php
 	install -d -m775 -g www-data "$subpkgdir"/var/cache/baculum \
 		"$subpkgdir"/var/log/baculum
-	ln -s /var/cache/baculum \
+	ln --relative -s "$subpkgdir"/var/cache/baculum \
 		"$subpkgdir"/usr/share/baculum/htdocs/assets
-	ln -s /var/cache/baculum \
+	ln --relative -s "$subpkgdir"/var/cache/baculum \
 		"$subpkgdir"/usr/share/baculum/htdocs/protected/runtime
 	ls -la "$subpkgdir"/var/cache/baculum
 }
@@ -97,68 +98,61 @@ _common() {
 _api() {
 	pkgdesc="Baculum API files"
 	depends="$pkgname-common=$pkgver-r$pkgrel $_api_depends"
-	amove \
+	amove etc/baculum/Config-api \
 		usr/share/baculum/htdocs/protected/API \
 		usr/share/locale/*/LC_MESSAGES/baculum-api.mo
 
 	# will be symlinks
 	rm -r "$subpkgdir"/usr/share/baculum/htdocs/protected/API/Config \
 		"$subpkgdir"/usr/share/baculum/htdocs/protected/API/Logs
-	ln -s /var/cache/baculum "$subpkgdir"/usr/share/baculum/htdocs/protected/API/Logs
+	ln --relative -s "$subpkgdir"/etc/baculum/Config-api \
+		"$subpkgdir"/usr/share/baculum/htdocs/protected/API/Config
+	ln --relative -s "$subpkgdir"/var/cache/baculum \
+		"$subpkgdir"/usr/share/baculum/htdocs/protected/API/Logs
+
 }
 
 _web() {
 	pkgdesc="Baculum Web files"
 	depends="$pkgname-common=$pkgver-r$pkgrel $_web_depends"
-	amove \
+	amove etc/baculum/Config-web \
 		usr/share/baculum/htdocs/protected/Web \
 		usr/share/locale/*/LC_MESSAGES/baculum-web.mo
+
 	# will be symlinks
 	rm -r "$subpkgdir"/usr/share/baculum/htdocs/protected/Web/Config \
 		"$subpkgdir"/usr/share/baculum/htdocs/protected/Web/Logs
-	ln -s /var/cache/baculum "$subpkgdir"/usr/share/baculum/htdocs/protected/Web/Logs
+	ln --relative -s "$subpkgdir"/var/cache/baculum \
+		"$subpkgdir"/usr/share/baculum/htdocs/protected/Web/Logs
+	ln --relative -s "$subpkgdir"/etc/baculum/Config-web \
+		"$subpkgdir"/usr/share/baculum/htdocs/protected/Web/Config
 }
 
 _api_apache2() {
 	pkgdesc="Apache configuration for Baculum API"
 	depends="$pkgname-api=$pkgver-r$pkgrel $_apache_depends"
-	amove etc/baculum/Config-api-apache \
-		etc/apache2/conf.d/baculum-api.conf
-	mkdir -p "$subpkgdir"/usr/share/baculum/htdocs/protected/API
-	ln -s /etc/baculum/Config-api-apache \
-		"$subpkgdir"/usr/share/baculum/htdocs/protected/API/Config
+	amove etc/apache2/conf.d/baculum-api.conf
 }
 
 _api_lighttpd() {
 	pkgdesc="Lighttpd configuration for Baculum API"
 	depends="$pkgname-api=$pkgver-r$pkgrel $_lighttpd_depends"
-	amove etc/baculum/Config-api-lighttpd \
-		etc/baculum/baculum-api-lighttpd.conf
-	mkdir -p "$subpkgdir"/usr/share/baculum/htdocs/protected/API
-	ln -s /etc/baculum/Config-api-lighttpd \
-		"$subpkgdir"/usr/share/baculum/htdocs/protected/API/Config
+	amove etc/lighttpd/baculum-api.conf
 }
 
 _web_apache2() {
 	pkgdesc="Apache configuration for Baculum WebGUI"
 	depends="$pkgname-web=$pkgver-r$pkgrel $_apache_depends"
-	amove etc/baculum/Config-web-apache \
-		etc/apache2/conf.d/baculum-web.conf
-	mkdir -p "$subpkgdir"/usr/share/baculum/htdocs/protected/Web
-	ln -s /etc/baculum/Config-web-apache \
-		"$subpkgdir"/usr/share/baculum/htdocs/protected/Web/Config
+	amove etc/apache2/conf.d/baculum-web.conf
 }
 
 _web_lighttpd() {
 	pkgdesc="Lighttpd configuration for Baculum WebGUI"
 	depends="$pkgname-web=$pkgver-r$pkgrel $_lighttpd_depends"
-	amove etc/baculum/Config-web-lighttpd \
-		etc/baculum/baculum-web-lighttpd.conf
-	mkdir -p "$subpkgdir"/usr/share/baculum/htdocs/protected/Web
-	ln -s /etc/baculum/Config-web-lighttpd \
-		"$subpkgdir"/usr/share/baculum/htdocs/protected/Web/Config
+	amove etc/lighttpd/baculum-web.conf
 }
 
 sha512sums="1c23523cea4554eb4fbddfd5372567456c1a0df5752b063a5336e33ab1739ea288fb83355a698f54ee576bbe022aa12252e0a9d9942adbdd9c5bda627a16e339  bacula-gui-9.6.3.tar.gz
 6c87cd9c4e2946077b9f0204cccf231b1e4f70620b18590511a84859b391acbc20ee8471c6d7b1c0e62b1b64ee2d77e39aee600b3ea474131cc39510e830155b  fix-missing-common-pages.patch
-c0b23e5383baa32494f80d044724a3990de4035c6124691bfbe3664bc11e4a6f7c35d1a08626c62816748b44497f33634dc9eb1c9ab661ade7647c0b6c0eac9d  fix-locale-symlinks.patch"
+c0b23e5383baa32494f80d044724a3990de4035c6124691bfbe3664bc11e4a6f7c35d1a08626c62816748b44497f33634dc9eb1c9ab661ade7647c0b6c0eac9d  fix-locale-symlinks.patch
+02dd4948d69f101d1b147b844e3bedb51bb6c34beaebdd2111d6f6c5c6d86c3dd6100152039a6bd8581ae9c8de870a408d7506e3cd7a7f1998c59c941fa85759  shared-config-dir.patch"
diff --git a/testing/baculum/shared-config-dir.patch b/testing/baculum/shared-config-dir.patch
new file mode 100644
index 0000000000000000000000000000000000000000..a3efb27489e9d7c1efce200d3de1f2260f302721
--- /dev/null
+++ b/testing/baculum/shared-config-dir.patch
@@ -0,0 +1,68 @@
+diff --git a/Makefile b/Makefile
+index b156cf7..b327ca9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -15,6 +15,7 @@ SYSCONFDIR = /etc
+ SYSVARDIR = /var
+ CONFDIR = $(SYSCONFDIR)/$(NAME)
+ HTTPDCONFDIR = $(SYSCONFDIR)/$(HTTPDNAME)/$(HTTPDSITECONF)
++LIGHTTPDCONFDIR = $(SYSCONFDIR)/lighttpd
+ UNITDIR = $(SYSUSRDIR)/lib/systemd/system
+ LOCALEDIR = $(SYSUSRDIR)/share/locale
+ WWWDIR ?= $(SYSUSRDIR)/share/$(NAME)/htdocs
+@@ -84,16 +85,15 @@ prepare_build:
+ 	mkdir -p $(DESTDIR)$(SYSCONFDIR) \
+ 	$(DESTDIR)$(CONFDIR) \
+ 	$(DESTDIR)$(HTTPDCONFDIR) \
++	$(DESTDIR)$(LIGHTTPDCONFDIR) \
+ 	$(DESTDIR)$(UNITDIR) \
+ 	$(DESTDIR)$(WWWDIR) \
+ 	$(DESTDIR)$(CACHEDIR) \
+ 	$(DESTDIR)$(LOCALEDIR) \
+ 	$(DESTDIR)$(WWWDIR)/$(cachedir) \
+ 	$(DESTDIR)$(WWWDIR)/$(configcachedir)
+-	mkdir -m 750 -p $(DESTDIR)$(CONFDIR)/$(configdir)-api-apache \
+-	$(DESTDIR)$(CONFDIR)/$(configdir)-api-lighttpd \
+-	$(DESTDIR)$(CONFDIR)/$(configdir)-web-apache \
+-	$(DESTDIR)$(CONFDIR)/$(configdir)-web-lighttpd
++	mkdir -m 750 -p $(DESTDIR)$(CONFDIR)/$(configdir)-api \
++	$(DESTDIR)$(CONFDIR)/$(configdir)-web
+ 
+ prepare_data: prepare_build
+ 	mkdir -p $(DESTDIR)$(WWWDIR)/$(datadir) \
+@@ -129,16 +129,14 @@ prepare_locale: prepare_build
+ 	done
+ 
+ prepare_samples:
+-	install -m 644 $(samplesdir)/$(NAME)-api-lighttpd.conf $(DESTDIR)$(CONFDIR)
+-	install -m 644 $(samplesdir)/$(NAME)-web-lighttpd.conf $(DESTDIR)$(CONFDIR)
++	install -m 644 $(samplesdir)/$(NAME)-api-lighttpd.conf $(DESTDIR)$(LIGHTTPDCONFDIR)/$(NAME)-api.conf
++	install -m 644 $(samplesdir)/$(NAME)-web-lighttpd.conf $(DESTDIR)$(LIGHTTPDCONFDIR)/$(NAME)-web.conf
+ 	install -m 644 $(samplesdir)/$(NAME)-api-lighttpd.service $(DESTDIR)$(UNITDIR)
+ 	install -m 644 $(samplesdir)/$(NAME)-web-lighttpd.service $(DESTDIR)$(UNITDIR)
+ 	install -m 644 $(samplesdir)/$(NAME)-api-apache.conf $(DESTDIR)$(HTTPDCONFDIR)/$(NAME)-api.conf
+ 	install -m 644 $(samplesdir)/$(NAME)-web-apache.conf $(DESTDIR)$(HTTPDCONFDIR)/$(NAME)-web.conf
+-	install -m 600 $(samplesdir)/$(NAME).users $(DESTDIR)$(CONFDIR)/$(configdir)-api-lighttpd
+-	install -m 600 $(samplesdir)/$(NAME).users $(DESTDIR)$(CONFDIR)/$(configdir)-api-apache
+-	install -m 600 $(samplesdir)/$(NAME).users $(DESTDIR)$(CONFDIR)/$(configdir)-web-lighttpd
+-	install -m 600 $(samplesdir)/$(NAME).users $(DESTDIR)$(CONFDIR)/$(configdir)-web-apache
++	install -m 660 $(samplesdir)/$(NAME).users $(DESTDIR)$(CONFDIR)/$(configdir)-api
++	install -m 660 $(samplesdir)/$(NAME).users $(DESTDIR)$(CONFDIR)/$(configdir)-web
+ 	# Default link apache config file
+ 	#ln -s $(DESTDIR)$(CONFDIR)/$(configdir)-api-apache $(DESTDIR)$(WWWDIR)/$(datadir)/$(configdir)
+ 
+diff --git a/Makefile b/Makefile
+index 316e77f..136f29e 100644
+--- a/Makefile
++++ b/Makefile
+@@ -154,8 +154,8 @@ prepare_check_script:
+ setup: prepare_samples prepare_check_script
+ 	sed -i -e "s#%DOCUMENTROOT#$(WWWDIR)#g" -e "s#%LOGDIR#$(HTTPDLOGS)#g" $(DESTDIR)$(HTTPDCONFDIR)/$(NAME)-api.conf
+ 	sed -i -e "s#%DOCUMENTROOT#$(WWWDIR)#g" -e "s#%LOGDIR#$(HTTPDLOGS)#g" $(DESTDIR)$(HTTPDCONFDIR)/$(NAME)-web.conf
+-	sed -i -e "s#%DOCUMENTROOT#$(WWWDIR)#g" -e "s#%LOGDIR#$(LIGHTTPDLOGS)#g" $(DESTDIR)$(CONFDIR)/$(NAME)-api-lighttpd.conf
+-	sed -i -e "s#%DOCUMENTROOT#$(WWWDIR)#g" -e "s#%LOGDIR#$(LIGHTTPDLOGS)#g" $(DESTDIR)$(CONFDIR)/$(NAME)-web-lighttpd.conf
++	sed -i -e "s#%DOCUMENTROOT#$(WWWDIR)#g" -e "s#%LOGDIR#$(LIGHTTPDLOGS)#g" $(DESTDIR)$(LIGHTTPDCONFDIR)/$(NAME)-api.conf
++	sed -i -e "s#%DOCUMENTROOT#$(WWWDIR)#g" -e "s#%LOGDIR#$(LIGHTTPDLOGS)#g" $(DESTDIR)$(LIGHTTPDCONFDIR)/$(NAME)-web.conf
+ 	sed -i -e "s#%CONFDIR#$(CONFDIR)#g" $(DESTDIR)$(UNITDIR)/$(NAME)-api-lighttpd.service
+ 	sed -i -e "s#%CONFDIR#$(CONFDIR)#g" $(DESTDIR)$(UNITDIR)/$(NAME)-web-lighttpd.service
+ 	find $(DESTDIR)/ -type f -name .gitignore -exec rm -f {} \;