diff --git a/Dockerfile b/Dockerfile
index e7789b5..b60bf3d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,10 @@
-FROM cassandra:3.0.5
+FROM cassandra:3.0.6
 
-RUN apt-get update \
-	&& apt-get -y install curl sysstat netcat rsync
+RUN mkdir /prometheus
+ADD "https://bitbucket.org/sagent/downloads/downloads/jmx_prometheus_javaagent-0.6.jar" /prometheus
+RUN chmod 644 /prometheus/jmx_prometheus_javaagent-0.6.jar
+ADD cassandra.yml /prometheus/cassandra.yml
 
-RUN curl -L http://downloads.datastax.com/community/datastax-agent-5.2.4.tar.gz | tar xz
-RUN ln -s /datastax-agent-5.2.4 /datastax-agent
+ENV JVM_OPTS "$JVM_OPTS -javaagent:/prometheus/jmx_prometheus_javaagent-0.6.jar=61621:/prometheus/cassandra.yml "
 
-RUN mv /docker-entrypoint.sh /cassandra-entrypoint.sh
-
-ADD docker-entrypoint.sh /docker-entrypoint.sh
-ADD agent-entrypoint.sh /agent-entrypoint.sh
-ADD log4j.opscenter.properties /datastax-agent/conf/log4j.properties
-
-EXPOSE 61621
+EXPOSE 61621
\ No newline at end of file
diff --git a/agent-entrypoint.sh b/agent-entrypoint.sh
deleted file mode 100755
index c07065c..0000000
--- a/agent-entrypoint.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-
-echo "stomp_interface: $OPS_IP" | tee -a /datastax-agent/conf/address.yaml
-echo "stomp_port: $OPS_PORT" | tee -a /datastax-agent/conf/address.yaml
-
-echo "Waiting for cassandra to come up..."
-while ! echo exit | nc -z -w 3 localhost 9042; do sleep 3; done
-
-/datastax-agent/bin/datastax-agent -f
\ No newline at end of file
diff --git a/cassandra.yml b/cassandra.yml
new file mode 100644
index 0000000..33545d7
--- /dev/null
+++ b/cassandra.yml
@@ -0,0 +1,14 @@
+---
+lowercaseOutputLabelNames: true
+lowercaseOutputName: true
+rules:
+- pattern: org.apache.cassandra.metrics<type=(Connection|Streaming), scope=(\S*), name=(\S*)><>(Count|Value)
+  name: cassandra_$1_$3
+  labels:
+    address: "$2"
+- pattern: org.apache.cassandra.metrics<type=(\S*)(?:, ((?!scope)\S*)=(\S*))?(?:, scope=(\S*))?,
+    name=(\S*)><>(Count|Value)
+  name: cassandra_$1_$5
+  labels:
+    "$1": "$4"
+    "$2": "$3"
\ No newline at end of file
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
deleted file mode 100755
index 273459c..0000000
--- a/docker-entrypoint.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-set -e
-
-/agent-entrypoint.sh &
-
-exec /cassandra-entrypoint.sh "$@"
\ No newline at end of file
diff --git a/log4j.opscenter.properties b/log4j.opscenter.properties
deleted file mode 100644
index f537a56..0000000
--- a/log4j.opscenter.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# Based on the example properties given at http://logging.apache.org/log4j/1.2/manual.html
-# Set root logger level to DEBUG and its only appender to A1.
-log4j.rootLogger=INFO,stdout
-
-log4j.logger.org.apache.http=OFF
-log4j.logger.org.eclipse.jetty=WARN
-log4j.logger.com.datastax.driver=WARN
-log4j.additivity.com.datastax.driver=false
-# Silence "missing LZ4" warning
-log4j.logger.com.datastax.driver.core.FrameCompressor=ERROR
-
-# stdout
-log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.layout=opsagent.AlternatingEnhancedPatternLayout
-log4j.appender.stdout.layout.MainPattern=%5p [%t] %d{ISO8601} %m%n %throwable{200}
-log4j.appender.stdout.layout.AlternatePattern=%5p [%t] %d{ISO8601} %m%n %throwable{3}
-log4j.appender.stdout.layout.ToMatch=com.datastax.driver