diff --git a/community/caddy/caddy.pre-install b/community/caddy/caddy.pre-install
index 16d74a36d23a643d25a8556ae8667100883082a7..8c6755794237ec2608a4ce99adfc33bc09a59d41 100644
--- a/community/caddy/caddy.pre-install
+++ b/community/caddy/caddy.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -h /var/lib/caddy -D -s /sbin/nologin caddy 2>/dev/null
+adduser -S -h /var/lib/caddy -D -s /sbin/nologin caddy 2>/dev/null
 adduser caddy www-data 2>/dev/null
 exit 0
diff --git a/community/domoticz/domoticz.pre-install b/community/domoticz/domoticz.pre-install
index a94a5fb50b5f02016d7ff2ea65a6800009898957..8a7d12c0128ac1a5440f3287de712c0f70763cdd 100644
--- a/community/domoticz/domoticz.pre-install
+++ b/community/domoticz/domoticz.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -h /var/lib/domoticz -D -s /sbin/nologin domoticz 2>/dev/null
+adduser -S -h /var/lib/domoticz -D -s /sbin/nologin domoticz 2>/dev/null
 exit 0
diff --git a/community/icinga2/icinga2.pre-install b/community/icinga2/icinga2.pre-install
index cd2a432c44a6658ba39dacd26008d129ac148bc1..349c8c8879ec5189698f85f159a11dcc66ba22c4 100644
--- a/community/icinga2/icinga2.pre-install
+++ b/community/icinga2/icinga2.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
-addgroup icinga 2>/dev/null
-addgroup icingacmd 2>/dev/null
+addgroup -S icinga 2>/dev/null
+addgroup -S icingacmd 2>/dev/null
 adduser -S -G icinga -H -h /var/spool/icinga2 -s /sbin/nologin -D icinga 2>/dev/null
 adduser icinga icingacmd 2>/dev/null 2>/dev/null
 exit 0
diff --git a/community/minetest/minetest-server.pre-install b/community/minetest/minetest-server.pre-install
index f995e427d6b764927b998e15507e649ef27d53ea..dbf141158df1db4214c0820f187d03151dab329c 100644
--- a/community/minetest/minetest-server.pre-install
+++ b/community/minetest/minetest-server.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -s /sbin/nologin -D -h /var/lib/minetest minetest games 2>/dev/null
+adduser -S -s /sbin/nologin -D -h /var/lib/minetest minetest games 2>/dev/null
 exit 0
diff --git a/community/oscam/oscam.pre-install b/community/oscam/oscam.pre-install
index fe379e11c1f895746763e8311ebfd3470f3363e2..6f2cc9ec07e2a652e63269fdad0589f5d5549a01 100644
--- a/community/oscam/oscam.pre-install
+++ b/community/oscam/oscam.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -D -s /sbin/nologin oscam 2>/dev/null
+adduser -S -H -D -s /sbin/nologin oscam 2>/dev/null
 addgroup oscam usb 2>/dev/null
 exit 0
diff --git a/community/seafile/seafile-server.pre-install b/community/seafile/seafile-server.pre-install
index 173e73a35b8a8da51d84fc4f968fabdc9302cc55..66e7a2ccff7fca985403846a8f915f90fe39461b 100644
--- a/community/seafile/seafile-server.pre-install
+++ b/community/seafile/seafile-server.pre-install
@@ -3,5 +3,5 @@
 SEAFILE_HOME=/var/lib/seafile
 
 addgroup -S -g 800 seafile 2>/dev/null
-adduser -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
+adduser -S -h $SEAFILE_HOME -s /bin/sh -G seafile -g seafile -u 800 -D seafile 2>/dev/null
 exit 0
diff --git a/community/sword/sword.pre-install b/community/sword/sword.pre-install
index 0ab0d715bf3376c3a710073654d5f76f85d54030..d8abdb59bfe302efb556f9033cb4b0ba94fa1614 100755
--- a/community/sword/sword.pre-install
+++ b/community/sword/sword.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
 echo "Adding 'sword' group for installing SWORD modules systemwide"
-addgroup sword 2>/dev/null >&2 || true
+addgroup -S sword 2>/dev/null >&2 || true
diff --git a/community/syncthing/syncthing.pre-install b/community/syncthing/syncthing.pre-install
index b2207a0d7b2c86635f890e05b3e1d2ca392fab1e..dd7f389fd46b4afc8a9fcef6806c711f4cce3cc5 100644
--- a/community/syncthing/syncthing.pre-install
+++ b/community/syncthing/syncthing.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -h /var/lib/syncthing -s /sbin/nologin -D syncthing 2>/dev/null
+adduser -S -H -h /var/lib/syncthing -s /sbin/nologin -D syncthing 2>/dev/null
 exit 0
diff --git a/main/amavisd-new/amavisd-new.pre-install b/main/amavisd-new/amavisd-new.pre-install
index 691ae273818bd53108d2c2b99199408ed9a3ff5a..bd8c3a6fe6337b4af90dd1654eca1b2a841699c6 100755
--- a/main/amavisd-new/amavisd-new.pre-install
+++ b/main/amavisd-new/amavisd-new.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup amavis 2>/dev/null
+addgroup -S amavis 2>/dev/null
 adduser -S -D -G amavis -h /var/amavis -s /sbin/nologin amavis 2>/dev/null
 exit 0
 
diff --git a/main/apache2/apache2.pre-install b/main/apache2/apache2.pre-install
index 762de8391054b9b123c4f158c88222b60800e033..81f4b068b71d40949801f1469559bf25f78c9e19 100644
--- a/main/apache2/apache2.pre-install
+++ b/main/apache2/apache2.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null
+adduser -S -H -h /var/www -s /sbin/nologin -D apache 2>/dev/null
 addgroup apache www-data 2>/dev/null
 exit 0
diff --git a/main/aports-build/aports-build.pre-install b/main/aports-build/aports-build.pre-install
index e9d9bfbf03b2f3027295350c517cf11cadf6dc44..21bf1068372007572ced75dfc9eaa12d28dc8ab8 100644
--- a/main/aports-build/aports-build.pre-install
+++ b/main/aports-build/aports-build.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -D buildozer -s /bin/sh 2>/dev/null
+adduser -S -D buildozer -s /bin/sh 2>/dev/null
 exit 0
diff --git a/main/atheme-iris/atheme-iris.pre-install b/main/atheme-iris/atheme-iris.pre-install
index 1bb8677ddb040d4f6f236ede9d65ca69c5b13e26..4198df244dd12da46573baac47850aba41f02c17 100644
--- a/main/atheme-iris/atheme-iris.pre-install
+++ b/main/atheme-iris/atheme-iris.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
+adduser -S -H -h /usr/share/webapps/atheme-iris -g iris -D -s /sbin/nologin iris >/dev/null
 exit 0
 
diff --git a/main/bind/bind.pre-install b/main/bind/bind.pre-install
index 384971658d1e0f44731a6359c0b2c1794bd4fb0b..3770738af93d3104790f5cde8a9303dcc8b02cb3 100644
--- a/main/bind/bind.pre-install
+++ b/main/bind/bind.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S named 2>/dev/null
-adduser -h /etc/bind -s /sbin/nologin -G named -D named 2>/dev/null
+adduser -S -h /etc/bind -s /sbin/nologin -G named -D named 2>/dev/null
 exit 0
 
diff --git a/main/chrony/chrony.pre-install b/main/chrony/chrony.pre-install
index 2c54eccdbdf66d280750ee5be8f3a61cce2cc30d..83c4560568a7ddfa45107da7e92fe9b94a8a8bf9 100644
--- a/main/chrony/chrony.pre-install
+++ b/main/chrony/chrony.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup chrony 2>/dev/null
+addgroup -S chrony 2>/dev/null
 adduser -S -G chrony -h /var/log/chrony -s /sbin/nologin -D chrony 2>/dev/null
 exit 0
diff --git a/main/clamav/clamav-db.pre-install b/main/clamav/clamav-db.pre-install
index 7706eefe72e6f516f96133da1d462f108e9b4db0..9bc70ddaa4aff6d2fd0b2554c1786f087c8d0aba 100644
--- a/main/clamav/clamav-db.pre-install
+++ b/main/clamav/clamav-db.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -H -s /sbin/nologin -D clamav 2>/dev/null
+adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-install b/main/clamsmtp/clamsmtp.pre-install
index 7706eefe72e6f516f96133da1d462f108e9b4db0..9bc70ddaa4aff6d2fd0b2554c1786f087c8d0aba 100644
--- a/main/clamsmtp/clamsmtp.pre-install
+++ b/main/clamsmtp/clamsmtp.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -H -s /sbin/nologin -D clamav 2>/dev/null
+adduser -S -H -s /sbin/nologin -D clamav 2>/dev/null
 exit 0
diff --git a/main/clamsmtp/clamsmtp.pre-upgrade b/main/clamsmtp/clamsmtp.pre-upgrade
index 97d90817be3c3db08c063d5ad261a45299e10cad..7e736a2d4363693195a9fb0bf447f12a51b0040e 100644
--- a/main/clamsmtp/clamsmtp.pre-upgrade
+++ b/main/clamsmtp/clamsmtp.pre-upgrade
@@ -10,5 +10,5 @@ if [ -f "$old" ] && [ ! -f "$new" ]; then
 	echo " *"
 fi
 
-adduser -H -s /bin/false -D clamav 2>/dev/null
+adduser -S -H -s /bin/false -D clamav 2>/dev/null
 exit 0
diff --git a/main/coova-chilli/coova-chilli.pre-install b/main/coova-chilli/coova-chilli.pre-install
index 4bf0c3c81247c4d1b40fc593c4cbafa0563e8f53..6ef874198fbcaaa27784ab20e41aca1780fd24f9 100644
--- a/main/coova-chilli/coova-chilli.pre-install
+++ b/main/coova-chilli/coova-chilli.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -s /sbin/nologin -D chilli 2>/dev/null
+adduser -S -H -s /sbin/nologin -D chilli 2>/dev/null
 exit 0
 
diff --git a/main/cvechecker/cvechecker.pre-install b/main/cvechecker/cvechecker.pre-install
index f2b4535c11cbca46a5fe0be49c9ba596f1d85145..cf6b1448336b141b69c0e6dfa31309b2c3486634 100644
--- a/main/cvechecker/cvechecker.pre-install
+++ b/main/cvechecker/cvechecker.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-addgroup cvechecker &>/dev/null
-adduser cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
+addgroup -S cvechecker &>/dev/null
+adduser -S cvechecker -h /var/cvechecker -DG cvechecker &>/dev/null
diff --git a/main/dhcp/dhcp.pre-install b/main/dhcp/dhcp.pre-install
index 7f09003cd20b09a9f5c649633790da24397d79f6..27fa93f824dc04d05703964f150828ae3e55e145 100644
--- a/main/dhcp/dhcp.pre-install
+++ b/main/dhcp/dhcp.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /var/lib/dhcp -s /sbin/nologin -D dhcp 2>/dev/null
+adduser -S -h /var/lib/dhcp -s /sbin/nologin -D dhcp 2>/dev/null
 exit 0
 
diff --git a/main/distcc/distcc.pre-install b/main/distcc/distcc.pre-install
index bd7fba2a4089cf3cc81c73952e7ae17b5db5332f..b07f8467f239289726b14dd534b9d38e96019c35 100644
--- a/main/distcc/distcc.pre-install
+++ b/main/distcc/distcc.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 addgroup -S distcc 2>/dev/null
-adduser -H -h /dev/null -s /sbin/nologin -G distcc -D distcc 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -G distcc -D distcc 2>/dev/null
 exit 0
diff --git a/main/djbdns/dnscache.pre-install b/main/djbdns/dnscache.pre-install
index f1f948e478212d8e3b919827c0507de2d5c5b218..106fc292cb4f1da5d58561b7dc28489f00c53ddf 100644
--- a/main/djbdns/dnscache.pre-install
+++ b/main/djbdns/dnscache.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null
+adduser -S -h /etc/dnscache -g dnscache -s /sbin/nologin -H -D dnscache 2>/dev/null
 exit 0
 
diff --git a/main/djbdns/tinydns.pre-install b/main/djbdns/tinydns.pre-install
index e3ab6ceaf841b6ebf56038b26bef3fa977f5fa38..8676fb4104aa1d49041b7f6e6466b14739f7aeea 100644
--- a/main/djbdns/tinydns.pre-install
+++ b/main/djbdns/tinydns.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null
+adduser -S -h /etc/tinydns -g tinydns -s /sbin/nologin -H -D tinydns 2>/dev/null
 exit 0
 
diff --git a/main/dnsmasq/dnsmasq.pre-install b/main/dnsmasq/dnsmasq.pre-install
index 931d2582452a220a3d2db75d4321472432b1dfe6..3e9e4b08148425de2dca3f1a8e0feb85d52aaa20 100644
--- a/main/dnsmasq/dnsmasq.pre-install
+++ b/main/dnsmasq/dnsmasq.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup dnsmasq 2>/dev/null
+addgroup -S dnsmasq 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -G dnsmasq -D dnsmasq 2>/dev/null
 exit 0
diff --git a/main/dovecot/dovecot.pre-install b/main/dovecot/dovecot.pre-install
index 432a3b846d3da30cc04e3b3a7a5143b3f50adb77..58346c66fb860e343b552bed71fcc11802036487 100644
--- a/main/dovecot/dovecot.pre-install
+++ b/main/dovecot/dovecot.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -u 90 -H -h /dev/null -s /sbin/nologin -D dovecot 2>/dev/null
-adduser -u 91 -H -h /dev/null -s /sbin/nologin -D dovenull 2>/dev/null
+adduser -S -u 90 -H -h /dev/null -s /sbin/nologin -D dovecot 2>/dev/null
+adduser -S -u 91 -H -h /dev/null -s /sbin/nologin -D dovenull 2>/dev/null
 exit 0
diff --git a/main/ez-ipupdate/ez-ipupdate.pre-install b/main/ez-ipupdate/ez-ipupdate.pre-install
index 7c1ea477f7d225171fb264aaa812708616c38c86..064e418f4518fd6bf815c8f7e278bb40ade52ddb 100644
--- a/main/ez-ipupdate/ez-ipupdate.pre-install
+++ b/main/ez-ipupdate/ez-ipupdate.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /var/lib/ez-ipupdate -s /sbin/nologin -D ipupdate 2>/dev/null
+adduser -S -h /var/lib/ez-ipupdate -s /sbin/nologin -D ipupdate 2>/dev/null
 exit 0
 
diff --git a/main/fetchmail/fetchmail.pre-install b/main/fetchmail/fetchmail.pre-install
index 6122e0c6f32980142e3166f0b661d83f523ea66c..2961b9a0107159f1a007dbecf86116d94eb8dc1f 100644
--- a/main/fetchmail/fetchmail.pre-install
+++ b/main/fetchmail/fetchmail.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -H -h /var/lib/fetchmail -s /sbin/nologin -D fetchmail 2>/dev/null
+adduser -S -H -h /var/lib/fetchmail -s /sbin/nologin -D fetchmail 2>/dev/null
 exit 0
diff --git a/main/freeradius/freeradius.pre-install b/main/freeradius/freeradius.pre-install
index 30ff04814e87e7c8c35b8f7a91e36a59c37a8832..b81e86d7afce53e714ae0e3f0b00e3da9f00271e 100644
--- a/main/freeradius/freeradius.pre-install
+++ b/main/freeradius/freeradius.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup radius 2>/dev/null
+addgroup -S radius 2>/dev/null
 adduser -S -G radius -h /var/log/radius -s /sbin/nologin -D radius 2>/dev/null
 exit 0
 
diff --git a/main/freeswitch/freeswitch.pre-install b/main/freeswitch/freeswitch.pre-install
index 88dcc895bbfb4cb91a3b3be3036e6207ba03d3ac..4dccd578c65490e7188d2ea2bfec2eb98f43710f 100755
--- a/main/freeswitch/freeswitch.pre-install
+++ b/main/freeswitch/freeswitch.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -H -h /var/run/freeswitch -s /sbin/nologin -D freeswitch 2>/dev/null
+adduser -S -H -h /var/run/freeswitch -s /sbin/nologin -D freeswitch 2>/dev/null
 
 exit 0
diff --git a/main/gdnsd/gdnsd.pre-install b/main/gdnsd/gdnsd.pre-install
index dc6e44b9cb7fff1a236ec31c04ffd2a8c312d9c6..2479466873c5061cd4aaccb0b6f8f78d426e3e22 100644
--- a/main/gdnsd/gdnsd.pre-install
+++ b/main/gdnsd/gdnsd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup gdnsd 2>/dev/null
+addgroup -S gdnsd 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null
 exit 0
diff --git a/main/gitolite/gitolite.pre-install b/main/gitolite/gitolite.pre-install
index 79a7a6388a9d90daadff659d0781bcdceba42878..fbb1e2a121e2d22eb672a3cbf1a12de349add82f 100644
--- a/main/gitolite/gitolite.pre-install
+++ b/main/gitolite/gitolite.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -h /var/lib/git -s /bin/sh -D git 2>/dev/null
+adduser -S -H -h /var/lib/git -s /bin/sh -D git 2>/dev/null
 exit 0
diff --git a/main/gnats/gnats.pre-install b/main/gnats/gnats.pre-install
index 0a2e5a589be12867d6684f923f61b566851e03f6..849841fa6eeef3f6601d89a9c02204c03b37e1fd 100644
--- a/main/gnats/gnats.pre-install
+++ b/main/gnats/gnats.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -h /var/lib/gnatsdb -D gnats 2>/dev/null
+adduser -S -h /var/lib/gnatsdb -D gnats 2>/dev/null
 exit 0
diff --git a/main/gross/gross.pre-install b/main/gross/gross.pre-install
index 809dd4c6eef8a5b301c2d415993c17205ed39721..f79e65773db3ca54be0bcb1621b251a5fbad3a26 100644
--- a/main/gross/gross.pre-install
+++ b/main/gross/gross.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -s /sbin/nologin -D gross 2>/dev/null
+adduser -S -H -s /sbin/nologin -D gross 2>/dev/null
 exit 0
diff --git a/main/haproxy/haproxy.pre-install b/main/haproxy/haproxy.pre-install
index 33e0164aff5994cb6335bc73302b9840b793813a..470695636e1914c1387f5e7feb3dacf3eee0e9c4 100644
--- a/main/haproxy/haproxy.pre-install
+++ b/main/haproxy/haproxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup haproxy 2>/dev/null
+addgroup -S haproxy 2>/dev/null
 adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
 	-G haproxy haproxy 2>/dev/null
 
diff --git a/main/haproxy/haproxy.pre-upgrade b/main/haproxy/haproxy.pre-upgrade
index 33e0164aff5994cb6335bc73302b9840b793813a..470695636e1914c1387f5e7feb3dacf3eee0e9c4 100644
--- a/main/haproxy/haproxy.pre-upgrade
+++ b/main/haproxy/haproxy.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup haproxy 2>/dev/null
+addgroup -S haproxy 2>/dev/null
 adduser -S -H -h /var/lib/haproxy -s /bin/false -D \
 	-G haproxy haproxy 2>/dev/null
 
diff --git a/main/icecast/icecast.pre-install b/main/icecast/icecast.pre-install
index e8e86102dacd7bd920927b52832fdeabb51400ec..9978a4be9583f5ff2902f5a0f3cc23e58ccaa9a1 100644
--- a/main/icecast/icecast.pre-install
+++ b/main/icecast/icecast.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /var/log/icecast -s /sbin/nologin -D icecast  2>/dev/null
+adduser -S -h /var/log/icecast -s /sbin/nologin -D icecast  2>/dev/null
 
 exit 0
diff --git a/main/kamailio/kamailio.pre-install b/main/kamailio/kamailio.pre-install
index 58e5bb6fd68a55ae9dfca9ad987227de5f3634d2..fd7b13e487196f7b396227ecfeb18c20fab9c3db 100644
--- a/main/kamailio/kamailio.pre-install
+++ b/main/kamailio/kamailio.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup kamailio 2>/dev/null
-adduser -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio  2>/dev/null
+addgroup -S kamailio 2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D -G kamailio kamailio  2>/dev/null
 
 exit 0
diff --git a/main/lighttpd/lighttpd.pre-install b/main/lighttpd/lighttpd.pre-install
index 95202928f95eca216ec67fc2d46b3e7e02925ada..2349478f2facc3576dc7e85d6add4063c8c49f47 100644
--- a/main/lighttpd/lighttpd.pre-install
+++ b/main/lighttpd/lighttpd.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null
+adduser -S -H -h /var/www/localhost/htdocs -s /sbin/nologin -D lighttpd 2>/dev/null
 addgroup lighttpd www-data 2>/dev/null
 
 exit 0
diff --git a/main/logcheck/logcheck.pre-install b/main/logcheck/logcheck.pre-install
index 61f3c23eceb4256ce7c3a3a62b3b2abad78c4cd2..b0f2a839722c0072fe572d4abd526551425e9ef3 100644
--- a/main/logcheck/logcheck.pre-install
+++ b/main/logcheck/logcheck.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup logcheck 2>/dev/null
+addgroup -S logcheck 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G logcheck logcheck 2>/dev/null
 exit 0
diff --git a/main/mariadb/mariadb.pre-install b/main/mariadb/mariadb.pre-install
index 2e6e668e7faa60d69152ee38e16d2e424014f11c..5b68b1ea4f1328c699ebf3f808dd3259ef052a24 100644
--- a/main/mariadb/mariadb.pre-install
+++ b/main/mariadb/mariadb.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 addgroup -S mysql 2>/dev/null
-adduser -h /var/lib/mysql -s /sbin/nologin -G mysql -D mysql 2>/dev/null
+adduser -S -h /var/lib/mysql -s /sbin/nologin -G mysql -D mysql 2>/dev/null
 exit 0
 
diff --git a/main/memcached/memcached.pre-install b/main/memcached/memcached.pre-install
index bee8d7fd35529b8e73915b4ce9409e5ed449f21c..6612df975b87c421b80ebf2a236fd764bca2a7e5 100644
--- a/main/memcached/memcached.pre-install
+++ b/main/memcached/memcached.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -H -s /sbin/nologin -D memcached 2>/dev/null
+adduser -S -H -s /sbin/nologin -D memcached 2>/dev/null
 exit 0
 
diff --git a/main/mlmmj/mlmmj.pre-install b/main/mlmmj/mlmmj.pre-install
index c6043d3911df7f8eb343b60ac07fabde81361430..38b8fb8394266ac764eec5c0b86f27b210ee55d8 100644
--- a/main/mlmmj/mlmmj.pre-install
+++ b/main/mlmmj/mlmmj.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup mlmmj 2>/dev/null
+addgroup -S mlmmj 2>/dev/null
 adduser -S -H -h /var/spool/mlmmj -s /sbin/nologin -D -G mlmmj mlmmj 2>/dev/null
 exit 0
diff --git a/main/ngircd/ngircd.pre-install b/main/ngircd/ngircd.pre-install
index 36bc1f821b7a2d186eb61ed569a5814c2781ec2a..5c8d34b6d816081f62e655624bfd0e85dab3b0cb 100644
--- a/main/ngircd/ngircd.pre-install
+++ b/main/ngircd/ngircd.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -H -h /etc/ngircd -s /sbin/nologin -D ngircd 2>/dev/null
+adduser -S -H -h /etc/ngircd -s /sbin/nologin -D ngircd 2>/dev/null
 exit 0
diff --git a/main/nrpe/nrpe.pre-install b/main/nrpe/nrpe.pre-install
index 6acde2a510603a3e69ab4b1f6f39b92df6f0cb06..a9a0d38957d4214641ac3d120a52f7e0ed5f4cb1 100644
--- a/main/nrpe/nrpe.pre-install
+++ b/main/nrpe/nrpe.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null
-addgroup nagios 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D nagios 2>/dev/null
+addgroup -S nagios 2>/dev/null
 exit 0
diff --git a/main/open-vm-tools/open-vm-tools.pre-install b/main/open-vm-tools/open-vm-tools.pre-install
index 10b989ae536b746bf5c3392876349cf91ea05d09..15fbca33b86ce899180e880c722aafdd3f5479db 100644
--- a/main/open-vm-tools/open-vm-tools.pre-install
+++ b/main/open-vm-tools/open-vm-tools.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-addgroup vmware 2>/dev/null
+addgroup -S vmware 2>/dev/null
 exit 0
 
diff --git a/main/openntpd/openntpd.pre-install b/main/openntpd/openntpd.pre-install
index 0b2be06957e78543d409cc23b4974cb61bfad89e..feb5d9cb91833db29eb3f837143ddce15efcc85a 100644
--- a/main/openntpd/openntpd.pre-install
+++ b/main/openntpd/openntpd.pre-install
@@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -H -h /var/empty -s /sbin/nologin -D ntp  2>/dev/null
+adduser -S -H -h /var/empty -s /sbin/nologin -D ntp  2>/dev/null
 
 exit 0
diff --git a/main/postgrey/postgrey.pre-install b/main/postgrey/postgrey.pre-install
index 21dd01faa2b4b25b6db25ea934fcffd557362f54..480391cce4164c8352027dbbe9841d8fe2454f85 100644
--- a/main/postgrey/postgrey.pre-install
+++ b/main/postgrey/postgrey.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup postgrey 2>/dev/null
-adduser -H -h /dev/null -s /sbin/nologin -D postgrey  2>/dev/null
+addgroup -S postgrey 2>/dev/null
+adduser -S -H -h /dev/null -s /sbin/nologin -D postgrey  2>/dev/null
 
 exit 0
diff --git a/main/privoxy/privoxy.pre-install b/main/privoxy/privoxy.pre-install
index cfc842800de06d4b13bb317af52c67d7a3166771..72a917e4f72019915e68fd45392976962840cd20 100644
--- a/main/privoxy/privoxy.pre-install
+++ b/main/privoxy/privoxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup privoxy 2>/dev/null
+addgroup -S privoxy 2>/dev/null
 adduser -S -G privoxy -h /var/log/privoxy -s /sbin/nologin -D privoxy 2>/dev/null
 exit 0
 
diff --git a/main/redis/redis.pre-install b/main/redis/redis.pre-install
index 2e36f49e078f77d4120df964dfa6a160fc80ff7c..479434e50ef33b972585af2b49fea7c5d20e72b1 100644
--- a/main/redis/redis.pre-install
+++ b/main/redis/redis.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup redis 2>/dev/null
+addgroup -S redis 2>/dev/null
 adduser -S -H -h /var/lib/redis -s /bin/false -D -G redis redis 2>/dev/null
 exit 0
diff --git a/main/samba/winbind.pre-install b/main/samba/winbind.pre-install
index 792e73a80306413003f5516f6866bf26a519f8e3..ac4df3f4adc2b770156c2dc06a271260733662ea 100644
--- a/main/samba/winbind.pre-install
+++ b/main/samba/winbind.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
 
 exit 0
diff --git a/main/sircbot/sircbot.pre-install b/main/sircbot/sircbot.pre-install
index 450fff3fc4ee5cadd4b809ec4675610c03ce0312..453ba5dd105f6d7d1e4b1f73d00688aa7f5a468e 100644
--- a/main/sircbot/sircbot.pre-install
+++ b/main/sircbot/sircbot.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup sircbot 2>/dev/null
+addgroup -S sircbot 2>/dev/null
 adduser -S -h /var/run/sircbot -G sircbot -D sircbot 2>/dev/null
 exit 0
diff --git a/main/smokeping/smokeping.pre-install b/main/smokeping/smokeping.pre-install
index 490c4c1879f4da056716acd240ba3fa95f38301a..893414898d296d7a27a8e9f931b98587cae4d9a4 100644
--- a/main/smokeping/smokeping.pre-install
+++ b/main/smokeping/smokeping.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup smokeping 2>/dev/null
+addgroup -S smokeping 2>/dev/null
 adduser -S -h /var/lib/smokeping -D -G smokeping smokeping 2>/dev/null
 exit 0
diff --git a/main/snort/snort.pre-install b/main/snort/snort.pre-install
index 80740ebd117fb4f4c6b666873ab462b91705346e..c8bf7061835d855c46cbba3f137d5965c2b73955 100644
--- a/main/snort/snort.pre-install
+++ b/main/snort/snort.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -h /var/log/snort -s /sbin/nologin -D snort 2>/dev/null
+adduser -S -h /var/log/snort -s /sbin/nologin -D snort 2>/dev/null
 exit 0
diff --git a/main/squark/squark.post-install b/main/squark/squark.post-install
index 28120d3e3181f6000165aeb235eb4ff0f53c2ae6..3c4069469258f2623d16184952a6a3f00183e034 100755
--- a/main/squark/squark.post-install
+++ b/main/squark/squark.post-install
@@ -1,2 +1,2 @@
 #!/bin/sh
-addgroup squark &>/dev/null || exit 0
+addgroup -S squark &>/dev/null || exit 0
diff --git a/main/squid/squid.pre-install b/main/squid/squid.pre-install
index 322d21deab6d9a71fad6f03b2040553bb85d369a..b51ade1564d9987817c003f8fc388a99e5a71338 100644
--- a/main/squid/squid.pre-install
+++ b/main/squid/squid.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -D squid -H /var/cache/squid  2>/dev/null
-addgroup winbind 2>/dev/null
+adduser -S -D squid -H /var/cache/squid  2>/dev/null
+addgroup -S winbind 2>/dev/null
 addgroup squid winbind
 exit 0
diff --git a/main/squid/squid.pre-upgrade b/main/squid/squid.pre-upgrade
index 322d21deab6d9a71fad6f03b2040553bb85d369a..b51ade1564d9987817c003f8fc388a99e5a71338 100644
--- a/main/squid/squid.pre-upgrade
+++ b/main/squid/squid.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -D squid -H /var/cache/squid  2>/dev/null
-addgroup winbind 2>/dev/null
+adduser -S -D squid -H /var/cache/squid  2>/dev/null
+addgroup -S winbind 2>/dev/null
 addgroup squid winbind
 exit 0
diff --git a/main/subversion/subversion.pre-install b/main/subversion/subversion.pre-install
index fb516ee5a0e8d666edbc5ddb4d38ae426f9f74e5..ddec16ce854cc87686c986834ef0fc5f2d617ce0 100644
--- a/main/subversion/subversion.pre-install
+++ b/main/subversion/subversion.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup svnusers 2>/dev/null
-adduser svn -D -h /var/svn -G svnusers 2>/dev/null
+addgroup -S svnusers 2>/dev/null
+adduser -S svn -D -h /var/svn -G svnusers 2>/dev/null
 exit 0
 
diff --git a/main/trac/trac.pre-install b/main/trac/trac.pre-install
index 147991649b738a1d49c448459d577318c3341cd1..f39f2b2136b45e5fcd005825ce23c30cfbceb44d 100644
--- a/main/trac/trac.pre-install
+++ b/main/trac/trac.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup tracd 2>/dev/null
-adduser -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null
+addgroup -S tracd 2>/dev/null
+adduser -S -s /sbin/nologin -G tracd -D -H tracd 2>/dev/null
 exit 0
diff --git a/main/transmission/transmission-daemon.pre-install b/main/transmission/transmission-daemon.pre-install
index 9b7d6cb17e97dfc47de775f99e96d22d849675bd..2f9a398a04a5295884f2ba73b8f79e3f4362898a 100644
--- a/main/transmission/transmission-daemon.pre-install
+++ b/main/transmission/transmission-daemon.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -h /var/lib/transmission -s /sbin/nologin -D transmission 2>/dev/null
+adduser -S -h /var/lib/transmission -s /sbin/nologin -D transmission 2>/dev/null
 
 exit 0
diff --git a/main/vsftpd/vsftpd.pre-install b/main/vsftpd/vsftpd.pre-install
index 4bdf064b94b9956ef2ca0de7eddad38b6f35bc5c..200d233e84dece67572a83d7959af4ce23110787 100755
--- a/main/vsftpd/vsftpd.pre-install
+++ b/main/vsftpd/vsftpd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-addgroup ftp &>/dev/null
+addgroup -S ftp &>/dev/null
 addgroup vsftp ftp &>/dev/null
 adduser -S -h /var/lib/ftp -s /sbin/nologin -G ftp vsftp &>/dev/null
 exit 0
diff --git a/main/ympd/ympd.pre-install b/main/ympd/ympd.pre-install
index 0455be2acd14e4daabade861e0a493bf6f193e45..1bbd0459ab41c8121958741a1dd11ac4ddd1d6ea 100644
--- a/main/ympd/ympd.pre-install
+++ b/main/ympd/ympd.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -D -s /sbin/nologin -G audio ympd 2>/dev/null
+adduser -S -H -D -s /sbin/nologin -G audio ympd 2>/dev/null
 exit 0
diff --git a/main/zabbix/zabbix-agent.pre-install b/main/zabbix/zabbix-agent.pre-install
index 57d46c251ab76931431e5da8079930a1207ca162..91ea88c23b557b7a41ad259cbb4c5b7b03061b18 100644
--- a/main/zabbix/zabbix-agent.pre-install
+++ b/main/zabbix/zabbix-agent.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup zabbix 2>/dev/null
+addgroup -S zabbix 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
 addgroup -g 30 zabbix 2>/dev/null
 exit 0
diff --git a/main/znc/znc.pre-install b/main/znc/znc.pre-install
index 91f2f8d27be1d4c22b10533805a5b088e00a99c1..ad5aed93c1276700373f977fa4783f56fb4dd2bd 100644
--- a/main/znc/znc.pre-install
+++ b/main/znc/znc.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -D -s /sbin/nologin znc 2>/dev/null
+adduser -S -H -D -s /sbin/nologin znc 2>/dev/null
 exit 0
diff --git a/testing/3proxy/3proxy.pre-install b/testing/3proxy/3proxy.pre-install
index b1e227a96aaf2a1783da5cc4d29f92d0e1a89400..dbfa4381d8b3a0b7b46d9320ef5afdc01fd2621f 100644
--- a/testing/3proxy/3proxy.pre-install
+++ b/testing/3proxy/3proxy.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup 3proxy 2>/dev/null
+addgroup -S 3proxy 2>/dev/null
 adduser -S -G 3proxy -h /var/log/3proxy -s /sbin/nologin -D 3proxy 2>/dev/null
 exit 0
 
diff --git a/testing/at/at.pre-install b/testing/at/at.pre-install
index 058a9d0ca74c376a79f0f92fbec1469906689f93..5372277bbc0664da0758bbb6d9ba3bd267b58ee0 100644
--- a/testing/at/at.pre-install
+++ b/testing/at/at.pre-install
@@ -5,7 +5,7 @@ if ! getent group at >/dev/null; then
 fi
 
 if ! getent passwd at >/dev/null; then
-	adduser -H -s /bin/false -D at 2>/dev/null
+	adduser -S -H -s /bin/false -D at 2>/dev/null
 fi
 
 if [ -z `echo " $(groups at) " | grep ' at '`] ; then
diff --git a/testing/buildbot-slave/buildbot-slave.pre-install b/testing/buildbot-slave/buildbot-slave.pre-install
index 7e52d9ccf0d378b5c7c418caf89b76f8e4d70d38..40e29454cb86364e497e36e12e186595a6fe996b 100644
--- a/testing/buildbot-slave/buildbot-slave.pre-install
+++ b/testing/buildbot-slave/buildbot-slave.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
+adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
 exit 0
 
diff --git a/testing/buildbot/buildbot.pre-install b/testing/buildbot/buildbot.pre-install
index 7e52d9ccf0d378b5c7c418caf89b76f8e4d70d38..40e29454cb86364e497e36e12e186595a6fe996b 100644
--- a/testing/buildbot/buildbot.pre-install
+++ b/testing/buildbot/buildbot.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-adduser -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
+adduser -S -H -h /home/buildbot -g buildbot -D -s /sbin/nologin buildbot 2>/dev/null
 exit 0
 
diff --git a/testing/clapf/clapf.pre-install b/testing/clapf/clapf.pre-install
index 01997df895fc6307cc7a14614ba0b0656db376e0..bf78879542563cc2278ea886ee0bfd774cff74af 100644
--- a/testing/clapf/clapf.pre-install
+++ b/testing/clapf/clapf.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -s /bin/false -D clamav 2>/dev/null
+adduser -S -H -s /bin/false -D clamav 2>/dev/null
 exit 0
diff --git a/testing/cluster-glue/cluster-glue.pre-install b/testing/cluster-glue/cluster-glue.pre-install
index 4e7f2f5ba022e4c4d87aef22326b7f8c2c43dea2..056fbde8fff9336f73812a81e1217684009dea2c 100644
--- a/testing/cluster-glue/cluster-glue.pre-install
+++ b/testing/cluster-glue/cluster-glue.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-addgroup haclient 2>/dev/null
-adduser hacluster \
+addgroup -S haclient 2>/dev/null
+adduser -S hacluster \
 	-h /var/lib/heartbeat/cores/hacluster \
 	-G haclient \
 	-s /sbin/nologin \
diff --git a/testing/dbmail/dbmail.pre-install b/testing/dbmail/dbmail.pre-install
index 1abaeb9c0aae96a9ca038512a980cab55f6fdb94..aa19b6707d51f98bcbf6e7ddb95968b2be1ddd7e 100644
--- a/testing/dbmail/dbmail.pre-install
+++ b/testing/dbmail/dbmail.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -s /bin/false -D -H -h /var/lib/dbmail dbmail 2>/dev/null
+adduser -S -s /bin/false -D -H -h /var/lib/dbmail dbmail 2>/dev/null
 exit 0
 
diff --git a/testing/dspam/dspam.pre-install b/testing/dspam/dspam.pre-install
index 9a6cc6f1e3aed8bbee3e8b09898906795ced14fd..2eb89408da296a61dcd3eb521514fe4bb77d1222 100644
--- a/testing/dspam/dspam.pre-install
+++ b/testing/dspam/dspam.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-adduser -h /var/lib/dspam -s /bin/false -D dspam 2>/dev/null
+adduser -S -h /var/lib/dspam -s /bin/false -D dspam 2>/dev/null
 chown dspam:dspam /var/lib/dspam
 exit 0
 
diff --git a/testing/ejabberd/ejabberd.pre-install b/testing/ejabberd/ejabberd.pre-install
index 4111b3189ea299fdb94dfadae1c9d6c9c6b6e86b..6d801516534f28e8dabc15b1549158dbc4721e9f 100644
--- a/testing/ejabberd/ejabberd.pre-install
+++ b/testing/ejabberd/ejabberd.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
 exit 0
diff --git a/testing/elasticsearch/elasticsearch.pre-install b/testing/elasticsearch/elasticsearch.pre-install
index 9e96765bda404430e94656549f6bcd787acba3a5..63e023a16a850cd77eb85ad9fc4e42d8b1135b78 100644
--- a/testing/elasticsearch/elasticsearch.pre-install
+++ b/testing/elasticsearch/elasticsearch.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup elastico
+addgroup -S elastico
 adduser -S -h /var/lib/elasticsearch -s /sbin/nologin -G elastico \
 	-g "added by apk for elasticsearch" -DH elastico
 
diff --git a/testing/emby/emby.pre-install b/testing/emby/emby.pre-install
index b3431b26049088c7c2fd57558e51295364e8c7ae..cfe59652f62825d941762e9a9c488a9206803b8b 100644
--- a/testing/emby/emby.pre-install
+++ b/testing/emby/emby.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
-addgroup emby 2>/dev/null
-adduser -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
+addgroup -S emby 2>/dev/null
+adduser -S -D -h /var/lib/emby -s /sbin/nologin -g "Emby media server" \
 	-G emby emby 2>/dev/null
 exit 0
diff --git a/testing/gdnsd/gdnsd.pre-install b/testing/gdnsd/gdnsd.pre-install
index dc6e44b9cb7fff1a236ec31c04ffd2a8c312d9c6..2479466873c5061cd4aaccb0b6f8f78d426e3e22 100644
--- a/testing/gdnsd/gdnsd.pre-install
+++ b/testing/gdnsd/gdnsd.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup gdnsd 2>/dev/null
+addgroup -S gdnsd 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G gdnsd gdnsd 2>/dev/null
 exit 0
diff --git a/testing/lusca/lusca.pre-install b/testing/lusca/lusca.pre-install
index 2ed0cc5cf79d2cbc980d66a28733096c36b6425a..76790288ef25bcbe951a1b2cae2535a5e3d4c41f 100644
--- a/testing/lusca/lusca.pre-install
+++ b/testing/lusca/lusca.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 adduser -S -D lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
 addgroup lusca winbind
 exit 0
diff --git a/testing/lusca/lusca.pre-upgrade b/testing/lusca/lusca.pre-upgrade
index 2ed0cc5cf79d2cbc980d66a28733096c36b6425a..76790288ef25bcbe951a1b2cae2535a5e3d4c41f 100644
--- a/testing/lusca/lusca.pre-upgrade
+++ b/testing/lusca/lusca.pre-upgrade
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 adduser -S -D lusca -h /var/cache/lusca -s /sbin/nologin  2>/dev/null
-addgroup winbind 2>/dev/null
+addgroup -S winbind 2>/dev/null
 addgroup lusca winbind
 exit 0
diff --git a/testing/mongodb/mongodb.pre-install b/testing/mongodb/mongodb.pre-install
index 9b4b642f6afebdbe8d271393be8239dec7160bfb..432d98384fc2cb274f277ff5209dca1f6f19e430 100644
--- a/testing/mongodb/mongodb.pre-install
+++ b/testing/mongodb/mongodb.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup mongodb
-adduser -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb
+addgroup -S mongodb
+adduser -S -D -G mongodb -h /var/lib/mongodb -s /sbin/nologin mongodb
 exit 0
diff --git a/testing/opensips/opensips.pre-install b/testing/opensips/opensips.pre-install
index 4b9ccd418dd280abaa6a2456cf9ac9e945024ccb..5da9a0e28c796afbdad775947ecdbd65258ff924 100644
--- a/testing/opensips/opensips.pre-install
+++ b/testing/opensips/opensips.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-adduser -H -h /var/empty -s /bin/false -D opensips  2>/dev/null
+adduser -S -H -h /var/empty -s /bin/false -D opensips  2>/dev/null
 
 exit 0
diff --git a/testing/openxcap/openxcap.pre-install b/testing/openxcap/openxcap.pre-install
index c67a449d3a5b4244b5543abe17707f680d75c14c..032311392a1cc44c666a760d7c89db83390e9917 100755
--- a/testing/openxcap/openxcap.pre-install
+++ b/testing/openxcap/openxcap.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup openxcap 2>/dev/null
+addgroup -S openxcap 2>/dev/null
 adduser -S -G openxcap -h /var/run/openxcap -s /bin/false -D -H openxcap 2>/dev/null
 exit 0
diff --git a/testing/pdns/pdns.pre-install b/testing/pdns/pdns.pre-install
index c9d2d147355def5dcca364a2c9c0faac169efe05..2565d49cf29158abf6a2ac2ad1ef1ff42b0ae3a5 100644
--- a/testing/pdns/pdns.pre-install
+++ b/testing/pdns/pdns.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-adduser -H -h /var/empty -D -s /bin/false pdns 2>/dev/null
+adduser -S -H -h /var/empty -D -s /bin/false pdns 2>/dev/null
 exit 0
diff --git a/testing/prosody/prosody.pre-install b/testing/prosody/prosody.pre-install
index 2dbe8bf5b39a88cafd50721013de0d2c093d9415..e2fab2127b2b284531cb698f2d315c708bf21d3f 100644
--- a/testing/prosody/prosody.pre-install
+++ b/testing/prosody/prosody.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
-addgroup prosody 2>/dev/null
-adduser -D \
+addgroup -S prosody 2>/dev/null
+adduser -S -D \
 	-h /var/lib/prosody \
 	-s /sbin/nologin \
 	-g "Prosody XMPP Server" \
diff --git a/testing/qpage/qpage.pre-install b/testing/qpage/qpage.pre-install
index c463899a1675a1cedebc153b5cbd9b202ba91a48..160fc0b45d1e491f22b8b8a8f8db643e79f60a37 100644
--- a/testing/qpage/qpage.pre-install
+++ b/testing/qpage/qpage.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-adduser -h /var/lib/qpage -s /bin/false -G qpage -D qpage 2>/dev/null || true
+adduser -S -h /var/lib/qpage -s /bin/false -G qpage -D qpage 2>/dev/null || true
diff --git a/testing/rancid/rancid.pre-install b/testing/rancid/rancid.pre-install
index aa86d1cc501c436e9c8ab261b89244dbb0a64bf3..55691b2f64ddd2844b1d129bc1340b0ca34dc729 100644
--- a/testing/rancid/rancid.pre-install
+++ b/testing/rancid/rancid.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 
-addgroup netadm 2>/dev/null
+addgroup -S netadm 2>/dev/null
 adduser -S -h /var/rancid -s /bin/sh -G netadm -D rancid 2>/dev/null
 exit 0
diff --git a/testing/rrdbot/rrdbot.pre-install b/testing/rrdbot/rrdbot.pre-install
index 2c35d02d17288a83428d7a18673581801d109822..ab339f8c8190e0847c2b60b2ac24b142f8252307 100644
--- a/testing/rrdbot/rrdbot.pre-install
+++ b/testing/rrdbot/rrdbot.pre-install
@@ -2,6 +2,6 @@
 
 # this user should be included in alpine-baselayout-1.2.
 # included here for backward compability.
-adduser -H -s /bin/false -D rrdbotd  2>/dev/null
+adduser -S -H -s /bin/false -D rrdbotd  2>/dev/null
 
 exit 0
diff --git a/testing/rutorrent/rutorrent.pre-install b/testing/rutorrent/rutorrent.pre-install
index 2d0c909c3131b19d86ee93102eee8ca7942e72bb..0d814556e4f41e6438368e87aa0a9d12e8ff82ce 100644
--- a/testing/rutorrent/rutorrent.pre-install
+++ b/testing/rutorrent/rutorrent.pre-install
@@ -1,4 +1,4 @@
 #!/bin/sh
-addgroup rutorrent 2>/dev/null
+addgroup -S rutorrent 2>/dev/null
 exit 0
 
diff --git a/testing/wt/wt.pre-install b/testing/wt/wt.pre-install
index 8fca39d250274fbe888926b8a35ad7bc98ee5765..e4478b2bf43fe137835528b9a148da22c67c98bf 100644
--- a/testing/wt/wt.pre-install
+++ b/testing/wt/wt.pre-install
@@ -1,5 +1,5 @@
 #!/bin/sh
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -H -s /sbin/nologin -D wt 2>/dev/null
+adduser -S -H -s /sbin/nologin -D wt 2>/dev/null
 addgroup wt www-data 2>/dev/null
 exit 0
diff --git a/testing/zabbix/zabbix-agent.pre-install b/testing/zabbix/zabbix-agent.pre-install
index 57d46c251ab76931431e5da8079930a1207ca162..3e42ff09f2918f94a4f96d92f41e51aca8a5e33e 100644
--- a/testing/zabbix/zabbix-agent.pre-install
+++ b/testing/zabbix/zabbix-agent.pre-install
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-addgroup zabbix 2>/dev/null
+addgroup -S zabbix 2>/dev/null
 adduser -S -H -h /dev/null -s /sbin/nologin -D -G zabbix zabbix 2>/dev/null
-addgroup -g 30 zabbix 2>/dev/null
+addgroup -S -g 30 zabbix 2>/dev/null
 exit 0
diff --git a/unmaintained/ejabberd-git/ejabberd-git.pre-install b/unmaintained/ejabberd-git/ejabberd-git.pre-install
index 4111b3189ea299fdb94dfadae1c9d6c9c6b6e86b..6d801516534f28e8dabc15b1549158dbc4721e9f 100644
--- a/unmaintained/ejabberd-git/ejabberd-git.pre-install
+++ b/unmaintained/ejabberd-git/ejabberd-git.pre-install
@@ -1,3 +1,3 @@
 #!/bin/sh
-adduser -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
+adduser -S -H -h /var/lib/ejabberd -G ejabberd -D ejabberd  2>/dev/null
 exit 0