diff --git a/scripts/release/atomic_pipeline.py b/scripts/release/atomic_pipeline.py
index f24342ea5..ee356982a 100755
--- a/scripts/release/atomic_pipeline.py
+++ b/scripts/release/atomic_pipeline.py
@@ -337,23 +337,21 @@ def build_upgrade_hook_image(build_configuration: BuildConfiguration):
 
 
 def build_agent_pipeline(
-    build_configuration: BuildConfiguration,
-    image_version,
-    init_database_image,
-    mongodb_tools_url_ubi,
-    mongodb_agent_url_ubi: str,
+    build_configuration,
     agent_version,
+    tools_distro,
+    agent_distro,
+    tools_version,
 ):
     build_configuration_copy = copy(build_configuration)
-    build_configuration_copy.version = image_version
+    build_configuration_copy.version = agent_version
     args = {
-        "version": image_version,
+        "version": agent_version,
+        "release_version": agent_version,
+        "agent_distro": agent_distro,
         "agent_version": agent_version,
-        "ubi_suffix": "-ubi",
-        "release_version": image_version,
-        "init_database_image": init_database_image,
-        "mongodb_tools_url_ubi": mongodb_tools_url_ubi,
-        "mongodb_agent_url_ubi": mongodb_agent_url_ubi,
+        "tools_version": tools_version,
+        "tools_distro": tools_distro,
         "quay_registry": build_configuration.base_registry,
     }
 
@@ -380,7 +378,7 @@ def build_agent_default_case(build_configuration: BuildConfiguration):
         agent_versions_to_build = gather_latest_agent_versions(release)
 
     logger.info(
-        f"Building Agent versions: {agent_versions_to_build} for Operator versions: {build_configuration.version}"
+        f"Building Agent versions: {agent_versions_to_build}"
     )
 
     tasks_queue = Queue()
@@ -396,11 +394,10 @@ def build_agent_default_case(build_configuration: BuildConfiguration):
             # We don't need to keep create and push the same image on every build.
             # It is enough to create and push the non-operator suffixed images only during releases to ecr and quay.
             logger.info(f"======= Building Agent {agent_version} ({idx}/{len(agent_versions_to_build)})")
-            _build_agent_operator(
+            _build_agent(
                 agent_version,
                 build_configuration,
                 executor,
-                build_configuration.version,
                 tasks_queue,
             )
 
@@ -419,32 +416,25 @@ def queue_exception_handling(tasks_queue):
         )
 
 
-def _build_agent_operator(
+def _build_agent(
     agent_version: Tuple[str, str],
     build_configuration: BuildConfiguration,
     executor: ProcessPoolExecutor,
-    operator_version: str,
     tasks_queue: Queue,
 ):
     agent_distro = "rhel9_x86_64"
     tools_version = agent_version[1]
     tools_distro = get_tools_distro(tools_version)["amd"]
-    image_version = f"{agent_version[0]}_{operator_version}"
-    mongodb_tools_url_ubi = (
-        f"https://downloads.mongodb.org/tools/db/mongodb-database-tools-{tools_distro}-{tools_version}.tgz"
-    )
-    mongodb_agent_url_ubi = f"https://mciuploads.s3.amazonaws.com/mms-automation/mongodb-mms-build-agent/builds/automation-agent/prod/mongodb-mms-automation-agent-{agent_version[0]}.{agent_distro}.tar.gz"
-    init_database_image = f"{build_configuration.base_registry}/mongodb-kubernetes-init-database:{operator_version}"
+    agent_image_version = f"{agent_version[0]}"
 
     tasks_queue.put(
         executor.submit(
             build_agent_pipeline,
             build_configuration,
-            image_version,
-            init_database_image,
-            mongodb_tools_url_ubi,
-            mongodb_agent_url_ubi,
-            agent_version[0],
+            agent_image_version,
+            tools_distro,
+            agent_distro,
+            tools_version,
         )
     )