diff --git a/.drone.yml b/.drone.yml
index 5f09978..eb57abb 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -20,10 +20,12 @@ steps:
   image: plugins/docker
   settings:
     dockerfile: docker/Dockerfile.php
-    auto_tag: true
     repo: registry.xrg.io/xrges/php
     registry: https://registry.xrg.io
     cache_from: registry.xrg.io/xrges/php:latest
+    auto_tag: true
+    tags:
+      - latest
     username:
       from_secret: registry_username
     password:
@@ -36,10 +38,12 @@ steps:
   image: plugins/docker
   settings:
     dockerfile: docker/Dockerfile.nginx
-    auto_tag: true
     repo: registry.xrg.io/xrges/nginx
     registry: https://registry.xrg.io
     cache_from: registry.xrg.io/xrges/nginx:latest
+    auto_tag: true
+    tags:
+      - latest
     username:
       from_secret: registry_username
     password:
@@ -52,7 +56,6 @@ steps:
   image: plugins/docker
   settings:
     dockerfile: docker/Dockerfile.redis
-    auto_tag: true
     repo: registry.xrg.io/xrges/redis
     registry: https://registry.xrg.io
     cache_from: registry.xrg.io/xrges/redis:latest
@@ -60,6 +63,9 @@ steps:
       from_secret: registry_username
     password:
       from_secret: registry_password
+    auto_tag: true
+    tags:
+      - latest
   depends_on:
   - frontend
   - backend