diff --git a/.github/workflows/release-heat-rxt.yml b/.github/workflows/release-heat-rxt.yml
index 07b8eadc..7f9f62d6 100644
--- a/.github/workflows/release-heat-rxt.yml
+++ b/.github/workflows/release-heat-rxt.yml
@@ -23,6 +23,7 @@ on:
 env:
   REGISTRY: ghcr.io
   IMAGE_NAME: ${{ github.repository }}
+  DEF_TAG_NAME: 2024.1-ubuntu_jammy
 
 # There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
 jobs:
@@ -60,8 +61,8 @@ jobs:
           file: Containerfiles/HeatRXT-Containerfile
           push: true
           tags: |
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag }}
-            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag }}-${{ env.MY_DATE }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}
+            ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}/heat-rxt:${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}-${{ env.MY_DATE }}
           labels: ${{ steps.meta.outputs.labels }}
           build-args: |
-            VERSION=${{ github.event.inputs.imageTag }}
+            VERSION=${{ github.event.inputs.imageTag || env.DEF_TAG_NAME }}