diff --git a/bootstrap/sql/com.mysql.cj.jdbc.Driver/v009__create_db_connection_info.sql b/bootstrap/sql/com.mysql.cj.jdbc.Driver/v009__create_db_connection_info.sql
index 018c7ce0d80..9e368e70ed8 100644
--- a/bootstrap/sql/com.mysql.cj.jdbc.Driver/v009__create_db_connection_info.sql
+++ b/bootstrap/sql/com.mysql.cj.jdbc.Driver/v009__create_db_connection_info.sql
@@ -149,6 +149,8 @@ WHERE jsonSchema = 'pipelineStatus' AND extension <> 'pipeline.PipelineStatus';
 
 -- We are refactoring the storage service with containers. We'll remove the locations
 DROP TABLE location_entity;
+DELETE FROM entity_relationship WHERE fromEntity='location' OR toEntity='location';
+TRUNCATE TABLE storage_service_entity;
 
 UPDATE dbservice_entity
 SET json = JSON_REMOVE(json, '$.connection.config.storageServiceName')
diff --git a/bootstrap/sql/org.postgresql.Driver/v009__create_db_connection_info.sql b/bootstrap/sql/org.postgresql.Driver/v009__create_db_connection_info.sql
index 9526a06ee2b..482e5915ac5 100644
--- a/bootstrap/sql/org.postgresql.Driver/v009__create_db_connection_info.sql
+++ b/bootstrap/sql/org.postgresql.Driver/v009__create_db_connection_info.sql
@@ -153,6 +153,8 @@ WHERE jsonSchema = 'pipelineStatus' AND extension <> 'pipeline.PipelineStatus';
 
 -- We are refactoring the storage service with containers. We'll remove the locations
 DROP TABLE location_entity;
+DELETE FROM entity_relationship WHERE fromEntity='location' OR toEntity='location';
+TRUNCATE TABLE storage_service_entity;
 
 UPDATE dbservice_entity
 SET json = json::jsonb #- '{connection,config,storageServiceName}'
diff --git a/openmetadata-spec/src/main/resources/json/schema/entity/services/connections/database/hiveConnection.json b/openmetadata-spec/src/main/resources/json/schema/entity/services/connections/database/hiveConnection.json
index d6599fa794a..5482ca702e8 100644
--- a/openmetadata-spec/src/main/resources/json/schema/entity/services/connections/database/hiveConnection.json
+++ b/openmetadata-spec/src/main/resources/json/schema/entity/services/connections/database/hiveConnection.json
@@ -52,7 +52,7 @@
       "title": "Authentication Mode",
       "description": "Authentication mode to connect to hive.",
       "type": "string",
-      "enum": ["NONE", "LDAP", "KERBEROS", "CUSTOM", "NOSASL", "BASIC"],
+      "enum": ["NONE", "LDAP", "KERBEROS", "CUSTOM", "NOSASL", "BASIC", "GSSAPI", "JWT", "PLAIN"],
       "default": "NONE"
     },
     "kerberosServiceName": {