diff --git a/plugin/storage/cassandra/Dockerfile b/plugin/storage/cassandra/Dockerfile
index 9a16cc380ce..f4c11cf58b9 100644
--- a/plugin/storage/cassandra/Dockerfile
+++ b/plugin/storage/cassandra/Dockerfile
@@ -1,5 +1,4 @@
-# TODO: replace this by the final Cassandra image
-FROM jpkroehling/cassandra
+FROM cassandra:3.11
 
 COPY schema/* /cassandra-schema/
 
diff --git a/plugin/storage/cassandra/schema/docker.sh b/plugin/storage/cassandra/schema/docker.sh
index 5556f99a0ff..6f670c6b6e1 100755
--- a/plugin/storage/cassandra/schema/docker.sh
+++ b/plugin/storage/cassandra/schema/docker.sh
@@ -3,7 +3,7 @@
 # This script is used in the Docker image jaegertracing/jaeger-cassandra-schema
 # that allows installing Jaeger keyspace and schema without installing cqlsh.
 
-CQLSH=/opt/apache-cassandra-3.0.12/bin/cqlsh
+CQLSH=/usr/bin/cqlsh
 CQLSH_HOST=${CQLSH_HOST:-"cassandra"}
 CASSANDRA_WAIT_TIMEOUT=${CASSANDRA_WAIT_TIMEOUT:-"60"}
 DATACENTER=${DATACENTER:-"dc1"}