diff --git a/.drone.yml b/.drone.yml
index 619033c..8d2cb74 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -11,13 +11,13 @@ steps:
   commands:
     - buildah login "$${IMAGE_REGISTRY}" --username "$${GITEA_USER}" --password "$${GITEA_TOKEN}"
     - buildah pull "docker.io/eqalpha/keydb:x86_64_$${IMAGE_TAG}"
-    - buildah tag "docker.io/eqalpha/keydb:x86_64_$${IMAGE_TAG}" "$${IMAGE_REGISTRY}/prskr/infrastructure/keydb:x86_64_$${IMAGE_TAG}"
+    - buildah tag "docker.io/eqalpha/keydb:x86_64_$${IMAGE_TAG}" "$${IMAGE_REGISTRY}/$${IMAGE_REPO}:x86_64_$${IMAGE_TAG}"
     - buildah pull "docker.io/eqalpha/keydb:arm64_$${IMAGE_TAG}"
-    - buildah tag "docker.io/eqalpha/keydb:arm64_$${IMAGE_TAG}" "$${IMAGE_REGISTRY}/prskr/infrastructure/keydb:arm64_$${IMAGE_TAG}"
-    - buildah manifest create "$${IMAGE_REPO}/prskr/infrastructure/keydb:$${IMAGE_TAG}"
-    - buildah manifest add "$${IMAGE_REPO}/prskr/infrastructure/keydb:$${IMAGE_TAG}" "$${IMAGE_REGISTRY}/prskr/infrastructure/keydb:x86_64_$${IMAGE_TAG}"
-    - buildah manifest add "$${IMAGE_REPO}/prskr/infrastructure/keydb:$${IMAGE_TAG}" "$${IMAGE_REGISTRY}/prskr/infrastructure/keydb:arm64_$${IMAGE_TAG}"
-    - buildah manifest push --all "$${IMAGE_REPO}/prskr/infrastructure/keydb:$${IMAGE_TAG}" "docker://$${IMAGE_REPO}/prskr/infrastructure/keydb:$${IMAGE_TAG}"
+    - buildah tag "docker.io/eqalpha/keydb:arm64_$${IMAGE_TAG}" "$${IMAGE_REGISTRY}/$${IMAGE_REPO}:arm64_$${IMAGE_TAG}"
+    - buildah manifest create "$${IMAGE_REGISTRY}/$${IMAGE_REPO}:$${IMAGE_TAG}"
+    - buildah manifest add "$${IMAGE_REGISTRY}/$${IMAGE_REPO}:$${IMAGE_TAG}" "$${IMAGE_REGISTRY}/$${IMAGE_REPO}:x86_64_$${IMAGE_TAG}"
+    - buildah manifest add "$${IMAGE_REGISTRY}/$${IMAGE_REPO}:$${IMAGE_TAG}" "$${IMAGE_REGISTRY}/$${IMAGE_REPO}:arm64_$${IMAGE_TAG}"
+    - buildah manifest push --all "$${IMAGE_REGISTRY}/$${IMAGE_REPO}:$${IMAGE_TAG}" "docker://$${IMAGE_REGISTRY}/$${IMAGE_REPO}:$${IMAGE_TAG}"
   environment:
     GITEA_USER: prskr
     GITEA_TOKEN: