diff --git a/.drone.yml b/.drone.yml
index 2c36f6e..bef44f7 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -6,9 +6,9 @@ steps:
   image: plugins/docker
   settings:
     registry: registry.wtf-eg.net
-    repo: registry.wtf-eg.net/ki
-    target: backend-base
-    autotag: true
+    repo: registry.wtf-eg.net/ki-backend-base
+    target: base
+    auto_tag: true
     username:
       from_secret: "docker_username"
     password:
@@ -18,9 +18,9 @@ steps:
   image: plugins/docker
   settings:
     registry: registry.wtf-eg.net
-    repo: registry.wtf-eg.net
-    target: backend-builder
-    autotag: true
+    repo: registry.wtf-eg.net/ki-backend-builder
+    target: builder
+    auto_tag: true
     username:
       from_secret: "docker_username"
     password:
diff --git a/Dockerfile b/Dockerfile
index 2ed4042..3a5abc8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM python:3.8-alpine as backend-base
+FROM python:3.8-alpine as base
 
 ENV PYROOT /pyroot
 ENV PYTHONUSERBASE $PYROOT
 
 
-FROM backend-base as backend-builder
+FROM base as builder
 
 RUN apk add --no-cache \
     gcc \