diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index 711b4f0..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/.gitignore b/.gitignore
index 9bea433..e43b0f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-
 .DS_Store
diff --git a/Dockerfile b/Dockerfile
index c75c702..bea608a 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ FROM openjdk:8 AS build
 
 MAINTAINER Marc Tönsing <marc@marc.tv>
 
-ARG paperspigot_ci_url=https://papermc.io/api/v1/paper/1.14.1/20/download
+ARG paperspigot_ci_url=https://papermc.io/ci/job/Paper-1.13/563/artifact/paperclip-563.jar
 ENV PAPERSPIGOT_CI_URL=$paperspigot_ci_url
 
 ##########################
diff --git a/build_docker.sh b/build_docker.sh
index 7340276..e9aa0dc 100755
--- a/build_docker.sh
+++ b/build_docker.sh
@@ -1 +1 @@
-docker build -t marctv/minecraftpaperserver .
+docker build -t marctv/minecraft-papermc-server .
diff --git a/report.sh b/report.sh
deleted file mode 100755
index d837d34..0000000
--- a/report.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-docker exec -i -t mcserver rcon-cli --port 25575 --password mcserver timings report
diff --git a/restart_docker.sh b/restart_docker.sh
deleted file mode 100755
index b3ce5a3..0000000
--- a/restart_docker.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-# Marc Tönsing - V1.2 - 18.05.2018
-# Minecraft Server restart
-mkdir ran
-echo "Starting countdown via rcon-cli."
-docker exec -i mcserver rcon-cli --port 25575 --password mcserver say Server is restarting in 30 seconds!
-sleep 23s
-docker exec -i mcserver rcon-cli --port 25575 --password mcserver say Server is restarting in 7 seconds!
-sleep 1s
-docker exec -i mcserver rcon-cli --port 25575 --password mcserver say Server is restarting in 6 seconds!
-sleep 1s
-docker exec -i mcserver rcon-cli --port 25575 --password mcserver say Server is restarting in 5 seconds!
-sleep 1s
-docker exec -i mcserver rcon-cli --port 25575 --password mcserver say Server is restarting in 4 seconds!
-sleep 1s
-docker exec -i mcserver rcon-cli --port 25575 --password mcserver say Server is restarting in 3 seconds!
-sleep 1s
-docker exec -i mcserver rcon-cli --port 25575 --password mcserver say Server is restarting in 2 seconds!
-sleep 1s
-docker exec -i mcserver rcon-cli --port 25575 --password mcserver say Server is restarting in 1 second!
-sleep 1s
-echo "Stopping server."
-docker exec -i mcserver rcon-cli --port 25575 --password mcserver say Closing server...
-docker exec -i mcserver rcon-cli --port 25575 --password mcserver stop
-sleep 15s
-echo "Restarting now."
-/var/services/homes/mtoensing/Minecraft-Paper-Server/run_docker.sh
diff --git a/run_docker.sh b/run_docker.sh
deleted file mode 100755
index 9dd4393..0000000
--- a/run_docker.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-docker run \
-  --rm \
-  --name mcserver \
-  -v /var/services/homes/mtoensing/server:/data:rw \
-  -p 25565:25565 \
--i minecraftpaperserver:latest
diff --git a/run_docker_bash.sh b/run_docker_bash.sh
deleted file mode 100755
index 39a28ff..0000000
--- a/run_docker_bash.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-docker run \
-  --rm \
-  --name mcserver \
-  --entrypoint=/bin/bash \
-  -v ~/server:/data:rw \
-  -p 25565:25565 \
-  -itd marctv/minecraftpaperserver:latest
diff --git a/stop_docker.sh b/stop_docker.sh
deleted file mode 100755
index be5cd0b..0000000
--- a/stop_docker.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-docker exec -i -t mcserver rcon-cli --port 25575 --password mcserver say server will shut down
-docker exec -i -t mcserver rcon-cli --port 25575 --password mcserver stop