diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml
index 6afaba6196f..f9bf1c16b47 100644
--- a/phoenix-core/pom.xml
+++ b/phoenix-core/pom.xml
@@ -547,7 +547,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tephra</groupId>
-        <artifactId>tephra-hbase-compat-2.0</artifactId>
+        <artifactId>tephra-hbase-compat-${tephra.hbase.compat.version}</artifactId>
         <classifier>shaded</classifier>
         <scope>provided</scope>
       </dependency>
@@ -576,7 +576,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tephra</groupId>
-        <artifactId>tephra-hbase-compat-2.0</artifactId>
+        <artifactId>tephra-hbase-compat-${tephra.hbase.compat.version}</artifactId>
         <classifier>shaded</classifier>
       </dependency>
       <dependency>
diff --git a/pom.xml b/pom.xml
index a257da8ef43..605062a0b99 100644
--- a/pom.xml
+++ b/pom.xml
@@ -122,7 +122,7 @@
     <collections.version>3.2.2</collections.version>
     <jodatime.version>2.10.5</jodatime.version>
     <joni.version>2.1.31</joni.version>
-    <tephra.version>0.16.0</tephra.version>
+    <tephra.version>0.16.1</tephra.version>
     <omid.version>1.0.2</omid.version>
     <stream.version>2.9.5</stream.version>
     <i18n-util.version>1.0.4</i18n-util.version>
@@ -992,7 +992,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.tephra</groupId>
-        <artifactId>tephra-hbase-compat-2.0</artifactId>
+        <artifactId>tephra-hbase-compat-${tephra.hbase.compat.version}</artifactId>
         <classifier>shaded</classifier>
         <version>${tephra.version}</version>
         <!-- use tephra-core-shaded instead -->
@@ -1542,6 +1542,7 @@
         <hbase.version>${hbase-2.4.runtime.version}</hbase.version>
         <hbase.thirdparty.version>3.4.1</hbase.thirdparty.version>
         <zookeeper.version>3.5.7</zookeeper.version>
+        <tephra.hbase.compat.version>2.4</tephra.hbase.compat.version>
       </properties>
     </profile>
     <profile>
@@ -1560,6 +1561,7 @@
         <hbase.compat.version>2.1.6</hbase.compat.version>
         <hbase.version>${hbase-2.1.runtime.version}</hbase.version>
         <hadoop.version>3.0.3</hadoop.version>
+        <tephra.hbase.compat.version>2.1</tephra.hbase.compat.version>
       </properties>
     </profile>
     <profile>
@@ -1576,6 +1578,7 @@
         <hbase.compat.version>2.2.5</hbase.compat.version>
         <hbase.version>${hbase-2.2.runtime.version}</hbase.version>
         <hadoop.version>3.1.3</hadoop.version>
+        <tephra.hbase.compat.version>2.2</tephra.hbase.compat.version>
       </properties>
     </profile>
     <profile>
@@ -1594,6 +1597,7 @@
         <hbase.thirdparty.version>3.3.0</hbase.thirdparty.version>
         <zookeeper.version>3.5.7</zookeeper.version>
         <hadoop.version>3.1.3</hadoop.version>
+        <tephra.hbase.compat.version>2.3</tephra.hbase.compat.version>
       </properties>
     </profile>
     <profile>
@@ -1611,6 +1615,7 @@
         <hbase.version>${hbase-2.4.0.runtime.version}</hbase.version>
         <hbase.thirdparty.version>3.4.1</hbase.thirdparty.version>
         <zookeeper.version>3.5.7</zookeeper.version>
+        <tephra.hbase.compat.version>2.4</tephra.hbase.compat.version>
       </properties>
     </profile>
     <profile>
@@ -1628,6 +1633,7 @@
         <hbase.version>${hbase-2.4.runtime.version}</hbase.version>
         <hbase.thirdparty.version>3.4.1</hbase.thirdparty.version>
         <zookeeper.version>3.5.7</zookeeper.version>
+        <tephra.hbase.compat.version>2.4</tephra.hbase.compat.version>
       </properties>
     </profile>
     <profile>