diff --git a/.github/workflows/cd-push.yml b/.github/workflows/cd-push.yml
index 48713b99..db427e8a 100644
--- a/.github/workflows/cd-push.yml
+++ b/.github/workflows/cd-push.yml
@@ -25,5 +25,7 @@ jobs:
         uses: docker/build-push-action@v2
         with:
           push: true
-          tags: greenlight:latest
+          tags: |
+            bigbluebutton/greenlight:master
+            bigbluebutton/greenlight:latest
           build-args: version_code=${GITHUB_SHA::8}
diff --git a/.github/workflows/cd-release.yml b/.github/workflows/cd-release.yml
index 0b98e713..6ff62269 100644
--- a/.github/workflows/cd-release.yml
+++ b/.github/workflows/cd-release.yml
@@ -25,7 +25,7 @@ jobs:
         with:
           push: true
           tags: |
-            greenlight:latest
-            greenlight:v2
-            greenlight:${GITHUB_REF}
+            bigbluebutton/greenlight:latest
+            bigbluebutton/greenlight:v2
+            bigbluebutton/greenlight:${GITHUB_REF##*/}
           build-args: version_code=${GITHUB_REF##*/release-}