diff --git a/.github/workflows/docker-build-test.yml b/.github/workflows/docker-build-test.yml
index cfd767b..5c8fd1a 100644
--- a/.github/workflows/docker-build-test.yml
+++ b/.github/workflows/docker-build-test.yml
@@ -15,6 +15,7 @@ jobs:
           - docker-compose.yml
           - testing/docker-compose.hsqldb.yml
           - testing/docker-compose.cockroachdb.yml
+          - testing/docker-compose.yugabytedb.yml
     steps:
       - uses: actions/checkout@v2.4.0
         with:
diff --git a/testing/config.yugabytedb.properties b/testing/config.yugabytedb.properties
new file mode 100644
index 0000000..39979a0
--- /dev/null
+++ b/testing/config.yugabytedb.properties
@@ -0,0 +1,18 @@
+# The port to Listen on.
+PORT: 8080
+
+# Proxy
+PROXY_PART: https://pipedproxy-ams.kavin.rocks
+
+# Public API URL
+API_URL: https://pipedapi.kavin.rocks
+
+# Public Frontend URL
+FRONTEND_URL: https://piped.kavin.rocks
+
+# Hibernate properties
+hibernate.connection.url: jdbc:postgresql://yb-tserver:5433/yugabyte
+hibernate.connection.driver_class: org.postgresql.Driver
+hibernate.dialect: org.hibernate.dialect.PostgreSQLDialect
+hibernate.connection.username: yugabyte
+hibernate.connection.password: yugabyte
diff --git a/testing/docker-compose.cockroachdb.yml b/testing/docker-compose.cockroachdb.yml
index 9f5b6f4..c78153d 100644
--- a/testing/docker-compose.cockroachdb.yml
+++ b/testing/docker-compose.cockroachdb.yml
@@ -6,6 +6,8 @@ services:
             - "127.0.0.1:8080:8080"
         volumes:
             - ./config.cockroachdb.properties:/app/config.properties
+        depends_on:
+            - cockroachdb
     cockroachdb:
         image: cockroachdb/cockroach:latest-v21.2
         command: start-single-node --insecure
diff --git a/testing/docker-compose.yugabytedb.yml b/testing/docker-compose.yugabytedb.yml
new file mode 100644
index 0000000..dfa82fa
--- /dev/null
+++ b/testing/docker-compose.yugabytedb.yml
@@ -0,0 +1,39 @@
+services:
+    piped:
+        image: 1337kavin/piped:latest
+        restart: unless-stopped
+        ports:
+            - "127.0.0.1:8080:8080"
+        volumes:
+            - ./config.yugabytedb.properties:/app/config.properties
+        depends_on:
+            - yb-tserver
+    yb-master:
+        image: yugabytedb/yugabyte:latest
+        command:
+            [
+                "/home/yugabyte/bin/yb-master",
+                "--fs_data_dirs=/mnt/master",
+                "--master_addresses=yb-master:7100",
+                "--rpc_bind_addresses=yb-master:7100",
+                "--replication_factor=1"
+            ]
+        environment:
+            SERVICE_7000_NAME: yb-master
+    yb-tserver:
+        image: yugabytedb/yugabyte:latest
+        command:
+            [
+                "/home/yugabyte/bin/yb-tserver",
+                "--fs_data_dirs=/mnt/tserver",
+                "--start_pgsql_proxy",
+                "--rpc_bind_addresses=yb-tserver:9100",
+                "--tserver_master_addrs=yb-master:7100"
+            ]
+        environment:
+            SERVICE_5433_NAME: ysql
+            SERVICE_9042_NAME: ycql
+            SERVICE_6379_NAME: yedis
+            SERVICE_9000_NAME: yb-tserver
+        depends_on:
+            - yb-master