diff --git a/.github/workflows/build-assets.yml b/.github/workflows/build-assets.yml
index 195034d0efc..2e0c623e597 100644
--- a/.github/workflows/build-assets.yml
+++ b/.github/workflows/build-assets.yml
@@ -92,18 +92,6 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: ubuntu-22.04
-          - os: ubuntu-22.04
-            name: k8s
-            container: true
-          - os: ubuntu-20.04
-          - os: centos-8
-          - os: centos-7
-            cmake_options_extra: ""
-          - os: ubuntu-22.04
-            name: LN k8s
-            ln: true
-            container: true
           - os: ubuntu-20.04
             name: LN
             ln: true
@@ -270,7 +258,7 @@ jobs:
           password: ${{ secrets.JFROG_PASSWORD }}
 
       - name: Setup JFrog CLI (internal)
-        if: ${{ matrix.ln && matrix.container && github.repository_owner == 'hpcc-systems' }}
+        if: ${{ matrix.ln }}
         uses: jfrog/setup-jfrog-cli@v3
         env:
           JF_URL: https://${{ secrets.JFROG_REGISTRY }}
@@ -321,6 +309,39 @@ jobs:
           tag: ${{ needs.preamble.outputs.internal_tag }}
           artifacts: "${{ needs.preamble.outputs.folder_build }}/hpccsystems-*-internal*.deb,${{ needs.preamble.outputs.folder_build }}/hpccsystems-*-internal*.rpm"
 
+      - name: Upload Assets to Jfrog (debian internal)
+        ## will need repo check here so devs can't push to jfrog
+        if: ${{ matrix.ln && !matrix.container && contains(matrix.os, 'ubuntu') }}
+        shell: bash
+        run: |
+          cd ${{ needs.preamble.outputs.folder_build }}
+          version=$(echo "${{ needs.preamble.outputs.internal_tag }}" | sed 's/internal_//')
+    
+          packages=($(ls -1 hpccsystems-* ))
+          for _package in ${packages[@]}; do
+            distribution=$( echo "${_package}" | sed "s/^.*${version}//" | awk -F '_' '{print $1;}' )
+            curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} -XPUT "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-debian-local/pool/LN/${_package};deb.distribution=${distribution};deb.component=LN;deb.architecture=amd64" -T ${{ needs.preamble.outputs.folder_build }}/${_package} 
+          done
+
+      - name: Upload Assets to Jfrog (centos internal)
+      ## will need repo check here so devs can't push to jfrog
+        if: ${{ matrix.ln && !matrix.container && !contains(matrix.os, 'ubuntu') }}
+        shell: bash
+        run: |
+          cd ${{ needs.preamble.outputs.folder_build }}
+          version=$(echo "${{ needs.preamble.outputs.internal_tag }}" | sed 's/internal_//')
+          ls -la
+          pwd
+          packages=($(ls -1 hpccsystems-* ))
+          for _package in ${packages[@]}; do
+            echo "package = ${_package}"
+            distribution=$( echo "${_package}" | awk -F '.' '{print $4;}' )
+            echo "distribution = ${distribution}"
+            curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} -XPUT "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-rpm-local/LN/${distribution}/x86_64/${_package}" -T ${{ needs.preamble.outputs.folder_build }}/${_package} 
+          done
+
+
+
       - name: Locate k8s deb file (internal)
         if: ${{ matrix.ln && matrix.container && !matrix.documentation }}
         id: ln-container
@@ -470,6 +491,34 @@ jobs:
           tag: ${{ needs.preamble.outputs.internal_tag }}
           artifacts: "./build/hpccsystems-clienttools-internal*.exe,./build/hpccsystems-clienttools-internal*.msi,./build/hpccsystems-clienttools-internal*.dmg,./build/hpccsystems-clienttools-internal*.pkg,./build/hpccsystems-clienttools-internal*.tar.gz"
 
+      - name: Upload Assets to Jfrog (windows)
+        ## will need repo check here so devs can't push to jfrog
+        if: ${{ contains(matrix.os, 'windows') }}
+        shell: bash
+        run: |
+          cd ./build
+          pwd
+          ls -la
+          packages=($(ls -1 hpccsystems-* ))
+          for _package in ${packages[@]}; do
+            echo "package is ${_package}"
+            curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-windows-local/LN/windows/x86_64/${_package}" -T ./build/${_package}
+          done
+
+      - name: Upload Assets to Jfrog (macos)
+        ## will need repo check here so devs can't push to jfrog
+        if: ${{ contains(matrix.os, 'macos') }}
+        shell: bash
+        run: |
+          cd ./build
+          ls -la
+          pwd
+          packages=($(ls -1 hpccsystems-* ))
+          for _package in ${packages[@]}; do
+            echo "package is ${_package}"
+            curl -u${{ secrets.JFROG_USERNAME }}:${{ secrets.JFROG_PASSWORD }} "https://${{ secrets.JFROG_REGISTRY }}/hpccpl-macos-local/LN/macos/x86_64/${_package}" -T ./build/${_package}
+          done
+
       - name: Upload error logs
         if: ${{ failure() || cancelled() }}
         uses: actions/upload-artifact@v4