diff --git a/.drone.yml b/.drone.yml
index 2743e5f..2c36f6e 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,24 +5,26 @@ steps:
 - name: docker-base
   image: plugins/docker
   settings:
-    repo: registry.wtf-eg.net
-    target: ki-backend-base
+    registry: registry.wtf-eg.net
+    repo: registry.wtf-eg.net/ki
+    target: backend-base
     autotag: true
     username:
-      from_secret: docker_username
+      from_secret: "docker_username"
     password:
-      from_secret: docker_password
+      from_secret: "docker_password"
 
 - name: docker-builder
   image: plugins/docker
   settings:
+    registry: registry.wtf-eg.net
     repo: registry.wtf-eg.net
-    target: ki-backend-builder
+    target: backend-builder
     autotag: true
     username:
-      from_secret: docker_username
+      from_secret: "docker_username"
     password:
-      from_secret: docker_password
+      from_secret: "docker_password"
 
 trigger:
   event:
diff --git a/Dockerfile b/Dockerfile
index 37e86bf..2ed4042 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,10 @@
-FROM python:3.8-alpine as ki-backend-base
+FROM python:3.8-alpine as backend-base
 
 ENV PYROOT /pyroot
 ENV PYTHONUSERBASE $PYROOT
 
 
-FROM base as ki-backend-builder
+FROM backend-base as backend-builder
 
 RUN apk add --no-cache \
     gcc \