diff --git a/.drone.star b/.drone.star
index f37a27b28a..3ef94df070 100644
--- a/.drone.star
+++ b/.drone.star
@@ -113,86 +113,6 @@ def release():
                     "note": "changelog/NOTE.md",
                 },
             },
-            {
-                "name": "docker-reva-tag",
-                "pull": "always",
-                "image": "plugins/docker",
-                "settings": {
-                    "repo": "cs3org/reva",
-                    "tags": "${DRONE_TAG}",
-                    "dockerfile": "Dockerfile.reva",
-                    "username": {
-                        "from_secret": "dockerhub_username",
-                    },
-                    "password": {
-                        "from_secret": "dockerhub_password",
-                    },
-                    "custom_dns": [
-                        "128.142.17.5",
-                        "128.142.16.5",
-                    ],
-                },
-            },
-            {
-                "name": "docker-revad-tag",
-                "pull": "always",
-                "image": "plugins/docker",
-                "settings": {
-                    "repo": "cs3org/revad",
-                    "tags": "${DRONE_TAG}",
-                    "dockerfile": "Dockerfile.revad",
-                    "username": {
-                        "from_secret": "dockerhub_username",
-                    },
-                    "password": {
-                        "from_secret": "dockerhub_password",
-                    },
-                    "custom_dns": [
-                        "128.142.17.5",
-                        "128.142.16.5",
-                    ],
-                },
-            },
-            {
-                "name": "docker-revad-eos-tag",
-                "pull": "always",
-                "image": "plugins/docker",
-                "settings": {
-                    "repo": "cs3org/revad",
-                    "tags": "${DRONE_TAG}-eos",
-                    "dockerfile": "Dockerfile.revad-eos",
-                    "username": {
-                        "from_secret": "dockerhub_username",
-                    },
-                    "password": {
-                        "from_secret": "dockerhub_password",
-                    },
-                    "custom_dns": [
-                        "128.142.17.5",
-                        "128.142.16.5",
-                    ],
-                },
-            },
-            {
-                "name": "docker-revad-ceph-tag",
-                "pull": "always",
-                "image": "plugins/docker",
-                "settings": {
-                    "repo": "cs3org/revad",
-                    "tags": "${DRONE_TAG}-ceph",
-                    "dockerfile": "Dockerfile.revad-ceph",
-                    "username": {
-                        "from_secret": "dockerhub_username",
-                    },
-                    "password": {
-                        "from_secret": "dockerhub_password",
-                    },
-                    "custom_dns": [
-                        "128.142.17.5",
-                        "128.142.16.5",
-                    ],
-                },
-            },
         ],
     }
 
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
index 426bf92df4..2bc3757aa7 100644
--- a/.github/workflows/build-docker.yml
+++ b/.github/workflows/build-docker.yml
@@ -3,6 +3,8 @@ on:
   push:
     branches:
       - "master"
+    tags:
+      - "*"
   pull_request:
   workflow_dispatch:
 
@@ -12,13 +14,13 @@ jobs:
     strategy:
       matrix:
         include:
-          - tag: reva:latest
+          - tag: reva:${{ ((github.ref_type == 'tag') && github.ref_name) || 'latest' }}
             file: Dockerfile.reva
-          - tag: revad:latest
+          - tag: revad:${{ ((github.ref_type == 'tag') && github.ref_name) || 'latest' }}
             file: Dockerfile.revad
-          - tag: revad:latest-eos
+          - tag: revad:${{ ((github.ref_type == 'tag') && github.ref_name) || 'latest' }}-eos
             file: Dockerfile.revad-eos
-          - tag: revad:latest-ceph
+          - tag: revad:${{ ((github.ref_type == 'tag') && github.ref_name) || 'latest' }}-ceph
             file: Dockerfile.revad-ceph
     steps:
       - name: Checkout