diff --git a/.github/workflows/docker-terraform.yaml b/.github/workflows/docker-terraform.yaml
index 11cf749a..bf8ce071 100644
--- a/.github/workflows/docker-terraform.yaml
+++ b/.github/workflows/docker-terraform.yaml
@@ -66,7 +66,9 @@ jobs:
           file: Dockerfiles/DockerfileLinux
           push: true
           platforms: linux/amd64,linux/arm64
-          build-args: AGENT_VERSION=${{ env.RELEASE_VERSION }}
+          build-args: |
+            AGENT_VERSION=${{ env.RELEASE_VERSION }}
+            GITHUB_TOKEN=${{ secrets.GHCR_TOKEN }}
           tags: |
             ghcr.io/middleware-labs/terraform-agent
 
diff --git a/.github/workflows/host-agent-windows.yaml b/.github/workflows/host-agent-windows.yaml
index c85aaa8c..4ea5671c 100644
--- a/.github/workflows/host-agent-windows.yaml
+++ b/.github/workflows/host-agent-windows.yaml
@@ -65,7 +65,7 @@ jobs:
 
     - name: Sign MW Agent Installer Package
       run: |
-        jsign --storetype ${{ secrets.SM_CLIENT_CERT_STORE_TYPE }} --alias ${{ secrets.SM_CLIENT_CERT_ALIAS }} --tsaurl ${{ secrets.SM_TIMESTAMP_AUTHORITY_URL }} --storepass "${{ secrets.SM_API_KEY }}|./certificate_pkcs12.p12|${{ secrets.SM_CLIENT_CERT_PASSWORD }}"  package-tooling/windows/mw-windows-agent-RELEASE_VERSION-setup.exe
+        jsign --storetype ${{ secrets.SM_CLIENT_CERT_STORE_TYPE }} --alias ${{ secrets.SM_CLIENT_CERT_ALIAS }} --tsaurl ${{ secrets.SM_TIMESTAMP_AUTHORITY_URL }} --storepass "${{ secrets.SM_API_KEY }}|./certificate_pkcs12.p12|${{ secrets.SM_CLIENT_CERT_PASSWORD }}"  package-tooling/windows/mw-windows-agent-$RELEASE_VERSION-setup.exe
              
     - name: Upload Artifact
       uses: actions/upload-artifact@v3