diff --git a/.github/actions/compile-and-bundle/action.yml b/.github/actions/compile-and-bundle/action.yml
index 50fbceb..7246568 100644
--- a/.github/actions/compile-and-bundle/action.yml
+++ b/.github/actions/compile-and-bundle/action.yml
@@ -105,23 +105,10 @@ runs:
         OS: ${{ inputs.os }}
       run: make PROJECT="${CIRCUIT_FILESTEM}" "${OS}"
 
-    - name: Bundle ${{ inputs.circuit-name-display }}
-      shell: bash
-      env:
-        CIRCUIT_NAME: ${{ steps.parse-circuit-path.outputs.CIRCUIT_FILESTEM }}
-        PLATFORM_BINARY_NAME: ${{ steps.parse-circuit-path.outputs.PLATFORM_BINARY_NAME }}
-        BUNDLE_NAME: nomos-circuits-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.version }}
-        CIRCUIT_NAME_BINARY: ${{ inputs.circuit-name-binary }}
-        WITNESS_GENERATOR_DIR: ${{ steps.parse-circuit-path.outputs.CIRCUIT_CPP_PATH }}
-      run: |
-        BUNDLE_DIR="${BUNDLE_NAME}/${CIRCUIT_NAME_BINARY}"
-        mkdir -p "$BUNDLE_DIR"
-
-        mv "${WITNESS_GENERATOR_DIR}/${CIRCUIT_NAME}" "$BUNDLE_DIR/witness_generator"
-        mv "${WITNESS_GENERATOR_DIR}/${CIRCUIT_NAME}.dat" "$BUNDLE_DIR/witness_generator.dat"
-
     - name: Upload ${{ inputs.circuit-name-display }}
       uses: actions/upload-artifact@de65e23aa2b7e23d713bb51fbfcb6d502f8667d8
       with:
         name: ${{ inputs.circuit-name-binary }}-${{ inputs.version }}-${{ inputs.os }}-${{ inputs.arch }}
-        path: nomos-circuits-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.version }}/${{ inputs.circuit-name-binary }}
+        path: |
+          ${{ steps.parse-circuit-path.outputs.CIRCUIT_CPP_PATH }}/${{ steps.parse-circuit-path.outputs.CIRCUIT_FILESTEM }}
+          ${{ steps.parse-circuit-path.outputs.CIRCUIT_CPP_PATH }}/${{ steps.parse-circuit-path.outputs.CIRCUIT_FILESTEM }}.dat
diff --git a/.github/workflows/build-circuits.yml b/.github/workflows/build-circuits.yml
index c0bea39..fc6726b 100644
--- a/.github/workflows/build-circuits.yml
+++ b/.github/workflows/build-circuits.yml
@@ -302,16 +302,20 @@ jobs:
           BUNDLE_NAME: nomos-circuits-${{ env.OS }}-${{ env.ARCH }}-${{ env.VERSION }}
         run: |
           # Create the bundle directory structure
-          mkdir -p "${BUNDLE_NAME}"
+          mkdir -p "${BUNDLE_NAME}"/{pol,poq,zksign,poc}
 
           # Create VERSION file
           echo "${{ env.VERSION }}" > "${BUNDLE_NAME}/VERSION"
 
-          # Move witness generators from artifact download location to bundle
-          mv witness-generators/pol-artifact/* "${BUNDLE_NAME}/"
-          mv witness-generators/poq-artifact/* "${BUNDLE_NAME}/"
-          mv witness-generators/zksign-artifact/* "${BUNDLE_NAME}/"
-          mv witness-generators/poc-artifact/* "${BUNDLE_NAME}/"
+          # Move witness generators into their respective circuit directories
+          mv witness-generators/pol-artifact/pol "${BUNDLE_NAME}/pol/witness_generator"
+          mv witness-generators/pol-artifact/pol.dat "${BUNDLE_NAME}/pol/witness_generator.dat"
+          mv witness-generators/poq-artifact/poq "${BUNDLE_NAME}/poq/witness_generator"
+          mv witness-generators/poq-artifact/poq.dat "${BUNDLE_NAME}/poq/witness_generator.dat"
+          mv witness-generators/zksign-artifact/signature "${BUNDLE_NAME}/zksign/witness_generator"
+          mv witness-generators/zksign-artifact/signature.dat "${BUNDLE_NAME}/zksign/witness_generator.dat"
+          mv witness-generators/poc-artifact/poc "${BUNDLE_NAME}/poc/witness_generator"
+          mv witness-generators/poc-artifact/poc.dat "${BUNDLE_NAME}/poc/witness_generator.dat"
 
           # Copy proving keys and verification keys into each circuit directory
           cp proving-keys/pol-proving-key/pol.zkey "${BUNDLE_NAME}/pol/proving_key.zkey"
@@ -704,16 +708,20 @@ jobs:
           BUNDLE_NAME: nomos-circuits-${{ env.OS }}-${{ env.ARCH }}-${{ env.VERSION }}
         run: |
           # Create the bundle directory structure
-          mkdir -p "${BUNDLE_NAME}"
+          mkdir -p "${BUNDLE_NAME}"/{pol,poq,zksign,poc}
 
           # Create VERSION file
           echo "${{ env.VERSION }}" > "${BUNDLE_NAME}/VERSION"
 
-          # Move witness generators from artifact download location to bundle
-          mv witness-generators/pol-artifact/* "${BUNDLE_NAME}/"
-          mv witness-generators/poq-artifact/* "${BUNDLE_NAME}/"
-          mv witness-generators/zksign-artifact/* "${BUNDLE_NAME}/"
-          mv witness-generators/poc-artifact/* "${BUNDLE_NAME}/"
+          # Move witness generators into their respective circuit directories
+          mv witness-generators/pol-artifact/pol "${BUNDLE_NAME}/pol/witness_generator"
+          mv witness-generators/pol-artifact/pol.dat "${BUNDLE_NAME}/pol/witness_generator.dat"
+          mv witness-generators/poq-artifact/poq "${BUNDLE_NAME}/poq/witness_generator"
+          mv witness-generators/poq-artifact/poq.dat "${BUNDLE_NAME}/poq/witness_generator.dat"
+          mv witness-generators/zksign-artifact/signature "${BUNDLE_NAME}/zksign/witness_generator"
+          mv witness-generators/zksign-artifact/signature.dat "${BUNDLE_NAME}/zksign/witness_generator.dat"
+          mv witness-generators/poc-artifact/poc "${BUNDLE_NAME}/poc/witness_generator"
+          mv witness-generators/poc-artifact/poc.dat "${BUNDLE_NAME}/poc/witness_generator.dat"
 
           # Copy proving keys and verification keys into each circuit directory
           cp proving-keys/pol-proving-key/pol.zkey "${BUNDLE_NAME}/pol/proving_key.zkey"