diff --git a/README.md b/README.md
index d9ce619..8cf90aa 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
 
 Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features
 
-**Shipped version:** 16.5.0~ynh1
+**Shipped version:** 16.6.0~ynh1
 
 **Demo:** https://gitlab.com/explore
 
diff --git a/README_fr.md b/README_fr.md
index d1580fc..6db6e80 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
 
 Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD
 
-**Version incluse :** 16.5.0~ynh1
+**Version incluse :** 16.6.0~ynh1
 
 **Démo :** https://gitlab.com/explore
 
diff --git a/conf/gitlab.rb b/conf/gitlab.rb
index 54d9af8..6457426 100644
--- a/conf/gitlab.rb
+++ b/conf/gitlab.rb
@@ -805,6 +805,13 @@ gitlab_rails['gitlab_shell_ssh_port'] = __SSH_PORT__
 # gitlab_rails['databases']['ci']['db_database'] = 'gitlabhq_production'
 # gitlab_rails['databases']['ci']['database_tasks'] = false
 
+### GitLab ClickHouse connection settings
+###! EXPERIMENTAL
+# gitlab_rails['clickhouse_databases']['main']['database'] = 'dbname'
+# gitlab_rails['clickhouse_databases']['main']['url'] = 'https://example.com/path'
+# gitlab_rails['clickhouse_databases']['main']['username'] = 'gitlab'
+# gitlab_rails['clickhouse_databases']['main']['password'] = 'password'
+
 ### GitLab Redis settings
 ###! Connect to your own Redis instance
 ###! Docs: https://docs.gitlab.com/omnibus/settings/redis.html
@@ -2142,6 +2149,21 @@ nginx['listen_https'] = false
 # gitlab_kas['log_group'] = nil
 # gitlab_kas['env_directory'] = '/opt/gitlab/etc/gitlab-kas/env'
 
+##! Redis settings for GitLab KAS
+# gitlab_kas['redis_socket'] = ''
+# gitlab_kas['redis_host'] = '127.0.0.1'
+# gitlab_kas['redis_port'] = '6379'
+# gitlab_kas['redis_password'] = nil
+
+# gitlab_kas['redis_sentinels'] = {}
+# gitlab_kas['redis_sentinels_master_name'] = nil
+# gitlab_kas['redis_sentinels_password'] = ''
+
+# gitlab_kas['redis_ssl'] = false
+# gitlab_kas['redis_tls_ca_cert_file'] = '/opt/gitlab/embedded/ssl/certs/cacert.pem'
+# gitlab_kas['redis_tls_client_cert_file'] = nil
+# gitlab_kas['redis_tls_client_key_file'] = nil
+
 ################################################################################
 ## GitLab Suggested Reviewers (EE Only)
 ##! Docs: https://docs.gitlab.com/ee/user/project/merge_requests/reviews/#suggested-reviewers
@@ -3044,6 +3066,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
 # pgbouncer['listen_addr'] = '0.0.0.0'
 # pgbouncer['listen_port'] = '6432'
 # pgbouncer['pool_mode'] = 'transaction'
+# pgbouncer['max_prepared_statements'] = 0
 # pgbouncer['server_reset_query'] = 'DISCARD ALL'
 # pgbouncer['application_name_add_host'] = '1'
 # pgbouncer['max_client_conn'] = '2048'
@@ -3060,6 +3083,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
 # pgbouncer['admin_users'] = %w(gitlab-psql postgres pgbouncer)
 # pgbouncer['stats_users'] = %w(gitlab-psql postgres pgbouncer)
 # pgbouncer['ignore_startup_parameters'] = 'extra_float_digits'
+# pgbouncer['track_extra_parameters'] = %w(IntervalStyle)
 # pgbouncer['databases'] = {
 #   DATABASE_NAME: {
 #     host: HOSTNAME,
@@ -3076,6 +3100,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
 # pgbouncer['unix_socket_group'] = nil
 # pgbouncer['auth_type'] = 'md5'
 # pgbouncer['auth_hba_file'] = nil
+# pgbouncer['auth_dbname'] = nil
 # pgbouncer['auth_query'] = 'SELECT username, password FROM public.pg_shadow_lookup($1)'
 # pgbouncer['users'] = {
 #   USERNAME: {
@@ -3106,10 +3131,12 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
 # pgbouncer['autodb_idle_timeout'] = 3600
 # pgbouncer['suspend_timeout'] = 10
 # pgbouncer['idle_transaction_timeout'] = 0
+# pgbouncer['cancel_wait_timeout'] = 10
 # pgbouncer['pkt_buf'] = 4096
 # pgbouncer['listen_backlog'] = 128
 # pgbouncer['sbuf_loopcnt'] = 5
 # pgbouncer['max_packet_size'] = 2147483647
+# pgbouncer['so_reuseport'] = 0
 # pgbouncer['tcp_defer_accept'] = 0
 # pgbouncer['tcp_socket_buffer'] = 0
 # pgbouncer['tcp_keepalive'] = 1
@@ -3117,6 +3144,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
 # pgbouncer['tcp_keepidle'] = 0
 # pgbouncer['tcp_keepintvl'] = 0
 # pgbouncer['disable_pqexec'] = 0
+# default['pgbouncer']['peers'] = {}
 
 ## Pgbouncer client TLS options
 # pgbouncer['client_tls_sslmode'] = 'disable'
@@ -3242,7 +3270,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
 # patroni['tls_verify'] = true
 
 ################################################################################
-# Consul (EEP only)
+# Consul (EE only)
 ################################################################################
 # consul['enable'] = false
 # consul['dir'] = '/var/opt/gitlab/consul'
@@ -3360,7 +3388,7 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
 #### encoded with base64
 # gitlab_rails['service_desk_email_auth_token'] = nil
 
-################################################################################
+#################################################################################
 ## Spamcheck (EE only)
 #################################################################################
 
@@ -3383,4 +3411,11 @@ package['modify_kernel_parameters'] = __MODIFY_KERNEL_PARAMETERS__
 # }
 # spamcheck['classifier']['log_directory'] = "/var/log/gitlab/spam-classifier"
 
+#################################################################################
+## (Go-)Crond
+#################################################################################
+# crond['log_directory'] = '/var/log/gitlab/crond'
+# crond['cron_d'] = '/var/opt/gitlab/crond'
+# crond['flags'] = {}
+
 from_file '/etc/gitlab/gitlab-persistent.rb'
diff --git a/manifest.toml b/manifest.toml
index 770380e..84b6749 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "GitLab"
 description.en = "Git-repository manager providing wiki, issue-tracking and CI/CD pipeline features"
 description.fr = "Gestionnaire de dépôts Git proposant des fonctionnalités de wiki, suivi de bugs et de pipeline CI/CD"
 
-version = "16.5.0~ynh1"
+version = "16.6.0~ynh1"
 
 maintainers = ["kay0u"]
 
diff --git a/scripts/upgrade.d/upgrade.last.sh b/scripts/upgrade.d/upgrade.last.sh
index ff5472a..6519d31 100644
--- a/scripts/upgrade.d/upgrade.last.sh
+++ b/scripts/upgrade.d/upgrade.last.sh
@@ -1,22 +1,22 @@
 #!/bin/bash
 
-gitlab_version="16.5.0"
+gitlab_version="16.6.0"
 
 # Upgrade path: https://gitlab-com.gitlab.io/support/toolbox/upgrade-path/
 # sha256sum found here: https://packages.gitlab.com/gitlab
 gitlab_debian_version="$(lsb_release -sc)"
 
-gitlab_x86_64_bookworm_source_sha256="5d91d00aff827350ea36a86779753617d52d0edc402ae955bdf41d95942a1e60"
-gitlab_x86_64_bullseye_source_sha256="b62f152992892fc6324821ee2058e1363c3decab4910eaa99574575fd47f6fdb"
-gitlab_x86_64_buster_source_sha256="24eb4db9e044b4cc44b5b16b3d4cd97a600212eeee5eedb2ea1f86728df96cc2"
+gitlab_x86_64_bookworm_source_sha256="ffd9cfd4682ca7e39ffbadb068e39a3c4435fa4afb335403619288d63a6a31f2"
+gitlab_x86_64_bullseye_source_sha256="3f4d6db09e40cb62380223fbe21f2ac134e9b3ea8ac848e3faa637e5e1d4aef5"
+gitlab_x86_64_buster_source_sha256="292a64f985e0420785bb34307a585c41fce27096d3c78a07a568a41c2a307dde"
 
-gitlab_arm64_bookworm_source_sha256="9f8837e3970165c87cc373bb90fc4833131e492af80c035ac3b4aab04903e56a"
-gitlab_arm64_bullseye_source_sha256="1b428c362e20ecd35525f3c1a86525a9d960204fc8732c602ea5a43be657cbd7"
-gitlab_arm64_buster_source_sha256="f009f6f23c56b028f0d653d28baf849a5770419c17c189d59827edd71f5a18ed"
+gitlab_arm64_bookworm_source_sha256="20f1e6a6af09197d80abc29d2079c56ce620724f2c999ff882d074f51e624ba3"
+gitlab_arm64_bullseye_source_sha256="bec1ee9f9b5166c4fada35805b99b3c8ad243be29ce97d83269bf843da4fdf95"
+gitlab_arm64_buster_source_sha256="993b49ff213e850111ba4102e4304027dfb6feea31d40a8658361b08d0d22d4d"
 
 gitlab_arm_bookworm_source_sha256=""
-gitlab_arm_bullseye_source_sha256="552c65f1f41c632d3675c495136c028f9b9ca4b75374525d74f2b6aa7e47596d"
-gitlab_arm_buster_source_sha256="47cc1a152c8a86cf225eed75337d349cd31738efd92d2c8c1fa5c96fd47df08f"
+gitlab_arm_bullseye_source_sha256="c7bd4eaae53cd09acafa756a92e88c2729ae023b690fc165c19650bb03b21c37"
+gitlab_arm_buster_source_sha256="73ed6e2885dcefefdcea8773479082a8c25b64546fb800b2934f396ed58c8368"
 
 architecture=$(ynh_app_setting_get --app="$app" --key=architecture)