diff --git a/.github/workflows/py-shiny.yml b/.github/workflows/py-shiny.yml
index b25f661..be53b6b 100644
--- a/.github/workflows/py-shiny.yml
+++ b/.github/workflows/py-shiny.yml
@@ -10,7 +10,6 @@ on:
 
 env:
   SHINY_SETUP: py-shiny
-  TAG: latest
 
 permissions:
   packages: write
@@ -46,5 +45,7 @@ jobs:
           context: ./${{ env.SHINY_SETUP }}
           file: ./${{ env.SHINY_SETUP }}/Dockerfile
           push: true
-          tags: ghcr.io/${{ github.repository }}/${{ env.SHINY_SETUP }}:${{ env.TAG }}
+          tags: |
+            ghcr.io/${{ github.repository }}/${{ env.SHINY_SETUP }}:${{ github.ref_name }}
+            ghcr.io/${{ github.repository }}/${{ env.SHINY_SETUP }}:latest
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/r-shiny.yml b/.github/workflows/r-shiny.yml
index cda143a..f989baf 100644
--- a/.github/workflows/r-shiny.yml
+++ b/.github/workflows/r-shiny.yml
@@ -10,7 +10,6 @@ on:
 
 env:
   SHINY_SETUP: r-shiny
-  TAG: latest
 
 permissions:
   packages: write
@@ -46,5 +45,7 @@ jobs:
           context: ./${{ env.SHINY_SETUP }}
           file: ./${{ env.SHINY_SETUP }}/Dockerfile
           push: true
-          tags: ghcr.io/${{ github.repository }}/${{ env.SHINY_SETUP }}:${{ env.TAG }}
+          tags: |
+            ghcr.io/${{ github.repository }}/${{ env.SHINY_SETUP }}:${{ github.ref_name }}
+            ghcr.io/${{ github.repository }}/${{ env.SHINY_SETUP }}:latest
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/py-shiny/README.md b/py-shiny/README.md
index 01464b0..ae43c78 100644
--- a/py-shiny/README.md
+++ b/py-shiny/README.md
@@ -30,7 +30,7 @@ cd py-shiny
 export DOCKER_DEFAULT_PLATFORM=linux/amd64
 
 # Specify tag
-export TAG=lbtest/py-shiny:v1
+export TAG=lbtest/py-shiny:main
 
 # Build image
 docker build -t $TAG .
diff --git a/r-shiny/README.md b/r-shiny/README.md
index 08269b6..0e74f18 100644
--- a/r-shiny/README.md
+++ b/r-shiny/README.md
@@ -30,7 +30,7 @@ cd r-shiny
 export DOCKER_DEFAULT_PLATFORM=linux/amd64
 
 # Specify tag
-export TAG=lbtest/r-shiny:v1
+export TAG=lbtest/r-shiny:main
 
 # Build image
 docker build -t $TAG .