diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 08cdbf80..a98f6c0f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -2,10 +2,17 @@ name: "SQS UI | Build Docker Image"
 
 on:
   workflow_dispatch:
+    inputs:
+      docker_tag:
+        description: 'Docker tag to build'
+        required: false
+        default: ''
   push:
-    branches: [ "main", "v*.*.*" ]
-  pull_request:
-    branches: [ "main", "v*.*.*" ]
+    tags:
+      - v[0-9]+.[0-9]+.[0-9]+
+    branches:
+      - "v[1-9][0-9]?\.[a-z]||[0-9]"
+      - "osmosis-main"
 
 jobs:
   build:
@@ -13,15 +20,19 @@ jobs:
       docker_org: "osmolabs"
       docker_server_url: "https://index.docker.io/v1/"
       docker_repo: "sqs"
-      app_name: "sqs"
-        
+
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
 
     - name: "SET:ENV:VARS"
       run: |
-        echo "docker_tag=ui-${GITHUB_SHA::7}" >> ${GITHUB_ENV}
+        if [ -z "${{ github.event.inputs.docker_tag }}" ]; then
+          BRANCH_OR_TAG=${GITHUB_REF#refs/*/}
+          echo "docker_tag=${BRANCH_OR_TAG}" >> ${GITHUB_ENV}
+        else
+          echo "docker_tag=${{ github.event.inputs.docker_tag }}" >> ${GITHUB_ENV}
+        fi
 
     - name: "DOCKER:BUILD:CHECK:PUSH"
       uses: iDevOps-io/idevops-git-actions/docker_build_check_tag_and_push@main