diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03d6aa81f1..562393663f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,7 @@ variables:
   TEST_PARALLEL_JOBS: 4
 
   CONFIGURE: ./configure
-  CLANG_VERSION: 20
+  CLANG_VERSION: 21
   CLANG: "clang-${CLANG_VERSION}"
   SCAN_BUILD: "scan-build-${CLANG_VERSION}"
   LLVM_SYMBOLIZER: "/usr/lib/llvm-${CLANG_VERSION}/bin/llvm-symbolizer"
diff --git a/lib/dns/include/dns/librpz.h b/lib/dns/include/dns/librpz.h
index 060943c32b..a5d46fa719 100644
--- a/lib/dns/include/dns/librpz.h
+++ b/lib/dns/include/dns/librpz.h
@@ -170,8 +170,8 @@ typedef struct librpz_result {
 	librpz_dznum_t	   dznum;   /* dnsrpzd zone number */
 	librpz_cznum_t	   cznum;   /* librpz client zone number */
 	librpz_trig_t	   trig : LIBRPZ_TRIG_SIZE;
-	bool		   log : 1; /* log rewrite given librpz_log_level
-				     * */
+	bool		   log	: 1; /* log rewrite given librpz_log_level
+				      * */
 } librpz_result_t;
 
 /**
diff --git a/lib/dns/include/dns/rrl.h b/lib/dns/include/dns/rrl.h
index bdffed99ac..48d582715a 100644
--- a/lib/dns/include/dns/rrl.h
+++ b/lib/dns/include/dns/rrl.h
@@ -112,11 +112,11 @@ struct dns_rrl_entry {
 	unsigned int log_qname : DNS_RRL_QNAMES_BITS;
 
 #define DNS_RRL_TS_GEN_BITS 2
-	unsigned int ts_gen : DNS_RRL_TS_GEN_BITS;
+	unsigned int ts_gen   : DNS_RRL_TS_GEN_BITS;
 	unsigned int ts_valid : 1;
 #define DNS_RRL_HASH_GEN_BITS 1
 	unsigned int hash_gen : DNS_RRL_HASH_GEN_BITS;
-	unsigned int logged : 1;
+	unsigned int logged   : 1;
 #define DNS_RRL_LOG_BITS 11
 	unsigned int log_secs : DNS_RRL_LOG_BITS;
 
diff --git a/tests/include/tests/isc.h b/tests/include/tests/isc.h
index eaee11768f..95fee18d61 100644
--- a/tests/include/tests/isc.h
+++ b/tests/include/tests/isc.h
@@ -117,8 +117,8 @@ teardown_managers(void **state);
 		isc_mem_debugging |= ISC_MEM_DEBUGRECORD;                               \
 		isc_mem_create(&mctx);                                                  \
                                                                                         \
-		while ((c = isc_commandline_parse(argc, argv, "dlt:")) != -1)           \
-		{                                                                       \
+		while ((c = isc_commandline_parse(argc, argv, "dlt:")) !=               \
+		       -1) {                                                            \
 			switch (c) {                                                    \
 			case 'd':                                                       \
 				debug = true;                                           \