diff --git a/.github/workflows/hab-pkg-build-upload.yaml b/.github/workflows/hab-pkg-build-upload.yaml
index 9c1db7773..5a6d43203 100644
--- a/.github/workflows/hab-pkg-build-upload.yaml
+++ b/.github/workflows/hab-pkg-build-upload.yaml
@@ -23,24 +23,24 @@ permissions:
 
 jobs:
 
-  # windows-pre-build:
-  #   runs-on: ubuntu-latest
-  #   outputs:
-  #     app_version: ${{ steps.app_version.outputs.APP_VERSION }}
-  #     date: ${{ steps.date.outputs.DATE }}
-  #   steps:
-  #     - name: Get branch name
-  #       id: get_branch_name
-  #       run: |
-  #         echo "BRANCH_NAME=${GITHUB_REF_NAME//\//-}" >> "$GITHUB_OUTPUT"
-  #     - name: Get formated date
-  #       id: date
-  #       run: |
-  #         echo "DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> "$GITHUB_OUTPUT"
-  #     - name: Get version from tag
-  #       id: app_version
-  #       run: |
-  #          echo "APP_VERSION=$(git describe --tags `git rev-list --tags --max-count=1` | sed 's/^v//')" >> "$GITHUB_OUTPUT"
+  windows-pre-build:
+    runs-on: ubuntu-latest
+    outputs:
+      app_version: ${{ steps.app_version.outputs.APP_VERSION }}
+      date: ${{ steps.date.outputs.DATE }}
+    steps:
+      - name: Get branch name
+        id: get_branch_name
+        run: |
+          echo "BRANCH_NAME=${GITHUB_REF_NAME//\//-}" >> "$GITHUB_OUTPUT"
+      - name: Get formated date
+        id: date
+        run: |
+          echo "DATE=$(date -u +"%Y-%m-%dT%H:%M:%SZ")" >> "$GITHUB_OUTPUT"
+      - name: Get version from tag
+        id: app_version
+        run: |
+           echo "APP_VERSION=$(git describe --tags `git rev-list --tags --max-count=1` | sed 's/^v//')" >> "$GITHUB_OUTPUT"
 
   # These particular components
   # - have a plan.sh file in their "component root"
@@ -104,58 +104,58 @@ jobs:
           compression-level: 0
           overwrite: true
 
-  # # These particular sub-components of builder-worker
-  # # - don't have a plan.sh file in their "component root"
-  # # - don't have a habitat plan directory
-  # # - don't have a habitat-dev plan directory
-  # # - have architecture specific plan directories
-  # arch-target-packages:
-  #   needs: windows-pre-build
-  #   strategy:
-  #     fail-fast: false
-  #     matrix:
-  #       os: [ubuntu-latest]
-  #       #os: [ubuntu-latest, windows-latest]
-  #       channel: [unstable]
-  #       components: [builder-worker]
-  #       wumpus: [x86_64-linux, x86_64-windows]
-  #       # wumpus: [x86_64-linux, x86_64-linux-kernel2, x86_64-windows]
-  #       exclude:
-  #         - os: ubuntu-latest
-  #           wumpus: x86_64-windows
-  #         - os: windows-latest
-  #           wumpus: x86_64-linux
-  #         - os: windows-latest
-  #           wumpus: x86_64-linux-kernel2
-  #   runs-on: ${{matrix.os}}
-  #   steps:
+  # These particular sub-components of builder-worker
+  # - don't have a plan.sh file in their "component root"
+  # - don't have a habitat plan directory
+  # - don't have a habitat-dev plan directory
+  # - have architecture specific plan directories
+  arch-target-packages:
+    needs: windows-pre-build
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest]
+        #os: [ubuntu-latest, windows-latest]
+        channel: [unstable]
+        components: [builder-worker]
+        wumpus: [x86_64-linux, x86_64-windows]
+        # wumpus: [x86_64-linux, x86_64-linux-kernel2, x86_64-windows]
+        exclude:
+          - os: ubuntu-latest
+            wumpus: x86_64-windows
+          - os: windows-latest
+            wumpus: x86_64-linux
+          - os: windows-latest
+            wumpus: x86_64-linux-kernel2
+    runs-on: ${{matrix.os}}
+    steps:
 
-  #     - name: Checkout
-  #       uses: actions/checkout@v4
+      - name: Checkout
+        uses: actions/checkout@v4
 
-  #     - if: ${{ matrix.os == 'ubuntu-latest'  && matrix.wumpus != 'x86_64-windows' }}
-  #       name: Install Habitat
-  #       uses: ./.github/actions/hab-install-linux
-  #     # - if: ${{ matrix.os == 'windows-latest' && matrix.wumpus == 'x86_64-windows' }}
-  #     #   name: Install Habitat
-  #     #   uses: ./.github/actions/hab-install-windows
+      - if: ${{ matrix.os == 'ubuntu-latest'  && matrix.wumpus != 'x86_64-windows' }}
+        name: Install Habitat
+        uses: ./.github/actions/hab-install-linux
+      - if: ${{ matrix.os == 'windows-latest' && matrix.wumpus == 'x86_64-windows' }}
+        name: Install Habitat
+        uses: ./.github/actions/hab-install-windows
 
-  #     - if: ${{ matrix.os == 'ubuntu-latest'  && matrix.wumpus != 'x86_64-windows' }}
-  #       name: Build and Upload Habitat Package
-  #       uses: ./.github/actions/hab-pkg-build-and-upload-linux
-  #       with:
-  #         hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
-  #         hab-origin: ${{ env.HAB_ORIGIN }}
-  #         bldr-component: components/${{matrix.components}}/habitat/${{matrix.wumpus}}
-  #     # - if: ${{ matrix.os == 'windows-latest' && matrix.wumpus == 'x86_64-windows' }}
-  #     #   name: Build and Upload Habitat Package
-  #     #   uses: ./.github/actions/hab-pkg-build-and-upload-windows
-  #     #   with:
-  #     #     hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
-  #     #     hab-origin: ${{ env.HAB_ORIGIN }}
-  #     #     bldr-component: components/${{matrix.components}}/habitat/${{matrix.wumpus}}
-  #     #     app-version: ${{ needs.pre-build.outputs.app_version }}
-  #     #     build-date-time: ${{ needs.pre-build.outputs.date }}
+      - if: ${{ matrix.os == 'ubuntu-latest'  && matrix.wumpus != 'x86_64-windows' }}
+        name: Build and Upload Habitat Package
+        uses: ./.github/actions/hab-pkg-build-and-upload-linux
+        with:
+          hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
+          hab-origin: ${{ env.HAB_ORIGIN }}
+          bldr-component: components/${{matrix.components}}/habitat/${{matrix.wumpus}}
+      - if: ${{ matrix.os == 'windows-latest' && matrix.wumpus == 'x86_64-windows' }}
+        name: Build and Upload Habitat Package
+        uses: ./.github/actions/hab-pkg-build-and-upload-windows
+        with:
+          hab-auth-token: ${{ env.HAB_AUTH_TOKEN }}
+          hab-origin: ${{ env.HAB_ORIGIN }}
+          bldr-component: components/${{matrix.components}}/habitat/${{matrix.wumpus}}
+          app-version: ${{ needs.pre-build.outputs.app_version }}
+          build-date-time: ${{ needs.pre-build.outputs.date }}
 
   # # These particular components
   # # - don't have a plan.sh file in their "component root"