diff --git a/_service b/_service
index feebac0..55874fe 100644
--- a/_service
+++ b/_service
@@ -1,5 +1,5 @@
 <services>
-  <service name="tar_scm" mode="disabled">
+  <service name="tar_scm" mode="manual">
     <param name="versionformat">@PARENT_TAG@</param>
     <param name="url">https://github.com/M0ses/kanku.git</param>
     <param name="scm">git</param>
@@ -11,9 +11,9 @@
     <param name="extract">dist/debian.dsc</param>
     <param name="extract">dist/debian.rules</param>
   </service>
-  <service name="recompress" mode="disabled">
+  <service name="recompress" mode="manual">
     <param name="compression">xz</param>
     <param name="file">*.tar</param>
   </service>
-  <service name="set_version" mode="disabled"/>
+  <service name="set_version" mode="manual"/>
 </services>
diff --git a/_servicedata b/_servicedata
index 0806410..bad22b2 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
 <servicedata>
 <service name="tar_scm">
                 <param name="url">https://github.com/M0ses/kanku.git</param>
-              <param name="changesrevision">9c7afa7bba85d3f87c7a43855bee863b14ffd42f</param></service></servicedata>
\ No newline at end of file
+              <param name="changesrevision">03e86f0017bb0984565ba0c3fa9a7222dec6a222</param></service></servicedata>
\ No newline at end of file
diff --git a/debian.changelog b/debian.changelog
index 97a72aa..e005dd5 100644
--- a/debian.changelog
+++ b/debian.changelog
@@ -1,8 +1,14 @@
+kanku (0.16.1) unstable; urgency=medium
+
+  * updated to upstream version 0.16.1 
+
+ -- Frank Schreiner <fschreiner@suse.de>  Mon, 05 Feb 2024 10:44:05 +0100
+
 kanku (0.16.0-0) unstable; urgency=medium
 
   * updated to upstream version 0.16.0
 
- -- Frank Schreiner <fschreiner@suse.de>  Fri, 01 Dec 2023 10:11:17 +0100
+ -- Frank Schreiner <fschreiner@suse.de>  Mon, 05 Feb 2024 10:41:39 +0100
 
 kanku (0.10.1-0) unstable; urgency=medium
 
diff --git a/debian.dsc b/debian.dsc
index 476f717..f74363c 100644
--- a/debian.dsc
+++ b/debian.dsc
@@ -2,7 +2,7 @@ Format: 1.0
 Source: kanku
 Binary: kanku
 Architecture: any
-Version: 0.16.0
+Version: 0.16.1
 Maintainer: Frank Schreiner <fschreiner@suse.de>
 Standards-Version: 3.8.2
 Homepage: https://github.com/M0ses/kanku
diff --git a/kanku-0.16.0.tar.xz b/kanku-0.16.0.tar.xz
deleted file mode 100644
index 24c6d08..0000000
--- a/kanku-0.16.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8f96da07ec153c4ff88b785e5b12a65760acb4b1e1e01840c24afa2ad383ee37
-size 2535432
diff --git a/kanku-0.16.1.tar.xz b/kanku-0.16.1.tar.xz
new file mode 100644
index 0000000..7c184d2
--- /dev/null
+++ b/kanku-0.16.1.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:485a815500f622ad29e2c8ee170340a64da64470fa996ab68c68c09d08a20ef6
+size 2535384
diff --git a/kanku.changes b/kanku.changes
index 0c183e5..8a0546f 100644
--- a/kanku.changes
+++ b/kanku.changes
@@ -1,9 +1,10 @@
 -------------------------------------------------------------------
-Mon Dec 04 12:00:07 UTC 2023 - FSchreiner@suse.com
+Mon Feb 05 10:08:42 UTC 2024 - FSchreiner@suse.com
 
-- fixes for 0.16.0 in spec file
-  * [dist] added Kanku/Config dir to spec
-  * [dist] added K::Config::Defaults to spec
+- Update to version 0.16.1:
+  * BUGFIXES
+    * [dist] multiple improvements in packaging for rpm based
+      distros
 
 -------------------------------------------------------------------
 Mon Dec  4 06:40:07 UTC 2023 - Frank Schreiner <FSchreiner@suse.com>
diff --git a/kanku.spec b/kanku.spec
index 870cf81..3a8c668 100644
--- a/kanku.spec
+++ b/kanku.spec
@@ -22,7 +22,7 @@
 
 Name:           kanku
 # Version gets set by obs-service-tar_scm
-Version:        0.16.0
+Version:        0.16.1
 Release:        0
 License:        GPL-3.0-only
 Summary:        Development and continuous integration
@@ -36,6 +36,10 @@ BuildRequires:  fdupes
 BuildRequires:  perl-macros
 BuildRequires:  systemd-rpm-macros
 
+%if 0%{?suse_version}
+BuildRequires:  sysuser-tools
+%endif
+
 # perl requires for %check
 BuildRequires:  perl(Const::Fast)
 BuildRequires:  perl(Config::Tiny)
@@ -105,10 +109,16 @@ e.g. to prepare development environments or run simple tests.
 %autosetup -p1
 
 %build
+%if 0%{?suse_version}
+%sysusers_generate_pre dist/system-user-%{kanku_user}.conf %{kanku_user} system-user-%{kanku_user}.conf
+%else
 /bin/true
+%endif
 
 %install
 %make_install DOCDIR=%{_defaultdocdir}/kanku/
+mkdir -p %{buildroot}/%{_sysusersdir}/system-user-%{kanku_user}.conf
+cp dist/system-user-%{kanku_user}.conf %{buildroot}/%{_sysusersdir}/system-user-%{kanku_user}.conf
 %fdupes %{buildroot}/opt/kanku/share
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rckanku-web
 ln -s /usr/sbin/service %{buildroot}%{_sbindir}/rckanku-worker
@@ -187,9 +197,6 @@ Conflicts:      perl-DBD-SQLite-Amalgamation
 %description common
 common config and lib files used in kanku
 
-%post common
-%tmpfiles_create %_tmpfilesdir/kanku.conf
-
 %files common
 %doc README.md RELEASE-NOTES-*.md CHANGELOG.md
 
@@ -225,12 +232,6 @@ common config and lib files used in kanku
 %config /etc/kanku/templates/examples-vm/sles11sp3.tt2
 %config /etc/kanku/templates/examples-vm/obs-server.tt2
 
-%dir /etc/kanku/jobs
-%dir /etc/kanku/jobs/examples
-%config /etc/kanku/jobs/examples/obs-server.yml
-%config /etc/kanku/jobs/examples/obs-server-26.yml
-%config /etc/kanku/jobs/examples/sles11sp3.yml
-
 # %exclude %dir /etc/sudoers.d
 # %ghost /etc/sudoers.d/kanku
 
@@ -323,10 +324,39 @@ EOF
 /etc/bash_completion.d/kanku.sh
 %ghost %{_localstatedir}/adm/update-messages/%{name}-%{version}-%{release}-something
 
+%package -n system-user-%{kanku_user}
+Summary: System user and group %{kanku_user}/%{kanku_group}
+Group:    System/Fhs
+Provides: user(%{kanku_user})
+Provides: group(%{kanku_group})
+%if 0%{?suse_version:1}
+Requires(pre):  shadow
+%endif
+
+%if 0%{?fedora}
+%{?sysusers_requires_compat}
+%else
+%sysusers_requires
+%endif
+
+%description -n system-user-%{kanku_user}
+This package provides the system account '%{kanku_user}' and group '%{kanku_group}'.
+
+
+%if 0%{?fedora}
+%pre -n system-user-%{kanku_user}
+%sysusers_create_compat dist//system-user-%{kanku_user}.conf
+%else
+%pre -n system-user-%{kanku_user} -f %{kanku_user}.pre
+%endif
+
+%files -n system-user-%{kanku_user}
+%{_sysusersdir}/system-user-%{kanku_user}.conf
+
 %package common-server
 Summary:        Common server files or settings for kanku
 Requires(pre):  libvirt-daemon libvirt-daemon-driver-qemu
-
+Requires: user(%{kanku_user})
 %if 0%{?fedora}
 Requires(pre):  shadow-utils
 %else
@@ -338,12 +368,17 @@ This package contains common server files, settings and dependencies
 for the kanku server components like kanku-worker, kanku-dispatcher,
 kanku-web, kanku-scheduler and kanku-triggerd.
 
-%pre common-server
-getent group %{kanku_group} >/dev/null || groupadd -r %{kanku_group}
-getent passwd %{kanku_user} >/dev/null || useradd -r -g %{kanku_group} -G libvirt -d %{kanku_vardir} -s /sbin/nologin -c "user for kanku" %{kanku_user}
+%post common-server
+%tmpfiles_create %_tmpfilesdir/kanku.conf
 
 %files common-server
 %defattr(-, root, root)
+%dir /etc/kanku/jobs
+%dir /etc/kanku/job_groups
+%dir /etc/kanku/jobs/examples
+%config /etc/kanku/jobs/examples/obs-server.yml
+%config /etc/kanku/jobs/examples/obs-server-26.yml
+%config /etc/kanku/jobs/examples/sles11sp3.yml
 %dir %attr(755, kankurun, kanku) /var/lib/kanku
 %dir %attr(755, kankurun, kanku) /var/lib/kanku/db
 %dir %attr(755, kankurun, kanku) /var/cache/kanku
@@ -397,7 +432,6 @@ WebUI for kanku using perl Dancer
 /usr/share/kanku/views/login.tt
 %dir /usr/share/kanku/views/login
 /usr/share/kanku/views/login/denied.tt
-/usr/share/kanku/views/admin.tt
 /usr/share/kanku/views/settings.tt
 /usr/share/kanku/views/signup.tt
 /usr/share/kanku/views/pwreset.tt