diff --git a/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py b/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py
index c95e20252e421..53501b9a536ee 100644
--- a/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py
+++ b/metadata-ingestion/src/datahub/ingestion/source/sql/athena.py
@@ -192,15 +192,12 @@ def gen_schema_containers(
         database: str,
         extra_properties: Optional[Dict[str, Any]] = None,
     ) -> Iterable[MetadataWorkUnit]:
-        database_container_key = gen_database_key(
-            database,
-            platform=self.platform,
-            platform_instance=self.config.platform_instance,
-            env=self.config.env,
+        database_container_key = self.get_database_container_key(
+            db_name=database, schema=schema
         )
 
         yield from gen_database_container(
-            database=database,
+            database=database_container_key.database,
             database_container_key=database_container_key,
             sub_types=[DatasetContainerSubTypes.DATABASE],
             domain_registry=self.domain_registry,