diff --git a/distribution/config/gremlin-server.yaml b/distribution/config/gremlin-server.yaml
index bdc1324..7cd51d1 100644
--- a/distribution/config/gremlin-server.yaml
+++ b/distribution/config/gremlin-server.yaml
@@ -30,9 +30,7 @@ scriptEngines: {
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [../config/demodb.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.orientdb.io.OrientIoRegistry] }}             # application/vnd.gremlin-v3.0+gryo
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { serializeResultToString: true }}                                                                       # application/vnd.gremlin-v3.0+gryo-stringd
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.orientdb.io.OrientIoRegistry] }}         # application/json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.orientdb.io.OrientIoRegistry] }}         # application/json
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
diff --git a/distribution/docker/gremlin-server.yaml b/distribution/docker/gremlin-server.yaml
index 0165ca2..732bd14 100644
--- a/distribution/docker/gremlin-server.yaml
+++ b/distribution/docker/gremlin-server.yaml
@@ -30,9 +30,7 @@ scriptEngines: {
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: [../config/demodb.groovy]}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.orientdb.io.OrientIoRegistry] }}             # application/vnd.gremlin-v3.0+gryo
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { serializeResultToString: true }}                                                                       # application/vnd.gremlin-v3.0+gryo-stringd
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.orientdb.io.OrientIoRegistry] }}         # application/json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.orientdb.io.OrientIoRegistry] }}         # application/json
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 }}
diff --git a/driver/pom.xml b/driver/pom.xml
index f0c74ca..e33d86c 100644
--- a/driver/pom.xml
+++ b/driver/pom.xml
@@ -16,7 +16,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <gremlin.version>3.6.7</gremlin.version>
+        <gremlin.version>3.7.2</gremlin.version>
         <project.rootdir>${project.basedir}/../</project.rootdir>
     </properties>
 
diff --git a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/gremlintest/OrientGraphProvider.java b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/gremlintest/OrientGraphProvider.java
index 07324a5..77a86b2 100644
--- a/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/gremlintest/OrientGraphProvider.java
+++ b/driver/src/test/java/org/apache/tinkerpop/gremlin/orientdb/gremlintest/OrientGraphProvider.java
@@ -16,7 +16,6 @@
 import org.apache.tinkerpop.gremlin.structure.FeatureSupportTest.GraphFunctionalityTest;
 import org.apache.tinkerpop.gremlin.structure.Graph;
 import org.apache.tinkerpop.gremlin.structure.GraphTest;
-import org.apache.tinkerpop.gremlin.structure.SerializationTest;
 import org.apache.tinkerpop.gremlin.structure.io.IoCustomTest;
 import org.junit.AssumptionViolatedException;
 
@@ -45,14 +44,7 @@ public class OrientGraphProvider extends AbstractGraphProvider {
     IGNORED_TESTS.put(
         GraphFunctionalityTest.class, asList("shouldSupportTransactionsIfAGraphConstructsATx"));
 
-    // This tests become broken after gremlin 3.2.4
-    IGNORED_TESTS.put(
-        SerializationTest.GraphSONV3d0Test.class, asList("shouldSerializeTraversalMetrics"));
-
     // This tests become broken after gremlin 3.2.0
-    IGNORED_TESTS.put(SerializationTest.GryoV1d0Test.class, asList("shouldSerializeTree"));
-    IGNORED_TESTS.put(SerializationTest.GryoV3d0Test.class, asList("shouldSerializeTree"));
-
     IGNORED_TESTS.put(IoCustomTest.class, asList("shouldSerializeTree"));
   }
 
diff --git a/server/pom.xml b/server/pom.xml
index 3339c2b..be8c4f4 100644
--- a/server/pom.xml
+++ b/server/pom.xml
@@ -13,7 +13,7 @@
     <artifactId>orientdb-gremlin-server</artifactId>
 
     <properties>
-        <tinkerpop.version>3.6.7</tinkerpop.version>
+        <tinkerpop.version>3.7.2</tinkerpop.version>
         <slf4j.version>1.7.21</slf4j.version>
         <project.rootdir>${project.basedir}/../</project.rootdir>
     </properties>
diff --git a/server/src/test/java/com/orientechnologies/tinkerpop/server/OGremlinServerPluginTest.java b/server/src/test/java/com/orientechnologies/tinkerpop/server/OGremlinServerPluginTest.java
index b5a0edb..e78c57f 100644
--- a/server/src/test/java/com/orientechnologies/tinkerpop/server/OGremlinServerPluginTest.java
+++ b/server/src/test/java/com/orientechnologies/tinkerpop/server/OGremlinServerPluginTest.java
@@ -11,13 +11,13 @@
 import org.apache.commons.configuration2.BaseConfiguration;
 import org.apache.tinkerpop.gremlin.driver.Client;
 import org.apache.tinkerpop.gremlin.driver.Cluster;
-import org.apache.tinkerpop.gremlin.driver.MessageSerializer;
 import org.apache.tinkerpop.gremlin.driver.exception.ResponseException;
-import org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0;
 import org.apache.tinkerpop.gremlin.orientdb.OrientGraph;
 import org.apache.tinkerpop.gremlin.orientdb.io.OrientIoRegistry;
 import org.apache.tinkerpop.gremlin.structure.Vertex;
 import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONMapper;
+import org.apache.tinkerpop.gremlin.util.MessageSerializer;
+import org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -34,7 +34,7 @@ public void setup() throws Exception {
   public void shouldAuthenticateWithPlainText() throws Exception {
 
     MessageSerializer serializer =
-        new GraphSONMessageSerializerV3d0(
+        new GraphSONMessageSerializerV3(
             GraphSONMapper.build().addRegistry(OrientIoRegistry.getInstance()));
     final Cluster cluster =
         Cluster.build().credentials("root", "root").serializer(serializer).create();
@@ -87,7 +87,7 @@ public void shouldUseReaderAndGiveExceptionOnWrite() throws Exception {
   @Test
   public void shouldCreateAVertexPerson() throws Exception {
     MessageSerializer serializer =
-        new GraphSONMessageSerializerV3d0(
+        new GraphSONMessageSerializerV3(
             GraphSONMapper.build().addRegistry(OrientIoRegistry.getInstance()));
     final Cluster cluster =
         Cluster.build().credentials("root", "root").serializer(serializer).create();
diff --git a/server/src/test/resources/gremlin-server.yaml b/server/src/test/resources/gremlin-server.yaml
index 5d14a89..f357658 100644
--- a/server/src/test/resources/gremlin-server.yaml
+++ b/server/src/test/resources/gremlin-server.yaml
@@ -28,9 +28,7 @@ scriptEngines: {
                org.apache.tinkerpop.gremlin.jsr223.ImportGremlinPlugin: {classImports: [java.lang.Math], methodImports: [java.lang.Math#*]},
                org.apache.tinkerpop.gremlin.jsr223.ScriptFileGremlinPlugin: {files: []}}}}
 serializers:
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.orientdb.io.OrientIoRegistry] }}             # application/vnd.gremlin-v3.0+gryo
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV3d0, config: { serializeResultToString: true }}                                                                       # application/vnd.gremlin-v3.0+gryo-stringd
-  - { className: org.apache.tinkerpop.gremlin.driver.ser.GraphSONMessageSerializerV3d0, config: { ioRegistries: [org.apache.tinkerpop.gremlin.orientdb.io.OrientIoRegistry] }}         # application/json
+  - { className: org.apache.tinkerpop.gremlin.util.ser.GraphSONMessageSerializerV3, config: { ioRegistries: [org.apache.tinkerpop.gremlin.orientdb.io.OrientIoRegistry] }}         # application/json
 processors:
   - { className: org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor, config: { sessionTimeout: 28800000 }}
   - { className: org.apache.tinkerpop.gremlin.server.op.traversal.TraversalOpProcessor, config: { cacheExpirationTime: 600000, cacheMaxSize: 1000 }}