diff --git a/cassandra/image/Dockerfile b/cassandra/image/Dockerfile
index 45b759512..a1145287e 100644
--- a/cassandra/image/Dockerfile
+++ b/cassandra/image/Dockerfile
@@ -18,6 +18,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 ARG CASSANDRA_VERSION
 ARG DEV_CONTAINER
+RUN apt-get update && apt-get install wget -y
 
 LABEL \
     org.label-schema.build-date=$BUILD_DATE \
@@ -39,19 +40,13 @@ ENV CASSANDRA_HOME=/usr/local/apache-cassandra-${CASSANDRA_VERSION} \
     DI_SHA=81231da1cd074fdc81af62789fead8641ef3f24b6b07366a1c34e5b059faf363
 
 ADD files /
+RUN wget -q -O - http://www-us.apache.org/dist/cassandra/${CASSANDRA_VERSION}/apache-cassandra-${CASSANDRA_VERSION}-bin.tar.gz | tar -xzf - -C /usr/local
 
 RUN set -e && echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections \
-  && apt-get update && apt-get -qq -y --force-yes install --no-install-recommends \
+   && apt-get update && apt-get -qq -y --force-yes install --no-install-recommends \
     openjdk-8-jre-headless \
     libjemalloc1 \
-    localepurge \
-    wget && \
-  mirror_url=$( wget -q -O - http://www.apache.org/dyn/closer.cgi/cassandra/ \
-        | sed -n 's#.*href="\(http://.*/cassandra\/[^"]*\)".*#\1#p' \
-        | head -n 1 \
-    ) \
-    && wget -q -O - ${mirror_url}/${CASSANDRA_VERSION}/apache-cassandra-${CASSANDRA_VERSION}-bin.tar.gz \
-        | tar -xzf - -C /usr/local \
+    localepurge \ 
     && wget -q -O - https://github.com/Yelp/dumb-init/releases/download/v${DI_VERSION}/dumb-init_${DI_VERSION}_amd64 > /sbin/dumb-init \
     && echo "$DI_SHA  /sbin/dumb-init" | sha256sum -c - \
     && chmod +x /sbin/dumb-init \
diff --git a/cassandra/image/Makefile b/cassandra/image/Makefile
index ac8ef75e0..8bb5fdc9c 100644
--- a/cassandra/image/Makefile
+++ b/cassandra/image/Makefile
@@ -14,9 +14,8 @@
 
 # build the cassandra image.
 VERSION=v12
-PROJECT_ID?=google_samples
-PROJECT=gcr.io/${PROJECT_ID}
-CASSANDRA_VERSION=3.10
+PROJECT=erikschlegel
+CASSANDRA_VERSION=3.11.0
 
 all: kubernetes-cassandra.jar build
 
@@ -35,7 +34,7 @@ container-dev:
 build: container container-dev
 
 push: build
-	gcloud docker -- push ${PROJECT}/cassandra:${VERSION}
-	gcloud docker -- push ${PROJECT}/cassandra:${VERSION}-dev
+	docker -- push ${PROJECT}/cassandra:${VERSION}
+	docker -- push ${PROJECT}/cassandra:${VERSION}-dev
 
 .PHONY: all build push
diff --git a/cassandra/image/files/cassandra.yaml b/cassandra/image/files/cassandra.yaml
index 7df40351e..59a4ff457 100644
--- a/cassandra/image/files/cassandra.yaml
+++ b/cassandra/image/files/cassandra.yaml
@@ -98,7 +98,7 @@ batchlog_replay_throttle_in_kb: 1024
 #   users. It keeps usernames and hashed passwords in system_auth.credentials table.
 #   Please increase system_auth keyspace replication factor if you use this authenticator.
 #   If using PasswordAuthenticator, CassandraRoleManager must also be used (see below)
-authenticator: AllowAllAuthenticator
+authenticator: PasswordAuthenticator
 
 # Authorization backend, implementing IAuthorizer; used to limit access/provide permissions
 # Out of the box, Cassandra provides org.apache.cassandra.auth.{AllowAllAuthorizer,
diff --git a/cassandra/image/files/kubernetes-cassandra.jar b/cassandra/image/files/kubernetes-cassandra.jar
index ed2621975..2b736488b 100644
Binary files a/cassandra/image/files/kubernetes-cassandra.jar and b/cassandra/image/files/kubernetes-cassandra.jar differ