diff --git a/.drone.yml b/.drone.yml
index 250cd5b..97f5568 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,32 +3,47 @@ type: docker
 name: ubuntu
 
 steps:
-- name: create_tags
-  image: ubuntu:latest
-  commands:
-    - echo "$(date "+%Y-%m-%d"), latest" > .tags
+  - name: create_tags
+    image: ubuntu:22.04
+    commands:
+      - echo "$(date "+%Y-%m-%d"), latest" > .tags
 
-- name: ubuntu_22
-  image: thegeeklab/drone-docker-buildx:23
-  environment:
-    UBUNTU_VER: 22.04
-  settings:
-    registry: gitea.ahkhan.me
-    username:
-      from_secret: gitea-username
-    password:
-      from_secret: gitea-password
-    repo: ${DRONE_REPO_LINK:8}/ubuntu-$UBUNTU_VER
-    build_args_from_env:
-      - UBUNTU_VER
-    extra_tags:
-      - ${DRONE_REPO_LINK:8}:${UBUNTU_VER}
-      - ${DRONE_REPO_LINK:8}:latest
-    platforms:
-      - linux/amd64
-      - linux/arm64
-      - linux/arm/v7
-    cache_from:
-      - type=local\\,src=/cache/${DRONE_REPO}
-    cache_to:
-      - type=local,dest=/cache/${DRONE_REPO},mode=max
+  - name: ubuntu_22
+    image: thegeeklab/drone-docker-buildx:23
+    environment:
+      UBUNTU_VER: 22.04
+    settings: &settings
+      registry: gitea.ahkhan.me
+      username:
+        from_secret: gitea-username
+      password:
+        from_secret: gitea-password
+      repo: ${DRONE_REPO_LINK:8}/ubuntu-22.04
+      build_args_from_env:
+        - UBUNTU_VER
+      platforms:
+        - linux/amd64
+        - linux/arm64
+        - linux/arm/v7
+      cache_from:
+        - type=local\\,src=/cache/${DRONE_REPO}
+      cache_to:
+        - type=local,dest=/cache/${DRONE_REPO},mode=max
+    depends_on:
+      - create_tags
+
+  - name: ubuntu_20
+    image: thegeeklab/drone-docker-buildx:23
+    environment:
+      UBUNTU_VER: 20.04
+    settings:
+      <<: *settings
+      repo: ${DRONE_REPO_LINK:8}/ubuntu-20.04
+
+  - name: ubuntu_18
+    image: thegeeklab/drone-docker-buildx:23
+    environment:
+      UBUNTU_VER: 18.04
+    settings:
+      <<: *settings
+      repo: ${DRONE_REPO_LINK:8}/ubuntu-18.04