diff --git a/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/hive/HiveConnectorAdapter.java b/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/hive/HiveConnectorAdapter.java
index c77c84339d9..2fc5ffb4d4d 100644
--- a/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/hive/HiveConnectorAdapter.java
+++ b/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/hive/HiveConnectorAdapter.java
@@ -15,11 +15,12 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /** Transforming Hive connector configuration and components into Gravitino connector. */
 public class HiveConnectorAdapter implements CatalogConnectorAdapter {
 
-  private static int version = 0;
+  private static final AtomicInteger VERSION = new AtomicInteger(0);
 
   private final HasPropertyMeta propertyMetadata;
   private final PropertyConverter catalogConverter;
@@ -33,7 +34,8 @@ public Map<String, Object> buildInternalConnectorConfig(GravitinoCatalog catalog
       throws Exception {
     Map<String, Object> config = new HashMap<>();
     config.put(
-        "catalogHandle", String.format("%s_v%d:normal:default", catalog.getName(), version++));
+        "catalogHandle",
+        String.format("%s_v%d:normal:default", catalog.getName(), VERSION.getAndIncrement()));
     config.put("connectorName", "hive");
 
     Map<String, Object> properties = new HashMap<>();
diff --git a/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/iceberg/IcebergConnectorAdapter.java b/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/iceberg/IcebergConnectorAdapter.java
index c3a24949af2..f7e276d028b 100644
--- a/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/iceberg/IcebergConnectorAdapter.java
+++ b/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/iceberg/IcebergConnectorAdapter.java
@@ -14,11 +14,12 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /** Transforming Iceberg connector configuration and components into Gravitino connector. */
 public class IcebergConnectorAdapter implements CatalogConnectorAdapter {
 
-  private static int version = 0;
+  private static final AtomicInteger VERSION = new AtomicInteger(0);
   private final IcebergPropertyMeta propertyMetadata;
   private final PropertyConverter catalogConverter;
 
@@ -31,7 +32,8 @@ public Map<String, Object> buildInternalConnectorConfig(GravitinoCatalog catalog
       throws Exception {
     Map<String, Object> config = new HashMap<>();
     config.put(
-        "catalogHandle", String.format("%s_v%d:normal:default", catalog.getName(), version++));
+        "catalogHandle",
+        String.format("%s_v%d:normal:default", catalog.getName(), VERSION.getAndIncrement()));
     config.put("connectorName", "iceberg");
 
     Map<String, String> properties =
diff --git a/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/jdbc/mysql/MySQLConnectorAdapter.java b/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/jdbc/mysql/MySQLConnectorAdapter.java
index ad84f397583..06941d90ef4 100644
--- a/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/jdbc/mysql/MySQLConnectorAdapter.java
+++ b/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/jdbc/mysql/MySQLConnectorAdapter.java
@@ -16,12 +16,13 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /** Transforming MySQL connector configuration and components into Gravitino connector. */
 public class MySQLConnectorAdapter implements CatalogConnectorAdapter {
 
   private final PropertyConverter catalogConverter;
-  private static int version = 0;
+  private static final AtomicInteger VERSION = new AtomicInteger(0);
   private final HasPropertyMeta propertyMetadata;
 
   public MySQLConnectorAdapter() {
@@ -33,7 +34,8 @@ public Map<String, Object> buildInternalConnectorConfig(GravitinoCatalog catalog
       throws Exception {
     Map<String, Object> config = new HashMap<>();
     config.put(
-        "catalogHandle", String.format("%s_v%d:normal:default", catalog.getName(), version++));
+        "catalogHandle",
+        String.format("%s_v%d:normal:default", catalog.getName(), VERSION.getAndIncrement()));
     config.put("connectorName", "mysql");
 
     Map<String, String> properties =
diff --git a/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/jdbc/postgresql/PostgreSQLConnectorAdapter.java b/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/jdbc/postgresql/PostgreSQLConnectorAdapter.java
index 874b354f5ec..4b9b90e1190 100644
--- a/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/jdbc/postgresql/PostgreSQLConnectorAdapter.java
+++ b/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/jdbc/postgresql/PostgreSQLConnectorAdapter.java
@@ -13,11 +13,12 @@
 import com.datastrato.gravitino.trino.connector.metadata.GravitinoCatalog;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /** Transforming PostgreSQL connector configuration and components into Gravitino connector. */
 public class PostgreSQLConnectorAdapter implements CatalogConnectorAdapter {
   private final PropertyConverter catalogConverter;
-  private static int version = 0;
+  private static final AtomicInteger VERSION = new AtomicInteger(0);
 
   public PostgreSQLConnectorAdapter() {
     this.catalogConverter = new JDBCCatalogPropertyConverter();
@@ -27,7 +28,8 @@ public Map<String, Object> buildInternalConnectorConfig(GravitinoCatalog catalog
       throws Exception {
     Map<String, Object> config = new HashMap<>();
     config.put(
-        "catalogHandle", String.format("%s_v%d:normal:default", catalog.getName(), version++));
+        "catalogHandle",
+        String.format("%s_v%d:normal:default", catalog.getName(), VERSION.getAndIncrement()));
     config.put("connectorName", "postgresql");
 
     Map<String, String> properties =
diff --git a/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/memory/MemoryConnectorAdapter.java b/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/memory/MemoryConnectorAdapter.java
index 3843559cc3c..7b30df53d58 100644
--- a/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/memory/MemoryConnectorAdapter.java
+++ b/trino-connector/src/main/java/com/datastrato/gravitino/trino/connector/catalog/memory/MemoryConnectorAdapter.java
@@ -13,6 +13,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 /**
  * Support trino Memory connector for testing. Transforming Memory connector configuration and
@@ -20,7 +21,7 @@
  */
 public class MemoryConnectorAdapter implements CatalogConnectorAdapter {
 
-  private static int version = 0;
+  private static final AtomicInteger VERSION = new AtomicInteger(0);
   private final HasPropertyMeta propertyMetadata;
 
   public MemoryConnectorAdapter() {
@@ -31,7 +32,8 @@ public MemoryConnectorAdapter() {
   public Map<String, Object> buildInternalConnectorConfig(GravitinoCatalog catalog) {
     Map<String, Object> config = new HashMap<>();
     config.put(
-        "catalogHandle", String.format("%s_v%d:normal:default", catalog.getName(), version++));
+        "catalogHandle",
+        String.format("%s_v%d:normal:default", catalog.getName(), VERSION.getAndIncrement()));
     config.put("connectorName", "memory");
 
     Map<String, Object> properties = new HashMap<>();