diff --git a/component/haproxy/buildout.cfg b/component/haproxy/buildout.cfg
index 214ac79bae1a6a5c60410a9dcea97a8047359a03..0ff0c09f7c44acfea19b791fec012f146d71b83c 100644
--- a/component/haproxy/buildout.cfg
+++ b/component/haproxy/buildout.cfg
@@ -13,8 +13,8 @@ parts = haproxy
 [haproxy]
 recipe = slapos.recipe.cmmi
 shared = true
-url = https://www.haproxy.org/download/2.6/src/haproxy-2.6.15.tar.gz
-md5sum = ecac9724e3ca6368624fb2fab29dd366
+url = https://www.haproxy.org/download/2.6/src/haproxy-2.6.16.tar.gz
+md5sum = b01e605cdaf2742fcedf214a61e187b4
 configure-command = true
 # for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET,
 # otherwise use "generic".
diff --git a/software/end-to-end-testing/software.cfg b/software/end-to-end-testing/software.cfg
index ef31431ea51c40d7de00bf171c6c80f5e42912c3..2be97cb51e5cdbcc1551e94f8f1d5d04be8814d8 100644
--- a/software/end-to-end-testing/software.cfg
+++ b/software/end-to-end-testing/software.cfg
@@ -29,6 +29,8 @@ eggs =
   slapos.core
   websocket-client
   requests
+  opcua
 
 [versions]
 websocket-client = 1.4.2
+opcua = 0.98.13
diff --git a/software/nayuos/buildout.hash.cfg b/software/nayuos/buildout.hash.cfg
index c8dddcd282977ce73d7ca1d6d3a1e3fdcdc54990..76e7706679fe19f93a8f37c909e3415c535dc94e 100644
--- a/software/nayuos/buildout.hash.cfg
+++ b/software/nayuos/buildout.hash.cfg
@@ -14,4 +14,4 @@
 # not need these here).
 [template-instance]
 filename = instance.cfg
-md5sum = 7a558c2b9461ec588c9d77bdeef64e4d
+md5sum = 5a765463118f8b2a09df6260f56c2175
diff --git a/software/nayuos/instance.cfg b/software/nayuos/instance.cfg
index fd050a3f65896a91c3501e65814497fd828d3903..ae8fb484ed87e5a4a00e142d92e6f9947b36d50e 100644
--- a/software/nayuos/instance.cfg
+++ b/software/nayuos/instance.cfg
@@ -25,7 +25,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 # needed for the "repo" command (to download many git repositories)
 recipe = slapos.recipe.build:gitclone
 repository = https://chromium.googlesource.com/chromium/tools/depot_tools.git
-branch = master
+branch = main
 git-executable = {{ git_path }}/bin/git
 
 [customize-path]