diff --git a/.drone.yml b/.drone.yml
index 05dc330..6c690ca 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -1,7 +1,7 @@
 pipeline:
   docker:
     image: plugins/docker
-    repo: registry.gitlab.com/thallian/docker-minecraft
+    repo: thallian/minecraft
     registry: registry.gitlab.com
     autotag: true
     secrets: [ docker_username, docker_password ]
diff --git a/Dockerfile b/Dockerfile
index 6fd71e9..091f7cc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,7 +5,7 @@ RUN apk --no-cache add libressl git openjdk8
 RUN wget "https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar" && \
     java -jar BuildTools.jar
 
-FROM registry.gitlab.com/thallian/docker-confd-env:master
+FROM thallian/confd-env:latest
 
 COPY --from=builder /spigot*.jar /var/lib/minecraft/spigot.jar
 COPY --from=builder /craftbukkit*.jar /var/lib/minecraft/craftbukkit.jar