diff --git a/direct/io-bigtable/pom.xml b/direct/io-bigtable/pom.xml
index 0239c339b..4198dfd04 100644
--- a/direct/io-bigtable/pom.xml
+++ b/direct/io-bigtable/pom.xml
@@ -33,8 +33,8 @@
 
   <properties>
     <shadePattern>cz.o2.proxima.bigtable.shaded</shadePattern>
-    <bigtable.version>1.12.0</bigtable.version>
-    <grpc.version>1.21.0</grpc.version>
+    <bigtable.version>1.19.0</bigtable.version>
+    <grpc.version>1.33.1</grpc.version>
   </properties>
 
   <profiles>
@@ -219,7 +219,7 @@
 
     <dependency>
       <groupId>com.google.cloud.bigtable</groupId>
-      <artifactId>bigtable-hbase-1.x</artifactId>
+      <artifactId>bigtable-hbase-2.x</artifactId>
       <version>${bigtable.version}</version>
       <exclusions>
         <exclusion>
diff --git a/direct/io-hbase-bindings/pom.xml b/direct/io-hbase-bindings/pom.xml
index a5b5e43e3..1b23ef025 100644
--- a/direct/io-hbase-bindings/pom.xml
+++ b/direct/io-hbase-bindings/pom.xml
@@ -179,6 +179,12 @@
       <version>${guava.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-auth</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-common</artifactId>
@@ -206,6 +212,34 @@
       </exclusions>
     </dependency>
 
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-minicluster</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-mapreduce-client-core</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-mapreduce-client-jobclient</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-client</artifactId>
+      <version>${hadoop.version}</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>org.apache.hadoop</groupId>
       <artifactId>hadoop-hdfs</artifactId>
diff --git a/direct/io-hbase-bindings/src/main/java/cz/o2/proxima/direct/hbase/HBaseWriter.java b/direct/io-hbase-bindings/src/main/java/cz/o2/proxima/direct/hbase/HBaseWriter.java
index b64a22ba3..d5b42fc52 100644
--- a/direct/io-hbase-bindings/src/main/java/cz/o2/proxima/direct/hbase/HBaseWriter.java
+++ b/direct/io-hbase-bindings/src/main/java/cz/o2/proxima/direct/hbase/HBaseWriter.java
@@ -32,7 +32,6 @@
 import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.client.Delete;
 import org.apache.hadoop.hbase.client.Get;
-import org.apache.hadoop.hbase.client.HTable;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
@@ -45,24 +44,17 @@
 class HBaseWriter extends HBaseClientWrapper implements OnlineAttributeWriter {
 
   private static final String DEL_BATCH_SIZE_CONF = "del-batch-size";
-  private static final String FLUSH_COMMITS_CFG = "flush-commits";
 
   private final int batchSize;
   private final Map<String, Object> cfg;
   private final InternalSerializer serializer;
 
-  private boolean flushCommits;
-
   HBaseWriter(URI uri, Configuration conf, Map<String, Object> cfg) {
     super(uri, conf);
     batchSize =
         Optional.ofNullable(cfg.get(DEL_BATCH_SIZE_CONF))
             .map(o -> Integer.valueOf(o.toString()))
             .orElse(1000);
-    flushCommits =
-        Optional.ofNullable(cfg.get(FLUSH_COMMITS_CFG))
-            .map(o -> Boolean.valueOf(o.toString()))
-            .orElse(true);
     serializer = HBaseDataAccessor.instantiateSerializer(uri);
     this.cfg = cfg;
   }
@@ -89,9 +81,6 @@ public void write(StreamElement data, CommitCallback statusCallback) {
         Put put = serializer.toPut(family, key, data);
         this.client.put(put);
       }
-      if (flushCommits) {
-        ((HTable) this.client).flushCommits();
-      }
       statusCallback.commit(true, null);
     } catch (Exception ex) {
       log.error("Failed to write {}", data, ex);
@@ -148,12 +137,4 @@ private void deletePrefix(byte[] key, byte[] family, String prefix, long stamp)
           stamp);
     }
   }
-
-  @Override
-  void ensureClient() {
-    super.ensureClient();
-    if (!(client instanceof HTable)) {
-      flushCommits = false;
-    }
-  }
 }
diff --git a/direct/pom.xml b/direct/pom.xml
index 3556c066b..662e3a99f 100644
--- a/direct/pom.xml
+++ b/direct/pom.xml
@@ -66,63 +66,5 @@
 
   </dependencyManagement>
 
-  <profiles>
-    <profile>
-      <id>jdk8</id>
-      <activation>
-        <jdk>1.8</jdk>
-      </activation>
-      <modules>
-        <module>compiler</module>
-        <module>core</module>
-        <module>core-testing</module>
-        <module>ingest-client</module>
-        <module>ingest-server</module>
-        <module>io-bigtable</module>
-        <module>io-blob</module>
-        <module>io-bulkfs</module>
-        <module>io-bulkfs-parquet</module>
-        <module>io-cassandra</module>
-        <module>io-gcloud-storage</module>
-        <module>io-hadoop</module>
-        <module>io-hbase</module>
-        <module>io-hbase-bindings</module>
-        <module>io-hdfs</module>
-        <module>io-http</module>
-        <module>io-kafka</module>
-        <module>io-pubsub</module>
-        <module>io-s3</module>
-        <module>rpc</module>
-        <module>transaction-manager</module>
-      </modules>
-    </profile>
-
-    <profile>
-      <id>jdk11</id>
-      <activation>
-        <jdk>11</jdk>
-      </activation>
-      <modules>
-        <module>compiler</module>
-        <module>core</module>
-        <module>core-testing</module>
-        <module>ingest-client</module>
-        <module>ingest-server</module>
-        <module>io-bigtable</module>
-        <module>io-blob</module>
-        <module>io-bulkfs</module>
-        <module>io-bulkfs-parquet</module>
-        <module>io-cassandra</module>
-        <module>io-gcloud-storage</module>
-        <module>io-http</module>
-        <module>io-kafka</module>
-        <module>io-pubsub</module>
-        <module>io-s3</module>
-        <module>rpc</module>
-        <module>transaction-manager</module>
-      </modules>
-    </profile>
-  </profiles>
-
 </project>
 
diff --git a/pom.xml b/pom.xml
index 0fc02bae1..217a266c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,8 +84,8 @@
     <maven.protobuf.version>0.6.1</maven.protobuf.version>
     <maven.compiler.plugin>3.8.1</maven.compiler.plugin>
     <groovy.version>3.0.8</groovy.version>
-    <hadoop.version>2.10.0</hadoop.version>
-    <hbase.version>1.6.0</hbase.version>
+    <hadoop.version>3.3.0</hadoop.version>
+    <hbase.version>2.3.0</hbase.version>
     <junit.jupiter.version>5.7.2</junit.jupiter.version>
     <kafka.version>2.6.2</kafka.version>
     <proto.version>3.15.8</proto.version>