diff --git a/src/confd/yang/confd.inc b/src/confd/yang/confd.inc
index 67a282a2..88ae49d2 100644
--- a/src/confd/yang/confd.inc
+++ b/src/confd/yang/confd.inc
@@ -18,7 +18,7 @@ MODULES=(
 	"ietf-bfd-ip-sh@2022-09-22.yang"
 	"iana-if-type@2023-01-26.yang"
         # NOTE: ietf-tls-client must be version matched with ietf-tls-server, used by netopeer2!
-	"ietf-tls-client@2023-12-28.yang"
+#	"ietf-tls-client@2023-12-28.yang"
 	"ietf-syslog@2024-03-21.yang -e file-action -e file-limit-size -e remote-action -e select-adv-compare -e select-match"
 	"infix-syslog@2025-11-17.yang"
 	"iana-hardware@2018-03-13.yang"
@@ -39,7 +39,7 @@ MODULES=(
 	"infix-firewall-icmp-types@2025-04-26.yang"
 	"infix-meta@2024-10-18.yang"
 	"infix-system@2025-10-18.yang"
-	"infix-services@2024-12-03.yang"
+	"infix-services@2025-12-10.yang"
 	"ieee802-ethernet-interface@2019-06-21.yang"
 	"infix-ethernet-interface@2024-02-27.yang"
 	"infix-factory-default@2023-06-28.yang"
@@ -47,5 +47,5 @@ MODULES=(
 	"ietf-crypto-types -e cleartext-symmetric-keys"
 	"infix-crypto-types@2025-06-17.yang"
 	"ietf-keystore -e symmetric-keys"
-	"infix-keystore@2025-06-17.yang"
+	"infix-keystore@2025-12-10.yang"
 )
diff --git a/src/confd/yang/libnetconf2.inc b/src/confd/yang/libnetconf2.inc
index 2a1fa268..3f0080b1 100644
--- a/src/confd/yang/libnetconf2.inc
+++ b/src/confd/yang/libnetconf2.inc
@@ -3,23 +3,23 @@
 # INFO: CHANGED FEATURE FLAGS FROM ORIGINAL: ietf-keystore and ietf-ssh-server
 
 MODULES=(
-	"iana-ssh-encryption-algs@2022-06-16.yang"
-	"iana-ssh-key-exchange-algs@2022-06-16.yang"
-	"iana-ssh-mac-algs@2022-06-16.yang"
-	"iana-ssh-public-key-algs@2022-06-16.yang"
-	"iana-tls-cipher-suite-algs@2022-06-16.yang"
+	"iana-ssh-encryption-algs@2024-10-16.yang"
+	"iana-ssh-key-exchange-algs@2024-10-16.yang"
+	"iana-ssh-mac-algs@2024-10-16.yang"
+	"iana-ssh-public-key-algs@2024-10-16.yang"
+	"iana-tls-cipher-suite-algs@2024-10-16.yang"
 	"ietf-x509-cert-to-name@2014-12-10.yang"
 	"iana-crypt-hash@2014-04-04.yang -e crypt-hash-md5 -e crypt-hash-sha-256 -e crypt-hash-sha-512"
-	"ietf-crypto-types@2023-12-28.yang -e cleartext-passwords -e cleartext-private-keys"
-	"ietf-keystore@2023-12-28.yang -e central-keystore-supported -e asymmetric-keys"
-	"ietf-truststore@2023-12-28.yang -e central-truststore-supported -e certificates -e public-keys"
-	"ietf-tcp-common@2023-12-28.yang -e keepalives-supported"
-	"ietf-tcp-server@2023-12-28.yang -e tcp-server-keepalives"
-	"ietf-tcp-client@2023-12-28.yang -e local-binding-supported -e tcp-client-keepalives"
-	"ietf-ssh-common@2023-12-28.yang -e transport-params"
-	"ietf-ssh-server@2023-12-28.yang"
-	"ietf-tls-common@2023-12-28.yang -e tls10 -e tls11 -e tls12 -e tls13 -e hello-params"
-	"ietf-tls-server@2023-12-28.yang -e server-ident-x509-cert -e client-auth-supported -e client-auth-x509-cert"
-	"ietf-netconf-server@2023-12-28.yang -e ssh-listen -e tls-listen -e ssh-call-home -e tls-call-home -e central-netconf-server-supported"
-	"libnetconf2-netconf-server@2025-06-02.yang"
+	"ietf-crypto-types@2024-10-10.yang -e cleartext-passwords -e cleartext-private-keys"
+	"ietf-keystore@2024-10-10.yang -e central-keystore-supported -e inline-definitions-supported -e asymmetric-keys"
+	"ietf-truststore@2024-10-10.yang -e central-truststore-supported -e inline-definitions-supported -e certificates -e public-keys"
+	"ietf-tcp-common@2024-10-10.yang -e keepalives-supported"
+	"ietf-tcp-server@2024-10-10.yang -e tcp-server-keepalives"
+	"ietf-tcp-client@2024-10-10.yang -e local-binding-supported -e tcp-client-keepalives"
+	"ietf-ssh-common@2024-10-10.yang -e algorithm-discovery -e transport-params"
+	"ietf-ssh-server@2024-10-10.yang"
+	"ietf-tls-common@2024-10-10.yang -e algorithm-discovery -e tls12 -e tls13 -e hello-params"
+	"ietf-tls-server@2024-10-10.yang -e server-ident-x509-cert -e client-auth-supported -e client-auth-x509-cert"
+	"ietf-netconf-server@2025-04-24.yang -e ssh-listen -e tls-listen -e ssh-call-home -e tls-call-home -e central-netconf-server-supported"
+	"libnetconf2-netconf-server@2025-11-11.yang"
 )
diff --git a/src/confd/yang/sysrepo.inc b/src/confd/yang/sysrepo.inc
index 7728fedf..fdf667cf 100644
--- a/src/confd/yang/sysrepo.inc
+++ b/src/confd/yang/sysrepo.inc
@@ -2,7 +2,7 @@
 # Modules from sysrepo
 
 MODULES=(
-	"sysrepo@2024-10-25.yang"
+	"sysrepo@2025-04-04.yang"
 	"sysrepo-factory-default@2025-03-18.yang"
 	"sysrepo-monitoring@2023-08-11.yang"
 	"sysrepo-notifications@2025-01-10.yang"