diff --git a/core/pom.xml b/core/pom.xml
index c4679df5f5..f28a1fa28b 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -157,11 +157,9 @@
             <version>v1b3-rev266-1.25.0</version>
         </dependency>
 
-        <!--compile 'org.hibernate:hibernate-core:5.3.6.Final'-->
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>5.3.6.Final</version>
         </dependency>
 
         <!--compile 'org.postgresql:postgresql:42.2.5'-->
diff --git a/pom.xml b/pom.xml
index 0f1b5c9482..3211d58529 100644
--- a/pom.xml
+++ b/pom.xml
@@ -54,6 +54,7 @@
         <io.prometheus.version>0.8.0</io.prometheus.version>
         <byte-buddy.version>1.9.10</byte-buddy.version>
         <hamcrest.version>1.3</hamcrest.version>
+        <hibernate.version>5.3.6.Final</hibernate.version>
         <kafka.version>2.3.0</kafka.version>
         <mockito.version>2.28.2</mockito.version>
         <!-- OpenCensus is used in grpc and Google's HTTP client libs in Cloud SDKs -->
@@ -249,6 +250,11 @@
                 <artifactId>kafka-clients</artifactId>
                 <version>${kafka.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.hibernate</groupId>
+                <artifactId>hibernate-core</artifactId>
+                <version>${hibernate.version}</version>
+            </dependency>
             <dependency>
                 <groupId>net.bytebuddy</groupId>
                 <artifactId>byte-buddy</artifactId>
diff --git a/serving/pom.xml b/serving/pom.xml
index ce4ee6f49c..c7a30166f6 100644
--- a/serving/pom.xml
+++ b/serving/pom.xml
@@ -267,13 +267,6 @@
       <scope>test</scope>
     </dependency>
 
-    <!-- Hibernate for formatting SQL string -->
-    <dependency>
-      <groupId>org.hibernate</groupId>
-      <artifactId>hibernate-core</artifactId>
-      <version>5.4.5.Final</version>
-    </dependency>
-
     <!-- Utilities -->
     <dependency>
       <groupId>com.fasterxml.jackson.dataformat</groupId>