diff --git a/pom.xml b/pom.xml
index 98b1674d68d8..2f7b57a2f742 100644
--- a/pom.xml
+++ b/pom.xml
@@ -153,6 +153,7 @@
         <module>presto-tpcds</module>
         <module>presto-tpch</module>
         <module>presto-verifier</module>
+        <module>presto-yugabyte</module>
     </modules>
 
     <dependencyManagement>
@@ -195,6 +196,12 @@
                 <version>${project.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>io.prestosql</groupId>
+                <artifactId>presto-cassandra</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
             <dependency>
                 <groupId>io.prestosql</groupId>
                 <artifactId>presto-cli</artifactId>
diff --git a/presto-server/src/main/provisio/presto.xml b/presto-server/src/main/provisio/presto.xml
index 1ef267f816cc..ff9f23f2796b 100644
--- a/presto-server/src/main/provisio/presto.xml
+++ b/presto-server/src/main/provisio/presto.xml
@@ -252,4 +252,11 @@
             <unpack />
         </artifact>
     </artifactSet>
+
+    <artifactSet to="plugin/yugabyte">
+        <artifact id="${project.groupId}:presto-yugabyte:zip:${project.version}">
+            <unpack />
+        </artifact>
+    </artifactSet>
+
 </runtime>
diff --git a/presto-yugabyte/pom.xml b/presto-yugabyte/pom.xml
new file mode 100644
index 000000000000..0d57208d10bb
--- /dev/null
+++ b/presto-yugabyte/pom.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.prestosql</groupId>
+        <artifactId>presto-root</artifactId>
+        <version>347-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>presto-yugabyte</artifactId>
+    <description>Presto - Yugabyte Connector</description>
+    <packaging>presto-plugin</packaging>
+
+    <properties>
+        <air.main.basedir>${project.parent.basedir}</air.main.basedir>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.prestosql</groupId>
+            <artifactId>presto-cassandra</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.prestosql.cassandra</groupId>
+                    <artifactId>cassandra-driver</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>io.prestosql.yugabyte</groupId>
+            <artifactId>yugabyte-driver</artifactId>
+            <version>3.2.0-yb-19-1</version>
+            <scope>runtime</scope>
+        </dependency>
+
+        <!-- Presto SPI -->
+        <dependency>
+            <groupId>io.prestosql</groupId>
+            <artifactId>presto-spi</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>io.airlift</groupId>
+            <artifactId>slice</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.openjdk.jol</groupId>
+            <artifactId>jol-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.basepom.maven</groupId>
+                <artifactId>duplicate-finder-maven-plugin</artifactId>
+                <configuration>
+                    <ignoredDependencies>
+                        <dependency>
+                            <groupId>org.cassandraunit</groupId>
+                            <artifactId>cassandra-unit</artifactId>
+                        </dependency>
+                    </ignoredDependencies>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <configuration>
+                    <rules>
+                        <requireUpperBoundDeps>
+                            <excludes combine.children="append">
+                                <exclude>org.yaml:snakeyaml</exclude>
+                            </excludes>
+                        </requireUpperBoundDeps>
+                    </rules>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/presto-yugabyte/src/main/java/io/prestosql/plugin/yugabyte/YugabyteConnectorFactory.java b/presto-yugabyte/src/main/java/io/prestosql/plugin/yugabyte/YugabyteConnectorFactory.java
new file mode 100644
index 000000000000..90503636b7e3
--- /dev/null
+++ b/presto-yugabyte/src/main/java/io/prestosql/plugin/yugabyte/YugabyteConnectorFactory.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.prestosql.plugin.yugabyte;
+
+import io.prestosql.plugin.cassandra.CassandraConnectorFactory;
+
+public class YugabyteConnectorFactory
+        extends CassandraConnectorFactory
+{
+    @Override
+    public String getName()
+    {
+        return "yugabyte";
+    }
+}
diff --git a/presto-yugabyte/src/main/java/io/prestosql/plugin/yugabyte/YugabytePlugin.java b/presto-yugabyte/src/main/java/io/prestosql/plugin/yugabyte/YugabytePlugin.java
new file mode 100644
index 000000000000..a9a0252b51f6
--- /dev/null
+++ b/presto-yugabyte/src/main/java/io/prestosql/plugin/yugabyte/YugabytePlugin.java
@@ -0,0 +1,31 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.prestosql.plugin.yugabyte;
+
+import com.google.common.collect.ImmutableList;
+import io.prestosql.spi.Plugin;
+import io.prestosql.spi.connector.ConnectorFactory;
+
+/*
+ * This class is the plugin.
+ */
+public class YugabytePlugin
+        implements Plugin
+{
+    @Override
+    public Iterable<ConnectorFactory> getConnectorFactories()
+    {
+        return ImmutableList.of(new YugabyteConnectorFactory());
+    }
+}