diff --git a/msa/tb/docker-cassandra/Dockerfile b/msa/tb/docker-cassandra/Dockerfile
index a915e16ba2..20a0d8cf7a 100644
--- a/msa/tb/docker-cassandra/Dockerfile
+++ b/msa/tb/docker-cassandra/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM ${docker.base.image}
+FROM thingsboard/openjdk17:bookworm-slim
 
 ENV PG_MAJOR=16
 
diff --git a/msa/tb/docker-postgres/Dockerfile b/msa/tb/docker-postgres/Dockerfile
index f9898e955e..7c66d626c7 100644
--- a/msa/tb/docker-postgres/Dockerfile
+++ b/msa/tb/docker-postgres/Dockerfile
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
-FROM ${docker.base.image}
+FROM thingsboard/openjdk17:bookworm-slim
 
 ENV PG_MAJOR 12