diff --git a/atomic_reactor/plugins/gather_builds_metadata.py b/atomic_reactor/plugins/gather_builds_metadata.py
index acdee86c7..dcd94eea0 100644
--- a/atomic_reactor/plugins/gather_builds_metadata.py
+++ b/atomic_reactor/plugins/gather_builds_metadata.py
@@ -5,6 +5,7 @@
 This software may be modified and distributed under the terms
 of the BSD license. See the LICENSE file for details.
 """
+import json
 from typing import Any, Dict, Optional
 
 from atomic_reactor.plugin import Plugin
@@ -110,7 +111,7 @@ def _get_build_metadata(self, platform: str):
         """
         pullspec_image = self._determine_image_pullspec(platform)
         buildroot = get_buildroot(platform)
-        build_host = self._get_hostname_for_platform(platform)
+        build_host = json.loads(self._get_hostname_for_platform(platform))
         output_files, _ = get_output(workflow=self.workflow, buildroot_id=build_host,
                                      pullspec=pullspec_image, platform=platform,
                                      source_build=False)
diff --git a/requirements-devel.txt b/requirements-devel.txt
index b98ac182c..be45b4f43 100644
--- a/requirements-devel.txt
+++ b/requirements-devel.txt
@@ -124,7 +124,7 @@ opentelemetry-semantic-conventions==0.40b0
     #   opentelemetry-sdk
 opentelemetry-util-http==0.40b0
     # via opentelemetry-instrumentation-requests
-osbs-client @ git+https://github.com/containerbuildsystem/osbs-client@2bd03f4e0e5edc474b6236c5c128620d988f79a3
+osbs-client @ git+https://github.com/rcerven/osbs-client@b8f23412970b9e94154df79505324a91677c99cd
     # via -r requirements.in
 otel-extensions==0.2.5
     # via -r otel-requirements.in
diff --git a/requirements.in b/requirements.in
index 5e42394db..6110b861b 100644
--- a/requirements.in
+++ b/requirements.in
@@ -6,7 +6,7 @@ jsonschema
 paramiko>=2.10.1
 PyYAML
 ruamel.yaml
-git+https://github.com/containerbuildsystem/osbs-client@2bd03f4e0e5edc474b6236c5c128620d988f79a3#egg=osbs-client
+git+https://github.com/rcerven/osbs-client@b8f23412970b9e94154df79505324a91677c99cd#egg=osbs-client
 # cannot build cryptography with rust for version >= 3.5
 cryptography < 3.5
 requests
diff --git a/requirements.txt b/requirements.txt
index 075590d29..0edd5e8a3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -111,7 +111,7 @@ opentelemetry-semantic-conventions==0.41b0
     #   opentelemetry-sdk
 opentelemetry-util-http==0.41b0
     # via opentelemetry-instrumentation-requests
-osbs-client @ git+https://github.com/containerbuildsystem/osbs-client@2bd03f4e0e5edc474b6236c5c128620d988f79a3
+osbs-client @ git+https://github.com/rcerven/osbs-client@b8f23412970b9e94154df79505324a91677c99cd
     # via -r requirements.in
 otel-extensions==0.2.5
     # via -r otel-requirements.in
diff --git a/tekton/pipelines/binary-container.yaml b/tekton/pipelines/binary-container.yaml
index 68ecb054d..63cf034d3 100644
--- a/tekton/pipelines/binary-container.yaml
+++ b/tekton/pipelines/binary-container.yaml
@@ -36,7 +36,7 @@ spec:
     - name: platforms_result
       value: $(tasks.binary-container-prebuild.results.platforms_result)
     - name: annotations
-      value: $(tasks.binary-container-exit.results.annotations)
+      value: $(finally.binary-container-exit.results.annotations)
 
   tasks:
     - name: clone