diff --git a/Makefile b/Makefile
index 30a12c461..ca9608b36 100644
--- a/Makefile
+++ b/Makefile
@@ -5,15 +5,18 @@ VERSION := `mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpr
 # VERSION := `python -c "import xml.etree.ElementTree as ET; print(ET.parse(open('pom.xml')).getroot().find('{http://maven.apache.org/POM/4.0.0}version').text)"`
 
 package:
-	mvn package
+	mvn package -DskipTests
 
 prepare:
 	echo "$(VERSION)..."
+	rm -Rf build/*
 	mkdir -p build/usr/share/cassandra-reaper
 	mkdir -p build/usr/local/bin
 	mkdir -p build/etc/init.d
-	mkdir -p build/etc/spotify
-	cp resource/cassandra-reaper.yaml build/etc/spotify/
+	mkdir -p build/etc/cassandra-reaper
+	mkdir -p build/etc/cassandra-reaper/configs
+	cp resource/cassandra-reaper.yaml build/etc/cassandra-reaper/
+	cp resource/cassandra-reaper*.yaml build/etc/cassandra-reaper/configs
 	cp target/cassandra-reaper-$(VERSION).jar build/usr/share/cassandra-reaper/
 	cp bin/* build/usr/local/bin/
 	cp debian/reaper.init build/etc/init.d/cassandra-reaper
diff --git a/README.md b/README.md
index eaa442bc8..cb4f38ff1 100644
--- a/README.md
+++ b/README.md
@@ -88,6 +88,19 @@ The final packages will be located within:
 
 ```./packages/```
 
+#### Install RPM or DEB package and run as a service
+
+Install the RPM (Fedora based distros like RHEL or Centos) using : `sudo rpm -ivh reaper-*.*.*.x86_64.rpm`  
+Install the DEB (Debian based distros like Ubuntu) using : `sudo dpkg -i reaper_*.*.*_amd64.deb`
+
+The yaml file used by the service is located at `/etc/cassandra-reaper/cassandra-reaper.yaml` and alternate config templates can be found under `/etc/cassandra-reaper/configs`.
+It is recommended to create a new file with your specific configuration and symlink it as `/etc/cassandra-reaper/cassandra-reaper.yaml` to avoid your configuration from being overwritten during upgrades.  
+Adapt the config file to suit your setup and then run `sudo service cassandra-reaper start`.  
+  
+Log files can be found at `/var/log/cassandra-reaper.log` and `/var/log/cassandra-reaper.err`.  
+
+Stop the service by running : `sudo service cassandra-reaper stop`  
+
 
 Configuration
 -------------
diff --git a/bin/cassandra-reaper b/bin/cassandra-reaper
index d4ef73426..66561b974 100755
--- a/bin/cassandra-reaper
+++ b/bin/cassandra-reaper
@@ -26,7 +26,7 @@ if [ -z "$CLASS_PATH" ]; then
 fi
 
 if [ $# -eq 0 ]; then
-    CONFIG_PATH="/etc/spotify/cassandra-reaper.yaml"
+    CONFIG_PATH="/etc/cassandra-reaper/cassandra-reaper.yaml"
 else
     CONFIG_PATH="$@"
 fi