diff --git a/.github/workflows/docker-terraform.yaml b/.github/workflows/docker-terraform.yaml
index b2e230b3..66826379 100644
--- a/.github/workflows/docker-terraform.yaml
+++ b/.github/workflows/docker-terraform.yaml
@@ -51,6 +51,14 @@ jobs:
         with:
           images: ghcr.io/middleware-labs/terraform-agent
 
+      - name: Setting Release Number
+        run: |
+          if [ -n "${{ github.event.inputs.release_version }}" ]; then
+            echo "RELEASE_VERSION=${{ github.event.inputs.release_version }}" >> $GITHUB_ENV
+          else
+            echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+          fi
+
       - name: Build and Push
         uses: docker/build-push-action@v3
         with:
@@ -58,7 +66,7 @@ jobs:
           file: DockerfileLinux
           push: true
           platforms: linux/amd64,linux/arm64
-          build-args: AGENT_VERSION=${{  github.event.inputs.tag || steps.meta.outputs.tags }}
+          build-args: AGENT_VERSION=$RELEASE_VERSION
           tags: |
             ghcr.io/middleware-labs/terraform-agent
 
diff --git a/.github/workflows/ghcr-windows.yaml b/.github/workflows/ghcr-windows.yaml
index cfd51c0c..cfd5050c 100644
--- a/.github/workflows/ghcr-windows.yaml
+++ b/.github/workflows/ghcr-windows.yaml
@@ -21,6 +21,14 @@ jobs:
           username: ${{ secrets.GHCR_USER }}
           password: ${{ secrets.GHCR_TOKEN }}
 
+      - name: Setting Release Number
+        run: |
+          if [ -n "${{ github.event.inputs.release_version }}" ]; then
+            echo "RELEASE_VERSION=${{ github.event.inputs.release_version }}" >> $GITHUB_ENV
+          else
+            echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+          fi
+
       - name: Build and push Docker image
         uses: docker/build-push-action@v2
         with:
@@ -28,6 +36,6 @@ jobs:
           context: .
           push: true
           tags: | 
-            windows-${{ steps.meta.outputs.tags }}
+            windows-$RELEASE_VERSION
             ghcr.io/middleware-labs/agent-host-go:windows-${{ github.sha }}
           platforms: windows/amd64
diff --git a/.github/workflows/host-agent-docker.yaml b/.github/workflows/host-agent-docker.yaml
index 3b4a6c31..808deb4e 100644
--- a/.github/workflows/host-agent-docker.yaml
+++ b/.github/workflows/host-agent-docker.yaml
@@ -59,6 +59,14 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ghcr.io/middleware-labs/mw-host-agent
+      
+      - name: Setting Release Number
+        run: |
+          if [ -n "${{ github.event.inputs.release_version }}" ]; then
+            echo "RELEASE_VERSION=${{ github.event.inputs.release_version }}" >> $GITHUB_ENV
+          else
+            echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+          fi
 
       - name: Build and Push
         uses: docker/build-push-action@v3
@@ -68,7 +76,7 @@ jobs:
           push: true
           platforms: linux/amd64,linux/arm64
           build-args: |
-            AGENT_VERSION=${{  github.event.inputs.tag || steps.meta.outputs.tags }}
+            AGENT_VERSION=$RELEASE_VERSION
             GITHUB_TOKEN=${{ secrets.GHCR_TOKEN }}
           tags: | 
-            ghcr.io/middleware-labs/mw-host-agent:${{  github.event.inputs.tag || steps.meta.outputs.tags }}
\ No newline at end of file
+            ghcr.io/middleware-labs/mw-host-agent:$RELEASE_VERSION
\ No newline at end of file
diff --git a/.github/workflows/host-agent-rpm.yaml b/.github/workflows/host-agent-rpm.yaml
index 06068ab6..1e6b407d 100644
--- a/.github/workflows/host-agent-rpm.yaml
+++ b/.github/workflows/host-agent-rpm.yaml
@@ -45,7 +45,11 @@ jobs:
         
     - name: Set Architecture Variables
       run: |
-        echo "::set-env name=RELEASE_VERSION::$(echo "${{ github.event.inputs.release_version || steps.meta.outputs.tags }}" | tr -d '\n')"
+        if [ -n "${{ github.event.inputs.release_version }}" ]; then
+          echo "RELEASE_VERSION=${{ github.event.inputs.release_version }}" >> $GITHUB_ENV
+        else
+          echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+        fi
         echo "::set-env name=RELEASE_NUMBER::$(echo "${{ github.event.inputs.release_number || 1 }}" | tr -d '\n')"
         echo "::set-env name=PACKAGE_NAME::mw-agent"
         echo "::set-env name=SPEC_FILE::mw-agent.spec"
diff --git a/.github/workflows/host-agent-windows.yaml b/.github/workflows/host-agent-windows.yaml
index 2603ee67..0b9ff9fa 100644
--- a/.github/workflows/host-agent-windows.yaml
+++ b/.github/workflows/host-agent-windows.yaml
@@ -40,11 +40,19 @@ jobs:
         git config --global url."https://${{ secrets.GHCR_TOKEN }}:@github.com/".insteadOf "https://github.com/"
       env:
         GITHUB_TOKEN: ${{ secrets.GHCR_TOKEN }}
+    
+    - name: Setting Release Number
+      run: |
+        if [ -n "${{ github.event.inputs.release_version }}" ]; then
+          echo "RELEASE_VERSION=${{ github.event.inputs.release_version }}" >> $GITHUB_ENV
+        else
+          echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+        fi
 
     - name: Build MW Agent for Windows
       run: |
-        GOOS=windows CGO_ENABLED=0 GOPRIVATE=github.com/middleware-labs go build -ldflags "-s -w -X main.agentVersion=${{ github.event.inputs.release_version || steps.meta.outputs.tags }}" -o build/mw-windows-agent.exe cmd/host-agent/main.go
-        makensis -DVERSION=${{ github.event.inputs.release_version || steps.meta.outputs.tags }} package-tooling/windows/package-windows.nsi
+        GOOS=windows CGO_ENABLED=0 GOPRIVATE=github.com/middleware-labs go build -ldflags "-s -w -X main.agentVersion=$RELEASE_VERSION" -o build/mw-windows-agent.exe cmd/host-agent/main.go
+        makensis -DVERSION=$RELEASE_VERSION package-tooling/windows/package-windows.nsi
        
     - name: Install jsign Tool For Microsoft Authenticode
       run: |
@@ -62,5 +70,5 @@ jobs:
     - name: Upload Artifact
       uses: actions/upload-artifact@v3
       with:
-        name: mw-windows-agent-${{ github.event.inputs.release_version || steps.meta.outputs.tags }}-setup.exe
-        path: package-tooling/windows/mw-windows-agent-${{ github.event.inputs.release_version || steps.meta.outputs.tags }}-setup.exe
+        name: mw-windows-agent-$RELEASE_VERSION-setup.exe
+        path: package-tooling/windows/mw-windows-agent-$RELEASE_VERSION-setup.exe
diff --git a/.github/workflows/kube-agent-docker.yaml b/.github/workflows/kube-agent-docker.yaml
index 96815f1a..5f2a9cee 100644
--- a/.github/workflows/kube-agent-docker.yaml
+++ b/.github/workflows/kube-agent-docker.yaml
@@ -53,6 +53,14 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: ghcr.io/middleware-labs/mw-kube-agent
+      
+      - name: Setting Release Number
+        run: |
+          if [ -n "${{ github.event.inputs.release_version }}" ]; then
+            echo "RELEASE_VERSION=${{ github.event.inputs.release_version }}" >> $GITHUB_ENV
+          else
+            echo "RELEASE_VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
+          fi
 
       - name: Build and Push
         uses: docker/build-push-action@v3
@@ -62,8 +70,8 @@ jobs:
           push: true
           platforms: linux/amd64,linux/arm64
           build-args: |
-            AGENT_VERSION=${{  github.event.inputs.tag || steps.meta.outputs.tags }}
+            AGENT_VERSION=$RELEASE_VERSION
             GITHUB_TOKEN=${{ secrets.GHCR_TOKEN }}
           tags: | 
-            ghcr.io/middleware-labs/mw-kube-agent:${{  github.event.inputs.tag || steps.meta.outputs.tags }}
-            ghcr.io/middleware-labs/agent-kube-go:${{  github.event.inputs.tag || steps.meta.outputs.tags }}
\ No newline at end of file
+            ghcr.io/middleware-labs/mw-kube-agent:$RELEASE_VERSION
+            ghcr.io/middleware-labs/agent-kube-go:$RELEASE_VERSION
\ No newline at end of file