diff --git a/athena-postgresql/athena-postgresql-connection.yaml b/athena-postgresql/athena-postgresql-connection.yaml
index cebadb96ec..79b3cb38c8 100644
--- a/athena-postgresql/athena-postgresql-connection.yaml
+++ b/athena-postgresql/athena-postgresql-connection.yaml
@@ -69,6 +69,8 @@ Resources:
       ImageUri: !Sub
         - '${Account}.dkr.ecr.${AWS::Region}.amazonaws.com/athena-federation-repository-postgresql:2022.47.1'
         - Account: !If [IsRegionBAH, 084828588479, !If [IsRegionHKG, 183295418215, 292517598671]]
+      ImageConfig:
+        Command: [ !Sub "com.amazonaws.athena.connectors.postgresql.PostGreSqlCompositeHandler" ]
       Description: "Enables Amazon Athena to communicate with PostgreSQL using JDBC"
       Timeout: 900
       MemorySize: 3008