diff --git a/examples/cassandra/cassandra-controller.yaml b/examples/cassandra/cassandra-controller.yaml
index acd3bddeab2..345e7d79a63 100644
--- a/examples/cassandra/cassandra-controller.yaml
+++ b/examples/cassandra/cassandra-controller.yaml
@@ -12,7 +12,7 @@ desiredState:
         id: cassandra
         containers:
           - name: cassandra
-            image: kubernetes/cassandra
+            image: kubernetes/cassandra:v1
             command:
               - /run.sh
             cpu: 1000
@@ -21,10 +21,17 @@ desiredState:
                 containerPort: 9042
               - name: thrift
                 containerPort: 9160
+            volumeMounts:
+              - name: data
+                mountPath: /cassandra_data
             env:
               - key: MAX_HEAP_SIZE
                 value: 512M
               - key: HEAP_NEWSIZE
                 value: 100M
+        volumes:
+          - name: data
+            source:
+              emptyDir: {}
     labels:
       name: cassandra
diff --git a/examples/cassandra/cassandra.yaml b/examples/cassandra/cassandra.yaml
index c6a7b5e6ad0..c0afa4e2e4e 100644
--- a/examples/cassandra/cassandra.yaml
+++ b/examples/cassandra/cassandra.yaml
@@ -7,7 +7,7 @@ desiredState:
     id: cassandra
     containers:
       - name: cassandra
-        image: kubernetes/cassandra
+        image: kubernetes/cassandra:v1
         command:
           - /run.sh
         cpu: 1000
@@ -29,7 +29,7 @@ desiredState:
     volumes:
       - name: data
         source:
-          emptyDir: ""
+          emptyDir: {}
 labels:
   name: cassandra
 
diff --git a/examples/cassandra/image/Dockerfile b/examples/cassandra/image/Dockerfile
index 7b3d5488787..5e8c92c213e 100644
--- a/examples/cassandra/image/Dockerfile
+++ b/examples/cassandra/image/Dockerfile
@@ -17,5 +17,6 @@ RUN apt-get -qq -y install cassandra
 COPY cassandra.yaml /etc/cassandra/cassandra.yaml
 COPY run.sh /run.sh
 COPY kubernetes-cassandra.jar /kubernetes-cassandra.jar
+RUN chmod a+x /run.sh
 
 CMD /run.sh
diff --git a/examples/cassandra/image/cassandra.yaml b/examples/cassandra/image/cassandra.yaml
index 662400a3df5..b1543f2405b 100644
--- a/examples/cassandra/image/cassandra.yaml
+++ b/examples/cassandra/image/cassandra.yaml
@@ -96,12 +96,12 @@ partitioner: org.apache.cassandra.dht.Murmur3Partitioner
 # the configured compaction strategy.
 # If not set, the default directory is $CASSANDRA_HOME/data/data.
 data_file_directories:
-    - /var/lib/cassandra/data
+    - /cassandra_data/data
 
 # commit log.  when running on magnetic HDD, this should be a
 # separate spindle than the data directories.
 # If not set, the default directory is $CASSANDRA_HOME/data/commitlog.
-commitlog_directory: /var/lib/cassandra/commitlog
+commitlog_directory: /cassandra_data/commitlog
 
 # policy for data disk failures:
 # die: shut down gossip and Thrift and kill the JVM for any fs errors or