diff --git a/.github/workflows/docker-push.yml b/.github/workflows/docker-push.yml
index a2079e411..0c0dadfb3 100644
--- a/.github/workflows/docker-push.yml
+++ b/.github/workflows/docker-push.yml
@@ -1,9 +1,7 @@
 ---
 name: 'Push Docker Image'
 on:
-  pull_request:
-    branches:
-      - 'master'
+  workflow_dispatch:
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -23,8 +21,8 @@ jobs:
         run: |
           KONTROL_VERSION=$(cat package/version)
           echo "CONTAINER_NAME=kontrol-ci-docker-${GITHUB_SHA}" >> ${GITHUB_ENV}
-          # TODO:temp
-          SANITIZED_BRANCH_NAME=$(echo "${BRANCH_NAME}" | tr '/' '-')
+          BRANCH_NAME="${{ github.ref_name }}"
+          SANITIZED_BRANCH_NAME=$(echo "${BRANCH_NAME}" | tr '/' '-' | tr -cd '[:alnum:]-_.')
           TAG=runtimeverificationinc/kontrol:ubuntu-jammy-${SANITIZED_BRANCH_NAME}
           echo "TAG=${TAG}" >> ${GITHUB_ENV}
           echo "DOCKER_USER=user" >> ${GITHUB_ENV}