diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fa147bb..b7193e12 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -54,8 +54,8 @@ set(LIBYANG_DEP_SOVERSION 2.46.1)
 set(LIBYANG_DEP_SOVERSION_MAJOR 2)
 
 # libnetconf2 required version
-set(LIBNETCONF2_DEP_VERSION 3.0.7)
-set(LIBNETCONF2_DEP_SOVERSION 4.1.4)
+set(LIBNETCONF2_DEP_VERSION 3.0.8)
+set(LIBNETCONF2_DEP_SOVERSION 4.1.5)
 set(LIBNETCONF2_DEP_SOVERSION_MAJOR 4)
 
 # sysrepo required version
diff --git a/example_configuration/ssh_callhome.xml b/example_configuration/ssh_callhome.xml
index 876ccaed..11bacc5e 100644
--- a/example_configuration/ssh_callhome.xml
+++ b/example_configuration/ssh_callhome.xml
@@ -8,18 +8,13 @@
                     <ssh>
                         <tcp-client-parameters>
                             <remote-address>localhost</remote-address>
-                            <keepalives>
-                                <idle-time>1</idle-time>
-                                <max-probes>10</max-probes>
-                                <probe-interval>5</probe-interval>
-                            </keepalives>
                         </tcp-client-parameters>
                         <ssh-server-parameters>
                             <server-identity>
                                 <host-key>
                                     <name>default-key</name>
                                     <public-key>
-                                        <keystore-reference>genkey</keystore-reference>
+                                        <central-keystore-reference>genkey</central-keystore-reference>
                                     </public-key>
                                 </host-key>
                             </server-identity>
diff --git a/example_configuration/ssh_listen.xml b/example_configuration/ssh_listen.xml
index 3ffeb199..fb3e076e 100644
--- a/example_configuration/ssh_listen.xml
+++ b/example_configuration/ssh_listen.xml
@@ -1,55 +1,53 @@
 <netconf-server xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-server">
   <listen>
-    <endpoint>
-      <name>default-ssh</name>
-      <ssh>
-        <tcp-server-parameters>
-          <local-address>0.0.0.0</local-address>
-          <keepalives>
-            <idle-time>1</idle-time>
-            <max-probes>10</max-probes>
-            <probe-interval>5</probe-interval>
-          </keepalives>
-        </tcp-server-parameters>
-        <ssh-server-parameters>
-          <server-identity>
-            <host-key>
-              <name>default-key</name>
-              <public-key>
-                <keystore-reference>genkey</keystore-reference>
-              </public-key>
-            </host-key>
-          </server-identity>
-          <client-authentication>
-            <users>
-              <user>
-                <name>user</name> <!-- User name that can use this authorized key(s) to authenticate itself -->
-                <public-keys>
-                  <use-system-keys xmlns="urn:cesnet:libnetconf2-netconf-server"/> <!-- Uses system authorized keys of the user automatically -->
-                  <!-- Specific inline definition of an authorized key can be used INSTEAD of system authorized keys (select one method)
-                  <inline-definition>
-                    <public-key>
-                      <name>my-authorized-key</name>
-                      <public-key-format xmlns:ct="urn:ietf:params:xml:ns:yang:ietf-crypto-types">ct:ssh-public-key-format</public-key-format>
-                      <public-key>base64==</public-key> - Copy here one line (key) from the authorized_keys of the user
-                    </public-key>
-                  </inline-definition>
+    <endpoints>
+      <endpoint>
+        <name>default-ssh</name>
+        <ssh>
+          <tcp-server-parameters>
+            <local-address>0.0.0.0</local-address>
+          </tcp-server-parameters>
+          <ssh-server-parameters>
+            <server-identity>
+              <host-key>
+                <name>default-key</name>
+                <public-key>
+                  <central-keystore-reference>genkey</central-keystore-reference>
+                </public-key>
+              </host-key>
+            </server-identity>
+            <client-authentication>
+              <users>
+                <user>
+                  <name>user</name> <!-- User name that can use this authorized key(s) to authenticate itself -->
+                  <public-keys>
+                    <use-system-keys xmlns="urn:cesnet:libnetconf2-netconf-server"/> <!-- Uses system authorized keys of the user automatically -->
+                    <!-- Specific inline definition of an authorized key can be used INSTEAD of system authorized keys (select one method)
+                    <inline-definition>
+                      <public-key>
+                        <name>my-authorized-key</name>
+                        <public-key-format xmlns:ct="urn:ietf:params:xml:ns:yang:ietf-crypto-types">ct:ssh-public-key-format</public-key-format>
+                        <public-key>base64==</public-key> - Copy here one line (key) from the authorized_keys of the user
+                      </public-key>
+                    </inline-definition>
+                    -->
+                  </public-keys>
+                  <!-- Use password authentication INSTEAD of public keys (select one method)
+                  <password>$0$pass</password> - Replace "pass" with a clear-text password of the user or use a hashed
+                        password (details in iana-crypt-hash YANG module)
                   -->
-                </public-keys>
-                <!-- Use password authentication INSTEAD of public keys (select one method)
-                <password>pass</password> - Replace "pass" with the password of the user
-                -->
 
-                <!-- Use keyboard-interactive authentication INSTEAD of public keys (select one method)
-                <keyboard-interactive xmlns="urn:cesnet:libnetconf2-netconf-server">
-                  <use-system-auth/> - Will use system mechanisms for authentication the user, usually asking for their password
-                </keyboard-interactive>
-                -->
-              </user>
-            </users>
-          </client-authentication>
-        </ssh-server-parameters>
-      </ssh>
-    </endpoint>
+                  <!-- Use keyboard-interactive authentication INSTEAD of public keys (select one method)
+                  <keyboard-interactive xmlns="urn:cesnet:libnetconf2-netconf-server">
+                    <use-system-auth/> - Will use system mechanisms for authentication the user, usually asking for their password
+                  </keyboard-interactive>
+                  -->
+                </user>
+              </users>
+            </client-authentication>
+          </ssh-server-parameters>
+        </ssh>
+      </endpoint>
+    </endpoints>
   </listen>
 </netconf-server>
diff --git a/example_configuration/tls_callhome.xml b/example_configuration/tls_callhome.xml
index 9b910bcc..49552320 100644
--- a/example_configuration/tls_callhome.xml
+++ b/example_configuration/tls_callhome.xml
@@ -8,27 +8,22 @@
                     <tls>
                         <tcp-client-parameters>
                             <remote-address>localhost</remote-address>
-                            <keepalives>
-                                <idle-time>1</idle-time>
-                                <max-probes>10</max-probes>
-                                <probe-interval>5</probe-interval>
-                            </keepalives>
                         </tcp-client-parameters>
                         <tls-server-parameters>
                             <server-identity>
                                 <certificate>
-                                    <keystore-reference>
+                                    <central-keystore-reference>
                                         <asymmetric-key>serverkey</asymmetric-key>
                                         <certificate>servercert</certificate>
-                                    </keystore-reference>
+                                    </central-keystore-reference>
                                 </certificate>
                             </server-identity>
                             <client-authentication>
                                 <ca-certs>
-                                    <truststore-reference>cacerts</truststore-reference>
+                                    <central-truststore-reference>cacerts</central-truststore-reference>
                                 </ca-certs>
                                 <ee-certs>
-                                    <truststore-reference>eecerts</truststore-reference>
+                                    <central-truststore-reference>eecerts</central-truststore-reference>
                                 </ee-certs>
                             </client-authentication>
                         </tls-server-parameters>
diff --git a/example_configuration/tls_listen.xml b/example_configuration/tls_listen.xml
index d0d6d893..85b10a2f 100644
--- a/example_configuration/tls_listen.xml
+++ b/example_configuration/tls_listen.xml
@@ -1,45 +1,42 @@
 <netconf-server xmlns="urn:ietf:params:xml:ns:yang:ietf-netconf-server">
     <listen>
-        <endpoint>
-            <name>default-tls</name>
-            <tls>
-                <tcp-server-parameters>
-                    <local-address>0.0.0.0</local-address>
-                    <keepalives>
-                        <idle-time>1</idle-time>
-                        <max-probes>10</max-probes>
-                        <probe-interval>5</probe-interval>
-                    </keepalives>
-                </tcp-server-parameters>
-                <tls-server-parameters>
-                    <server-identity>
-                        <certificate>
-                            <keystore-reference>
-                                <asymmetric-key>serverkey</asymmetric-key>
-                                <certificate>servercert</certificate>
-                            </keystore-reference>
-                        </certificate>
-                    </server-identity>
-                    <client-authentication>
-                        <ca-certs>
-                            <truststore-reference>cacerts</truststore-reference>
-                        </ca-certs>
-                        <ee-certs>
-                            <truststore-reference>eecerts</truststore-reference>
-                        </ee-certs>
-                    </client-authentication>
-                </tls-server-parameters>
-                <netconf-server-parameters>
-                    <client-identity-mappings>
-                        <cert-to-name>
-                            <id>1</id>
-                            <fingerprint>02:20:E1:AD:CC:92:71:E9:EA:6A:85:DF:A7:FF:8C:BB:B9:D5:E4:EE:74</fingerprint>
-                            <map-type xmlns:x509c2n="urn:ietf:params:xml:ns:yang:ietf-x509-cert-to-name">x509c2n:specified</map-type>
-                            <name>tls-test</name>
-                        </cert-to-name>
-                    </client-identity-mappings>
-                </netconf-server-parameters>
-            </tls>
-        </endpoint>
+        <endpoints>
+            <endpoint>
+                <name>default-tls</name>
+                <tls>
+                    <tcp-server-parameters>
+                        <local-address>0.0.0.0</local-address>
+                    </tcp-server-parameters>
+                    <tls-server-parameters>
+                        <server-identity>
+                            <certificate>
+                                <central-keystore-reference>
+                                    <asymmetric-key>serverkey</asymmetric-key>
+                                    <certificate>servercert</certificate>
+                                </central-keystore-reference>
+                            </certificate>
+                        </server-identity>
+                        <client-authentication>
+                            <ca-certs>
+                                <central-truststore-reference>cacerts</central-truststore-reference>
+                            </ca-certs>
+                            <ee-certs>
+                                <central-truststore-reference>eecerts</central-truststore-reference>
+                            </ee-certs>
+                        </client-authentication>
+                    </tls-server-parameters>
+                    <netconf-server-parameters>
+                        <client-identity-mappings>
+                            <cert-to-name>
+                                <id>1</id>
+                                <fingerprint>02:20:E1:AD:CC:92:71:E9:EA:6A:85:DF:A7:FF:8C:BB:B9:D5:E4:EE:74</fingerprint>
+                                <map-type xmlns:x509c2n="urn:ietf:params:xml:ns:yang:ietf-x509-cert-to-name">x509c2n:specified</map-type>
+                                <name>tls-test</name>
+                            </cert-to-name>
+                        </client-identity-mappings>
+                    </netconf-server-parameters>
+                </tls>
+            </endpoint>
+        </endpoints>
     </listen>
 </netconf-server>
diff --git a/scripts/common.sh b/scripts/common.sh
index ec773875..8ca0a97f 100644
--- a/scripts/common.sh
+++ b/scripts/common.sh
@@ -22,18 +22,18 @@ LN2_MODULES=(
 "iana-tls-cipher-suite-algs@2022-06-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-04-17.yang -e cleartext-passwords -e cleartext-private-keys"
-"ietf-keystore@2023-04-17.yang -e central-keystore-supported -e inline-definitions-supported -e asymmetric-keys"
-"ietf-truststore@2023-04-17.yang -e central-truststore-supported -e inline-definitions-supported -e certificates -e public-keys"
-"ietf-tcp-common@2023-04-17.yang -e keepalives-supported"
-"ietf-tcp-server@2023-04-17.yang -e tcp-server-keepalives"
-"ietf-tcp-client@2023-04-17.yang -e local-binding-supported -e tcp-client-keepalives"
-"ietf-ssh-common@2023-04-17.yang -e transport-params"
-"ietf-ssh-server@2023-04-17.yang -e local-users-supported -e local-user-auth-publickey -e local-user-auth-password -e local-user-auth-none"
-"ietf-tls-common@2023-04-17.yang -e tls10 -e tls11 -e tls12 -e tls13 -e hello-params"
-"ietf-tls-server@2023-04-17.yang -e server-ident-x509-cert -e client-auth-supported -e client-auth-x509-cert"
-"ietf-netconf-server@2023-04-17.yang -e ssh-listen -e tls-listen -e ssh-call-home -e tls-call-home -e central-netconf-server-supported"
-"libnetconf2-netconf-server@2023-09-07.yang"
+"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 inline-definitions-supported -e asymmetric-keys"
+"ietf-truststore@2023-12-28.yang -e central-truststore-supported -e inline-definitions-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 -e local-users-supported -e local-user-auth-publickey -e local-user-auth-password -e local-user-auth-none"
+"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@2024-01-15.yang"
 )
 
 # get path to the sysrepocfg executable
diff --git a/scripts/merge_config.sh b/scripts/merge_config.sh
index 17b6efdf..8502167b 100755
--- a/scripts/merge_config.sh
+++ b/scripts/merge_config.sh
@@ -65,32 +65,29 @@ fi
 # import default config
 CONFIG="<netconf-server xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-server\">
     <listen>
-        <endpoint>
-            <name>default-ssh</name>
-            <ssh>
-                <tcp-server-parameters>
-                    <local-address>0.0.0.0</local-address>
-                    <keepalives>
-                        <idle-time>1</idle-time>
-                        <max-probes>10</max-probes>
-                        <probe-interval>5</probe-interval>
-                    </keepalives>
-                </tcp-server-parameters>
-                <ssh-server-parameters>
-                    <server-identity>
-                        <host-key>
-                            <name>default-key</name>
-                            <public-key>
-                                <keystore-reference>genkey</keystore-reference>
-                            </public-key>
-                        </host-key>
-                    </server-identity>
-                    <client-authentication>
-                        ${USERS_CONFIG}
-                    </client-authentication>
-                </ssh-server-parameters>
-            </ssh>
-        </endpoint>
+        <endpoints>
+            <endpoint>
+                <name>default-ssh</name>
+                <ssh>
+                    <tcp-server-parameters>
+                        <local-address>0.0.0.0</local-address>
+                    </tcp-server-parameters>
+                    <ssh-server-parameters>
+                        <server-identity>
+                            <host-key>
+                                <name>default-key</name>
+                                <public-key>
+                                    <central-keystore-reference>genkey</central-keystore-reference>
+                                </public-key>
+                            </host-key>
+                        </server-identity>
+                        <client-authentication>
+                            ${USERS_CONFIG}
+                        </client-authentication>
+                    </ssh-server-parameters>
+                </ssh>
+            </endpoint>
+        </endpoints>
     </listen>
 </netconf-server>"
 
diff --git a/tests/test_url.c b/tests/test_url.c
index 5d6ec7ad..37a7a673 100644
--- a/tests/test_url.c
+++ b/tests/test_url.c
@@ -288,10 +288,6 @@ test_copy_config_into_file(void **state)
             "      </rule>\n"
             "    </rule-list>\n"
             "  </nacm>\n"
-            "  <netconf-server xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-server\">\n"
-            "    <hello-timeout xmlns=\"urn:cesnet:libnetconf2-netconf-server\">60</hello-timeout>\n"
-            "    <idle-timeout xmlns=\"urn:cesnet:libnetconf2-netconf-server\">0</idle-timeout>\n"
-            "  </netconf-server>\n"
             "</config>\n";
 
     assert_int_not_equal(-1, asprintf(&expected, template, np_get_user()) == -1);
@@ -419,10 +415,6 @@ test_edit_config(void **state)
             "        </rule>\n"
             "      </rule-list>\n"
             "    </nacm>\n"
-            "    <netconf-server xmlns=\"urn:ietf:params:xml:ns:yang:ietf-netconf-server\">\n"
-            "      <hello-timeout xmlns=\"urn:cesnet:libnetconf2-netconf-server\">60</hello-timeout>\n"
-            "      <idle-timeout xmlns=\"urn:cesnet:libnetconf2-netconf-server\">0</idle-timeout>\n"
-            "    </netconf-server>\n"
             "  </data>\n"
             "</get-config>\n";