diff --git a/src/ai/backend/common/docker.py b/src/ai/backend/common/docker.py
index 4c7e7f0cb4d..cd4cac0969f 100644
--- a/src/ai/backend/common/docker.py
+++ b/src/ai/backend/common/docker.py
@@ -234,8 +234,7 @@ async def login(
     """
     basic_auth: Optional[aiohttp.BasicAuth]
 
-    # TODO: Fix this.
-    if "public.ecr" in str(registry_url):
+    if "public.ecr" in str(registry_url) or "dkr.ecr" in str(registry_url):
         return {
             "auth": None,
             "headers": {