diff --git a/bootstrap/sql/com.mysql.cj.jdbc.Driver/v004__create_db_connection_info.sql b/bootstrap/sql/com.mysql.cj.jdbc.Driver/v004__create_db_connection_info.sql
index 295484fc650..8a2ea187c1b 100644
--- a/bootstrap/sql/com.mysql.cj.jdbc.Driver/v004__create_db_connection_info.sql
+++ b/bootstrap/sql/com.mysql.cj.jdbc.Driver/v004__create_db_connection_info.sql
@@ -90,3 +90,7 @@ ALTER TABLE thread_entity
 UPDATE dbservice_entity
 SET json = JSON_REMOVE(json, '$.connection.config.databaseSchema','$.connection.config.oracleServiceName')
 WHERE serviceType = 'Oracle';
+
+UPDATE dbservice_entity
+SET json = JSON_REMOVE(json, '$.connection.config.hostPort')
+WHERE serviceType = 'Athena';
diff --git a/bootstrap/sql/org.postgresql.Driver/v004__create_db_connection_info.sql b/bootstrap/sql/org.postgresql.Driver/v004__create_db_connection_info.sql
index 499e12b200d..b6dcf6282ab 100644
--- a/bootstrap/sql/org.postgresql.Driver/v004__create_db_connection_info.sql
+++ b/bootstrap/sql/org.postgresql.Driver/v004__create_db_connection_info.sql
@@ -84,4 +84,8 @@ ALTER TABLE thread_entity
 
 UPDATE dbservice_entity
 SET json = json::jsonb #- '{connection,config,databaseSchema}' #- '{connection,config,oracleServiceName}'
-WHERE serviceType = 'Oracle';
\ No newline at end of file
+WHERE serviceType = 'Oracle';
+
+UPDATE dbservice_entity
+SET json = json::jsonb #- '{connection,config,hostPort}'
+WHERE serviceType = 'Athena';
diff --git a/catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/athenaConnection.json b/catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/athenaConnection.json
index 8234ec980d7..ab4983daf1a 100644
--- a/catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/athenaConnection.json
+++ b/catalog-rest-service/src/main/resources/json/schema/entity/services/connections/database/athenaConnection.json
@@ -36,11 +36,6 @@
       "title": "AWS Credentials Configuration",
       "$ref": "../../../../security/credentials/awsCredentials.json"
     },
-    "hostPort": {
-      "title": "Host and Port",
-      "description": "Host and port of the Athena service.",
-      "type": "string"
-    },
     "s3StagingDir": {
       "title": "S3 Staging Directory",
       "description": "S3 Staging Directory.",