diff --git a/.gitmodules b/.gitmodules
index 466f2596..8b2e2518 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,7 @@
 [submodule "providers/openfeature-provider-flagd/test-harness"]
 	path = providers/openfeature-provider-flagd/openfeature/test-harness
 	url = git@github.com:open-feature/flagd-testbed.git
+	branch = v0.5.18
 [submodule "providers/openfeature-provider-flagd/spec"]
 	path = providers/openfeature-provider-flagd/openfeature/spec
 	url = https://github.com/open-feature/spec
diff --git a/providers/openfeature-provider-flagd/openfeature/test-harness b/providers/openfeature-provider-flagd/openfeature/test-harness
index e132d258..e908fb7d 160000
--- a/providers/openfeature-provider-flagd/openfeature/test-harness
+++ b/providers/openfeature-provider-flagd/openfeature/test-harness
@@ -1 +1 @@
-Subproject commit e132d25822eaad367f81cf2a06b422edac32a76d
+Subproject commit e908fb7d19def6a4768ca90b02665075bbc1afbb
diff --git a/providers/openfeature-provider-flagd/tests/e2e/flagd_container.py b/providers/openfeature-provider-flagd/tests/e2e/flagd_container.py
index e80fb0f7..31045759 100644
--- a/providers/openfeature-provider-flagd/tests/e2e/flagd_container.py
+++ b/providers/openfeature-provider-flagd/tests/e2e/flagd_container.py
@@ -1,4 +1,5 @@
 import time
+from pathlib import Path
 
 import grpc
 from grpc_health.v1 import health_pb2, health_pb2_grpc
@@ -11,11 +12,13 @@
 class FlagdContainer(DockerContainer):
     def __init__(
         self,
-        image: str = "ghcr.io/open-feature/flagd-testbed:v0.5.15",
+        image: str = "ghcr.io/open-feature/flagd-testbed",
         port: int = 8013,
         **kwargs,
     ) -> None:
-        super().__init__(image, **kwargs)
+        path = Path(__file__).parents[2] / "openfeature/test-harness/version.txt"
+        data = path.read_text().rstrip()
+        super().__init__(f"{image}:v{data}", **kwargs)
         self.port = port
         self.with_exposed_ports(self.port, HEALTH_CHECK)
 
diff --git a/providers/openfeature-provider-flagd/tests/e2e/test_rpc.py b/providers/openfeature-provider-flagd/tests/e2e/test_rpc.py
index 3fefb300..e3508cf1 100644
--- a/providers/openfeature-provider-flagd/tests/e2e/test_rpc.py
+++ b/providers/openfeature-provider-flagd/tests/e2e/test_rpc.py
@@ -22,7 +22,7 @@ def port():
 
 @pytest.fixture(autouse=True, scope="module")
 def image():
-    return "ghcr.io/open-feature/flagd-testbed:v0.5.13"
+    return "ghcr.io/open-feature/flagd-testbed"
 
 
 scenarios(
diff --git a/providers/openfeature-provider-flagd/tests/e2e/test_rpc_reconnect.py b/providers/openfeature-provider-flagd/tests/e2e/test_rpc_reconnect.py
index f56e82b7..36f526e2 100644
--- a/providers/openfeature-provider-flagd/tests/e2e/test_rpc_reconnect.py
+++ b/providers/openfeature-provider-flagd/tests/e2e/test_rpc_reconnect.py
@@ -22,7 +22,7 @@ def port():
 
 @pytest.fixture(autouse=True, scope="module")
 def image():
-    return "ghcr.io/open-feature/flagd-testbed-unstable:v0.5.13"
+    return "ghcr.io/open-feature/flagd-testbed-unstable"
 
 
 scenarios(