diff -pruN 119/debian/changelog 119ubuntu1/debian/changelog
--- 119/debian/changelog	2021-02-09 13:44:31.000000000 +0000
+++ 119ubuntu1/debian/changelog	2022-07-08 19:12:01.000000000 +0000
@@ -1,3 +1,12 @@
+openstack-pkg-tools (119ubuntu1) kinetic; urgency=medium
+
+  * Set umask in init-script-template to ensure log files are created
+    with 0640 mode bits.
+  * Update pkgos_adduser to use /usr/sbin/nologin instead of /bin/false
+    when creating system accounts that do not run a shell.
+
+ -- Corey Bryant <corey.bryant@canonical.com>  Fri, 08 Jul 2022 15:12:01 -0400
+
 openstack-pkg-tools (119) unstable; urgency=medium
 
   * Do not lookup server_per_port in Swift.
diff -pruN 119/debian/control 119ubuntu1/debian/control
--- 119/debian/control	2021-02-09 13:44:31.000000000 +0000
+++ 119ubuntu1/debian/control	2022-07-08 19:12:01.000000000 +0000
@@ -1,7 +1,8 @@
 Source: openstack-pkg-tools
 Section: devel
 Priority: optional
-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OpenStack <team+openstack@tracker.debian.org>
 Uploaders:
  Thomas Goirand <zigo@debian.org>,
  Michal Arbet <michal.arbet@ultimum.io>,
diff -pruN 119/init-template/init-script-template 119ubuntu1/init-template/init-script-template
--- 119/init-template/init-script-template	2021-02-09 13:44:31.000000000 +0000
+++ 119ubuntu1/init-template/init-script-template	2022-07-08 19:12:01.000000000 +0000
@@ -181,6 +181,8 @@ do_stop() {
 }
 
 do_systemd_start() {
+	# Set umask to ensure log files are created with 0640 mode bits
+	umask 0026
 	if [ -n "${PYARGV}" ] ; then
 		exec $DAEMON $DAEMON_ARGS --pyargv "${PYARGV}"
 	else
diff -pruN 119/pkgos_func 119ubuntu1/pkgos_func
--- 119/pkgos_func	2021-02-09 13:44:31.000000000 +0000
+++ 119ubuntu1/pkgos_func	2022-07-08 19:12:01.000000000 +0000
@@ -838,7 +838,7 @@ pkgos_adduser () {
 	VAR_UG_SHELL=${2}
 
 	if [ -z "${VAR_UG_SHELL}" ] ; then
-		VAR_UG_SHELL='/bin/false'
+		VAR_UG_SHELL='/usr/sbin/nologin'
 	fi
 
 	# These are reserved UID/GID allocation