diff --git a/user/gitaly/APKBUILD b/user/gitaly/APKBUILD
index c06bf97..c1aae40 100644
--- a/user/gitaly/APKBUILD
+++ b/user/gitaly/APKBUILD
@@ -2,15 +2,15 @@
 # Contributor: Antoine Martin (ayakael) <dev@ayakael.net>
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=gitaly
-pkgver=16.2.0
-pkgrel=1
+pkgver=16.6.0
+pkgrel=0
 pkgdesc="A Git RPC service for handling all the git calls made by GitLab"
 url="https://gitlab.com/gitlab-org/gitaly/"
 arch="all"
 # GPL-2.0-only WITH GCC-exception-2.0: bundled libgit2
 license="MIT AND GPL-2.0-only WITH GCC-exception-2.0"
 depends="
-	git>=2.41
+	git>=2.42
 	"
 makedepends="
 	bash
@@ -80,7 +80,7 @@ praefect() {
 }
 
 sha512sums="
-7576dd5ef690c42582703ba571bb9e6856e85d209025f32b0797c3cecca88e10b538dc75a27d8cd2a99e30e2e99d03d0a61c681a8af692e3e34420775792598a  gitaly-v16.2.0.tar.gz
-7760ee96abd45103a99e3c3fff31538aeac0e10254c88ab600bfc6fed04c0c34b43a4d54295463663a9707204622cfc06d1de672fe2826d22c017850ddac24e4  config.patch
+c2c49b39cd978ca184547c101e3ea9cd68d96bafef070c34350986f0343766d740398631aa451d0c7b51ac90a383594a5de211b468babda39e7080b33a1588f4  gitaly-v16.6.0.tar.gz
+55230e587839df8fc8c6daeee1e5a5fbd91d6d28966d9977d59e6fb3d75e269c9d4d119f3a06217a4c6c55733a50ec9affcdb132e77e1694df839269dcd292aa  config.patch
 c32105d921be16eaf559cf21d6840bc346cd92b5e37974cedecdb5a2d2ca1eb5e8fbb144f5fc8a1289bf9415102b313cf2d61ee510c80f08ab33a799f5ac7122  gitaly.initd
 "
diff --git a/user/gitaly/config.patch b/user/gitaly/config.patch
index 80d15bb..5d326ba 100644
--- a/user/gitaly/config.patch
+++ b/user/gitaly/config.patch
@@ -1,5 +1,5 @@
 diff --git a/config.toml.example.orig b/config.toml.example
-index 2ddb368..0a8a0e2 100644
+index 3d454fb..52457df 100644
 --- a/config.toml.example.orig
 +++ b/config.toml.example
 @@ -2,15 +2,15 @@
@@ -78,17 +78,12 @@ index 2ddb368..0a8a0e2 100644
  # # Additionally exceptions from the Go server can be reported to Sentry
  # sentry_dsn = "https://<key>:<secret>@sentry.io/<project>"
  
-@@ -72,14 +72,14 @@ dir = "/home/git/gitlab/log"
+@@ -71,11 +71,11 @@ dir = "/home/git/gitlab/log"
+ # grpc_latency_buckets = [0.001, 0.005, 0.025, 0.1, 0.5, 1.0, 10.0, 30.0, 60.0, 300.0, 1500.0]
  
- [gitlab-shell]
- # The directory where gitlab-shell is installed
--dir = "/home/git/gitlab-shell"
-+dir = "/usr/lib/gitlab-shell"
- 
--[hooks]
+ [hooks]
 -custom_hooks_dir = "/home/git/custom_hooks"
-+# [hooks]
-+# custom_hooks_dir = "/etc/gitlab/custom_hooks"
++custom_hooks_dir = "/etc/gitlab/custom_hooks"
  
  [gitlab]
 -secret_file = "/home/git/gitlab-shell/.gitlab_shell_secret"