diff --git a/.gitignore b/.gitignore
index 53782da..261d0a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,5 @@ target
 .project
 .settings
 .classpath
+*.iml
+.idea
diff --git a/jaegertracing-kubernetes-deployment-itest/src/main/java/io/jaegertracing/kubernetes/deployment/BaseETest.java b/jaegertracing-kubernetes-deployment-itest/src/main/java/io/jaegertracing/kubernetes/deployment/BaseETest.java
index 746e6ec..87682dc 100644
--- a/jaegertracing-kubernetes-deployment-itest/src/main/java/io/jaegertracing/kubernetes/deployment/BaseETest.java
+++ b/jaegertracing-kubernetes-deployment-itest/src/main/java/io/jaegertracing/kubernetes/deployment/BaseETest.java
@@ -13,10 +13,6 @@
  */
 package io.jaegertracing.kubernetes.deployment;
 
-import static org.awaitility.Awaitility.await;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-
 import com.uber.jaeger.Tracer;
 import com.uber.jaeger.metrics.Metrics;
 import com.uber.jaeger.metrics.NullStatsReporter;
@@ -25,9 +21,6 @@
 import com.uber.jaeger.samplers.ConstSampler;
 import com.uber.jaeger.senders.HttpSender;
 import io.opentracing.Span;
-import java.io.IOException;
-import java.net.URL;
-import java.util.concurrent.TimeUnit;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -39,6 +32,14 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import java.io.IOException;
+import java.net.URL;
+import java.util.concurrent.TimeUnit;
+
+import static org.awaitility.Awaitility.await;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 /**
  * @author Pavol Loffay
  */
@@ -128,6 +129,16 @@ public void testDependencyLinks() throws IOException, InterruptedException {
     }
   }
 
+  @Test
+  public void hitDependencyScreen() throws IOException {
+    Request request = new Request.Builder()
+            .url(queryUrl + "api/dependencies?endTs=0")
+            .get()
+            .build();
+    Response response = okHttpClient.newCall(request).execute();
+    assertEquals(200, response.code());
+  }
+
   protected com.uber.jaeger.Tracer createTracer(String serviceName) {
     return new com.uber.jaeger.Tracer.Builder(serviceName,
         new RemoteReporter(new HttpSender(collectorUrl + "api/traces", 65000), 1, 100,
diff --git a/production/jaeger-production-template.yml b/production/jaeger-production-template.yml
index 49ebcfb..4a1c51d 100644
--- a/production/jaeger-production-template.yml
+++ b/production/jaeger-production-template.yml
@@ -15,6 +15,29 @@
 apiVersion: v1
 kind: List
 items:
+- apiVersion: v1
+  kind: Service
+  metadata:
+    name: cassandra
+    labels:
+      app: jaeger
+      name: jaeger-cassandra-service
+      jaeger-infra: cassandra-service
+  spec:
+    ports:
+    - port: 7000
+      name: intra-node
+    - port: 7001
+      name: tls-intra-node
+    - port: 7199
+      name: jmx
+    - port: 9042
+      name: cql
+    - port: 9160
+      name: thrift
+    clusterIP: None
+    selector:
+      app: cassandra
 - apiVersion: "apps/v1beta1"
   kind: StatefulSet
   metadata:
@@ -33,7 +56,10 @@ items:
       spec:
         containers:
         - name: cassandra
-          image: jpkroehling/cassandra
+          image: cassandra:3.11
+          command:
+          - /docker-entrypoint.sh
+          - "-R"
           ports:
           - containerPort: 7000
             name: intra-node
@@ -43,6 +69,8 @@ items:
             name: jmx
           - containerPort: 9042
             name: cql
+          - containerPort: 9160
+            name: thrift
           lifecycle:
             preStop:
               exec:
@@ -52,58 +80,30 @@ items:
               value: 512M
             - name: HEAP_NEWSIZE
               value: 100M
-            - name: CASSANDRA_HOME
-              value: "/opt/apache-cassandra-3.0.12"
+            - name: CASSANDRA_LISTEN_ADDRESS
+              valueFrom:
+                fieldRef:
+                  fieldPath: status.podIP
+            - name: CASSANDRA_CLUSTER_NAME
+              value: "jaeger"
             - name: CASSANDRA_DC
               value: "dc1"
             - name: CASSANDRA_RACK
               value: "rack1"
-            - name: CASSANDRA_CLUSTER_NAME
-              value: "jaeger"
-            - name: CASSANDRA_SEED_POD
+            - name: CASSANDRA_ENDPOINT_SNITCH
+              value: "GossipingPropertyFileSnitch"
+            - name: CASSANDRA_SEEDS
               value: cassandra-0.cassandra
-            - name: POD_IP
-              valueFrom:
-                fieldRef:
-                  fieldPath: status.podIP
-            - name: POD_NAMESPACE
-              valueFrom:
-                fieldRef:
-                  fieldPath: metadata.namespace
-          readinessProbe:
-            exec:
-              command:
-              - /bin/bash
-              - -c
-              - /opt/apache-cassandra-3.0.12/bin/ready-probe.sh
-            initialDelaySeconds: 15
-            timeoutSeconds: 5
           volumeMounts:
           - name: cassandra-data
-            mountPath: /opt/apache-cassandra-3.0.12/data
+            mountPath: /var/lib/cassandra
+          - name: cassandra-logs
+            mountPath: /var/log/cassandra
         volumes:
         - name: cassandra-data
           emptyDir: {}
-- apiVersion: v1
-  kind: Service
-  metadata:
-    name: cassandra
-    labels:
-      app: jaeger
-      jaeger-infra: cassandra-service
-  spec:
-    ports:
-    - port: 7000
-      name: intra-node
-    - port: 7001
-      name: tls-intra-node
-    - port: 7199
-      name: jmx
-    - port: 9042
-      name: cql
-    clusterIP: None
-    selector:
-      app: cassandra
+        - name: cassandra-logs
+          emptyDir: {}
 - apiVersion: batch/v1
   kind: Job
   metadata:
@@ -119,7 +119,7 @@ items:
       spec:
         containers:
         - name: jaeger-cassandra-schema
-          image: jaegertracing/jaeger-cassandra-schema
+          image: jaegertracing/jaeger-cassandra-schema:0.5
           env:
             - name: MODE
               value: "prod"
@@ -144,7 +144,7 @@ items:
           jaeger-infra: collector-pod
       spec:
         containers:
-        - image: jaegertracing/jaeger-collector
+        - image: jaegertracing/jaeger-collector:0.5
           name: jaeger-collector
           ports:
           - containerPort: 14267
@@ -195,7 +195,7 @@ items:
           jaeger-infra: query-pod
       spec:
         containers:
-        - image: jaegertracing/jaeger-query
+        - image: jaegertracing/jaeger-query:0.5
           name: jaeger-query
           ports:
           - containerPort: 16686
@@ -242,7 +242,7 @@ items:
       spec:
         containers:
         - name: agent-instance
-          image: jaegertracing/jaeger-agent
+          image: jaegertracing/jaeger-agent:0.5
           command:
           - "/go/bin/agent-linux"
           - "-collector.host-port=jaeger-collector:14267"