diff --git a/.circleci/config.yml b/.circleci/config.yml
index a6604d6ae..81714ae26 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -161,6 +161,7 @@ jobs:
       - image: cimg/go:1.19.7
       - image: yugabytedb/yugabyte:latest
         command: bin/yugabyted start --daemon=false
+        name: yugabyte
     resource_class: << parameters.resource_class >>
     steps:
       - install-ubuntu-deps
@@ -177,7 +178,7 @@ jobs:
             SKIP_CONFORMANCE: "1"
             LOTUS_SRC_DIR: /home/circleci/project
           command: |
-            dockerize -wait tcp://localhost:5433 -timeout 1m
+            dockerize -wait tcp://yugabyte:5433 -timeout 1m
             mkdir -p /tmp/test-reports/<< parameters.suite >>
             mkdir -p /tmp/test-artifacts
             gotestsum \
diff --git a/.circleci/template.yml b/.circleci/template.yml
index 19a043837..2b24cbf01 100644
--- a/.circleci/template.yml
+++ b/.circleci/template.yml
@@ -161,6 +161,7 @@ jobs:
       - image: cimg/go:[[ .GoVersion]]
       - image: yugabytedb/yugabyte:latest
         command: bin/yugabyted start --daemon=false
+        name: yugabyte
     resource_class: << parameters.resource_class >>
     steps:
       - install-ubuntu-deps
@@ -177,7 +178,7 @@ jobs:
             SKIP_CONFORMANCE: "1"
             LOTUS_SRC_DIR: /home/circleci/project
           command: |
-            dockerize -wait tcp://localhost:5433 -timeout 1m
+            dockerize -wait tcp://yugabyte:5433 -timeout 1m
             mkdir -p /tmp/test-reports/<< parameters.suite >>
             mkdir -p /tmp/test-artifacts
             gotestsum \