diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2470cf9bdb6987050ca414dd3eb068c7a15273e7..ee53fd10c235eb0ee4f1cefa49cceae2f7e2d572 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
 include:
 - template: Workflows/Branch-Pipelines.gitlab-ci.yml
 - project: hive/haf
-  ref: 4c5cc6d9645e19fbbc135cefc6da942fdf13de73   # develop
+  ref: 0edb9655005a62611583974364ca46328e172047 # develop
   file: /scripts/ci-helpers/prepare_data_image_job.yml   # implicitly pulls templates/base.gitlab-ci.yml from common-ci-configuration
   # Do not include common-ci-configuration here, it is already referenced by scripts/ci-helpers/prepare_data_image_job.yml included from Haf/Hive repos
 
diff --git a/submodules/btracker b/submodules/btracker
index ed9a1b324b4050ad34fae0572acde5be9e403642..35fc6f44860bcff42e7650e511b150288af31168 160000
--- a/submodules/btracker
+++ b/submodules/btracker
@@ -1 +1 @@
-Subproject commit ed9a1b324b4050ad34fae0572acde5be9e403642
+Subproject commit 35fc6f44860bcff42e7650e511b150288af31168
diff --git a/submodules/haf b/submodules/haf
index 4c5cc6d9645e19fbbc135cefc6da942fdf13de73..0edb9655005a62611583974364ca46328e172047 160000
--- a/submodules/haf
+++ b/submodules/haf
@@ -1 +1 @@
-Subproject commit 4c5cc6d9645e19fbbc135cefc6da942fdf13de73
+Subproject commit 0edb9655005a62611583974364ca46328e172047
diff --git a/submodules/hafah b/submodules/hafah
index bd77e82ce3e2102488aecb421cac9fdb015c8ecc..acd0f656345aa34be7bc7fd5c631cf3816b416aa 160000
--- a/submodules/hafah
+++ b/submodules/hafah
@@ -1 +1 @@
-Subproject commit bd77e82ce3e2102488aecb421cac9fdb015c8ecc
+Subproject commit acd0f656345aa34be7bc7fd5c631cf3816b416aa
diff --git a/submodules/reptracker b/submodules/reptracker
index 61445bd83201d0a330aa9c8695004dd31feaf3ba..7db172ed1a6fa1f33b3fde2281362c9c37bce4c8 160000
--- a/submodules/reptracker
+++ b/submodules/reptracker
@@ -1 +1 @@
-Subproject commit 61445bd83201d0a330aa9c8695004dd31feaf3ba
+Subproject commit 7db172ed1a6fa1f33b3fde2281362c9c37bce4c8