diff --git a/community/apk-deploy-tool/APKBUILD b/community/apk-deploy-tool/APKBUILD
index 814d506d3d4aa22ab22d1205f15ac86f0978dd70..763d2ba7c4d00d476147210b15f4bbb98fca5a27 100644
--- a/community/apk-deploy-tool/APKBUILD
+++ b/community/apk-deploy-tool/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=apk-deploy-tool
 pkgver=0.5.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Tool for easily deploying applications or configuration packaged in APK via SSH"
 url="https://github.com/jirutka/apk-deploy-tool"
 arch="noarch"
diff --git a/community/apk-deploy-tool/apk-deploy-tool.pre-install b/community/apk-deploy-tool/apk-deploy-tool.pre-install
index 2614e0edf732665140e06b8a4ec8a6c916539abb..95106aececbb9f5719ba3fc7064a9d51a7041043 100644
--- a/community/apk-deploy-tool/apk-deploy-tool.pre-install
+++ b/community/apk-deploy-tool/apk-deploy-tool.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S deploy 2>/dev/null
-adduser -S -D -h /var/lib/apk-deploy -s /bin/ash -G deploy -k /var/empty \
+adduser -S -D -h /var/lib/apk-deploy -s /bin/sh -G deploy -k /var/empty \
 	-g "added for apk-deploy-tool" deploy 2>/dev/null \
 	&& echo "deploy:*" | chpasswd -e  # unlock account
 
diff --git a/community/gitea/APKBUILD b/community/gitea/APKBUILD
index 97b7a59644dff7f442d663e202e828fe84caf3fa..f892ebcc426218da164dcac659a263d3d6c7178b 100644
--- a/community/gitea/APKBUILD
+++ b/community/gitea/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: 6543 <6543@obermui.de>
 pkgname=gitea
 pkgver=1.21.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Self-hosted Git service written in Go"
 url="https://about.gitea.com"
 arch="all"
diff --git a/community/gitea/gitea.pre-install b/community/gitea/gitea.pre-install
index 0c508e75b8d73a7c508c462c036adde5f985b7bc..01958a617371bd3b8cd6ebc33763463d48b96d59 100644
--- a/community/gitea/gitea.pre-install
+++ b/community/gitea/gitea.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -D -h /var/lib/gitea -s /bin/ash -G www-data -g gitea gitea 2>/dev/null \
+adduser -S -D -h /var/lib/gitea -s /bin/sh -G www-data -g gitea gitea 2>/dev/null \
         && passwd -u gitea 2>/dev/null
 
 exit 0
diff --git a/community/gogs/APKBUILD b/community/gogs/APKBUILD
index 02f8f31779789c933a587b8d62dc47cac9486d14..35a86b20dddda9534801f4c9c10b7e74131912e9 100644
--- a/community/gogs/APKBUILD
+++ b/community/gogs/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Will Sinatra <wpsinatra@gmail.com>
 pkgname=gogs
 pkgver=0.13.0
-pkgrel=8
+pkgrel=9
 pkgdesc="Painless self-hosted Git service"
 url="https://gogs.io/"
 arch="all"
diff --git a/community/gogs/gogs.pre-install b/community/gogs/gogs.pre-install
index 80d9ac0763dae6812f15d9bd0f3a70164b434e4e..ae3ebcfa568053cbe440716b246cc7a5fcbd1069 100644
--- a/community/gogs/gogs.pre-install
+++ b/community/gogs/gogs.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -D -h /var/lib/gogs -s /bin/ash -G www-data -g gogs gogs 2>/dev/null \
+adduser -S -D -h /var/lib/gogs -s /bin/sh -G www-data -g gogs gogs 2>/dev/null \
 	&& passwd -u gogs 2>/dev/null
 
 exit 0
diff --git a/testing/forgejo/APKBUILD b/testing/forgejo/APKBUILD
index eea8a80f9a790dd8c1920c8f3fdb4a15d2de8152..dcb4806c5c6692f98905824f03b89ce230479a6f 100644
--- a/testing/forgejo/APKBUILD
+++ b/testing/forgejo/APKBUILD
@@ -5,7 +5,7 @@
 pkgname=forgejo
 _pkgver=1.21.4-0
 pkgver=${_pkgver/-/.}
-pkgrel=0
+pkgrel=1
 pkgdesc="Self-hosted Git service written in Go"
 url="https://forgejo.org"
 arch="all"
diff --git a/testing/forgejo/forgejo.pre-install b/testing/forgejo/forgejo.pre-install
index e65e3ef1759c93918f64be76671ff13cbbad93ae..c7e8b7bbcccbd350ab17ddda7871e242f55dbf70 100644
--- a/testing/forgejo/forgejo.pre-install
+++ b/testing/forgejo/forgejo.pre-install
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 addgroup -S -g 82 www-data 2>/dev/null
-adduser -S -D -h /var/lib/forgejo -s /bin/ash -G www-data -g forgejo forgejo 2>/dev/null \
+adduser -S -D -h /var/lib/forgejo -s /bin/sh -G www-data -g forgejo forgejo 2>/dev/null \
 	&& passwd -u forgejo 2>/dev/null
 
 exit 0