diff --git a/agenta-backend/agenta_backend/services/templates_manager.py b/agenta-backend/agenta_backend/services/templates_manager.py
index 3c9f074fd5..17d2c3d6a8 100644
--- a/agenta-backend/agenta_backend/services/templates_manager.py
+++ b/agenta-backend/agenta_backend/services/templates_manager.py
@@ -20,6 +20,9 @@
 templates_base_url = os.getenv("TEMPLATES_BASE_URL")
 agenta_template_repo = os.getenv("AGENTA_TEMPLATE_REPO")
 docker_hub_url = os.getenv("DOCKER_HUB_URL")
+docker_hub_template_url = os.getenv(
+    "DOCKER_HUB_TEMPLATE_URL", f"{docker_hub_url}/{{}}/tags"
+)
 
 
 async def update_and_sync_templates(cache: bool = True) -> None:
@@ -86,7 +89,7 @@ async def retrieve_templates_from_dockerhub_cached(cache: bool) -> List[dict]:
 
     # If not cached, fetch data from Docker Hub and cache it in Redis
     response = await retrieve_templates_from_dockerhub(
-        docker_hub_url,
+        docker_hub_template_url,
         agenta_template_repo,
     )
     response_data = response["results"]
@@ -133,8 +136,8 @@ async def retrieve_templates_from_dockerhub(
 
     Args:
         url (str): The URL endpoint for retrieving templates. Should contain placeholders `{}`
-            for the `repo_owner` and `repo_name` values to be inserted. For example:
-            `https://hub.docker.com/v2/repositories/{}/{}/tags`.
+            for `repo_name` values to be inserted. For example:
+            `https://hub.docker.com/v2/repositories/{}/tags`.
         repo_name (str): The name of the repository where the templates are located.
 
     Returns:
@@ -142,7 +145,7 @@ async def retrieve_templates_from_dockerhub(
     """
 
     async with httpx.AsyncClient() as client:
-        response = await client.get(f"{url}/{repo_name}/tags", timeout=90)
+        response = await client.get(url.format(repo_name), timeout=90)
         if response.status_code == 200:
             response_data = response.json()
             return response_data
diff --git a/docker-compose.gh.yml b/docker-compose.gh.yml
index 920af50bc6..ae8899bb22 100644
--- a/docker-compose.gh.yml
+++ b/docker-compose.gh.yml
@@ -29,6 +29,7 @@ services:
             - TEMPLATES_BASE_URL=https://llm-app-json.s3.eu-central-1.amazonaws.com
             - REGISTRY_REPO_NAME=agentaai
             - DOCKER_HUB_URL=https://hub.docker.com/v2/repositories
+            - DOCKER_HUB_TEMPLATE_URL=https://hub.docker.com/v2/repositories/{}/tags
         command:
             [
                 "uvicorn",
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index d28662c1b0..d92e332138 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -26,6 +26,7 @@ services:
             - TEMPLATES_BASE_URL=https://llm-app-json.s3.eu-central-1.amazonaws.com
             - REGISTRY_REPO_NAME=agentaai
             - DOCKER_HUB_URL=https://hub.docker.com/v2/repositories
+            - DOCKER_HUB_TEMPLATE_URL=https://hub.docker.com/v2/repositories/{}/tags
         volumes:
             - ./agenta-backend/agenta_backend:/app/agenta_backend
             - ./agenta-backend/migrations:/app/migrations
diff --git a/docker-compose.test.yml b/docker-compose.test.yml
index 4df2d0679b..61430d106d 100644
--- a/docker-compose.test.yml
+++ b/docker-compose.test.yml
@@ -30,6 +30,7 @@ services:
             - TEMPLATES_BASE_URL=https://llm-app-json.s3.eu-central-1.amazonaws.com
             - REGISTRY_REPO_NAME=agentaai
             - DOCKER_HUB_URL=https://hub.docker.com/v2/repositories
+            - DOCKER_HUB_TEMPLATE_URL=https://hub.docker.com/v2/repositories/{}/tags
         volumes:
             - ./agenta-backend/agenta_backend:/app/agenta_backend
             - ./agenta-backend/migrations:/app/migrations
diff --git a/docker-compose.yml b/docker-compose.yml
index 99e3df086a..16de2ccddb 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -29,6 +29,7 @@ services:
             - TEMPLATES_BASE_URL=https://llm-app-json.s3.eu-central-1.amazonaws.com
             - REGISTRY_REPO_NAME=agentaai
             - DOCKER_HUB_URL=https://hub.docker.com/v2/repositories
+            - DOCKER_HUB_TEMPLATE_URL=https://hub.docker.com/v2/repositories/{}/tags
         volumes:
             - ./agenta-backend/agenta_backend:/app/agenta_backend
             - ./agenta-backend/migrations:/app/migrations