diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
index 9945297ea7a..18fd441ab5e 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yaml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -49,6 +49,7 @@ body:
         - ToxiProxy
         - Trino
         - Vault
+        - YugabyteDB
     validations:
       required: true
   - type: input
diff --git a/.github/ISSUE_TEMPLATE/enhancement.yaml b/.github/ISSUE_TEMPLATE/enhancement.yaml
index 6d5edab909f..46dc42118ce 100644
--- a/.github/ISSUE_TEMPLATE/enhancement.yaml
+++ b/.github/ISSUE_TEMPLATE/enhancement.yaml
@@ -49,6 +49,7 @@ body:
         - ToxiProxy
         - Trino
         - Vault
+        - YugabyteDB
     validations:
       required: true
   - type: textarea
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
index 8abeb7d2131..cb5f056214d 100644
--- a/.github/ISSUE_TEMPLATE/feature.yaml
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -49,6 +49,7 @@ body:
         - ToxiProxy
         - Trino
         - Vault
+        - YugabyteDB
         - New Module
   - type: textarea
     id: problem
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 4c270ef762c..8ca38ba86c6 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -227,6 +227,11 @@ updates:
     schedule:
       interval: "monthly"
     open-pull-requests-limit: 10
+  - package-ecosystem: "gradle"
+    directory: "/modules/yugabytedb"
+    schedule:
+      interval: "monthly"
+    open-pull-requests-limit: 10
 
 # Examples
   - package-ecosystem: "gradle"
diff --git a/.github/labeler.yml b/.github/labeler.yml
index 85144b7d7f9..c4b733dc818 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -85,5 +85,7 @@
   - modules/trino/*
 "modules/vault":
   - modules/vault/*
+"modules/yugabytedb":
+  - modules/yugabytedb/*
 "type/docs":
   - docs/**/*.md
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
index 1d3a5f18f8e..e1c886ba79c 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYCQLContainer.java
@@ -2,6 +2,8 @@
 
 import java.net.InetSocketAddress;
 import java.time.Duration;
+import java.util.Collections;
+import java.util.Set;
 
 import com.github.dockerjava.api.command.InspectContainerResponse;
 import org.testcontainers.containers.delegate.YugabyteDBYCQLDelegate;
@@ -10,7 +12,7 @@
 import org.testcontainers.utility.DockerImageName;
 
 /**
- * YugabyteDB YCQL (Cloud Query Language) API container
+ * Testcontainers implementation for YugabyteDB YCQL API.
  *
  * @author srinivasa-vasu
  * @see <a href="https://docs.yugabyte.com/stable/api/ycql/">YCQL API</a>
@@ -55,6 +57,11 @@ public YugabyteDBYCQLContainer(final DockerImageName imageName) {
 		withCommand(ENTRYPOINT);
 	}
 
+	@Override
+	public Set<Integer> getLivenessCheckPortNumbers() {
+		return Collections.singleton(getMappedPort(YCQL_PORT));
+	}
+
 	/**
 	 * Configures the environment variables. Setting up these variables would create the
 	 * custom objects. Setting {@link #withKeyspaceName(String)},
diff --git a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
index 6f3d83f49b0..cdc1c1ed011 100644
--- a/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
+++ b/modules/yugabytedb/src/main/java/org/testcontainers/containers/YugabyteDBYSQLContainer.java
@@ -9,7 +9,7 @@
 import java.util.Collections;
 
 /**
- * YugabyteDB YSQL (Structured Query Language) API container
+ * Testcontainers implementation for YugabyteDB YSQL API.
  *
  * @author srinivasa-vasu
  * @see <a href="https://docs.yugabyte.com/stable/api/ysql/">YSQL API</a>