diff --git a/.github/workflows/a-pr-scanner.yaml b/.github/workflows/a-pr-scanner.yaml
index 8bfbd50c..0eb803ef 100644
--- a/.github/workflows/a-pr-scanner.yaml
+++ b/.github/workflows/a-pr-scanner.yaml
@@ -66,7 +66,7 @@ jobs:
           SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
 
       - name: Comment results to PR
-        continue-on-error: true # Warninig: This might break opening PRs from forks
+        continue-on-error: true # Warning: This might break opening PRs from forks
         uses: peter-evans/create-or-update-comment@v2.1.0
         with:
           issue-number:  ${{ github.event.pull_request.number }}
@@ -157,14 +157,14 @@ jobs:
         env:
           RELEASE: ${{ inputs.RELEASE }} 
           KUBESCAPE_SKIP_UPDATE_CHECK: "true"
-        run: python3 smoke_testing/init.py ${PWD}/build/${{ matrix.os }}/kubescape-${{ matrix.os }}
+        run: python3 smoke_testing/init.py ${PWD}/build/kubescape-${{ matrix.os }}
         if: matrix.os != 'ubuntu-20.04'
 
       - name: Smoke Testing (Linux)
         env:
           RELEASE: ${{ inputs.RELEASE }} 
           KUBESCAPE_SKIP_UPDATE_CHECK: "true"
-        run: python3 smoke_testing/init.py ${PWD}/build/ubuntu-latest/kubescape-ubuntu-latest
+        run: python3 smoke_testing/init.py ${PWD}/build/kubescape-ubuntu-latest
         if: matrix.os == 'ubuntu-20.04'      
 
       - name: golangci-lint
diff --git a/.github/workflows/b-binary-build-and-e2e-tests.yaml b/.github/workflows/b-binary-build-and-e2e-tests.yaml
index 9239c5b9..641cb770 100644
--- a/.github/workflows/b-binary-build-and-e2e-tests.yaml
+++ b/.github/workflows/b-binary-build-and-e2e-tests.yaml
@@ -70,8 +70,6 @@ jobs:
 
 
   binary-build:
-    needs: [check-secret]
-    if: needs.check-secret.outputs.is-secret-set == 'true'
     name: Create cross-platform build
     outputs:
       TEST_NAMES: ${{ steps.export_tests_to_env.outputs.TEST_NAMES }}    
@@ -153,14 +151,14 @@ jobs:
         env:
           RELEASE: ${{ inputs.RELEASE }} 
           KUBESCAPE_SKIP_UPDATE_CHECK: "true"
-        run: python3 smoke_testing/init.py ${PWD}/build/${{ matrix.os }}/kubescape-${{ matrix.os }}
+        run: python3 smoke_testing/init.py ${PWD}/build/kubescape-${{ matrix.os }}
         if: matrix.os != 'ubuntu-20.04'
 
       - name: Smoke Testing (Linux)
         env:
           RELEASE: ${{ inputs.RELEASE }} 
           KUBESCAPE_SKIP_UPDATE_CHECK: "true"
-        run: python3 smoke_testing/init.py ${PWD}/build/ubuntu-latest/kubescape-ubuntu-latest
+        run: python3 smoke_testing/init.py ${PWD}/build/kubescape-ubuntu-latest
         if: matrix.os == 'ubuntu-20.04'      
 
       - name: golangci-lint
@@ -184,7 +182,7 @@ jobs:
         if: matrix.os == 'ubuntu-20.04'
         with:
           name: kubescape-ubuntu-latest
-          path: build/ubuntu-latest/
+          path: build/
           if-no-files-found: error
 
       - uses: actions/upload-artifact@v3.1.1
@@ -192,7 +190,7 @@ jobs:
         if: matrix.os != 'ubuntu-20.04'
         with:
           name: kubescape-${{ matrix.os }}
-          path: build/${{ matrix.os }}/
+          path: build/
           if-no-files-found: error
 
   run-tests:
@@ -200,8 +198,9 @@ jobs:
       fail-fast: false    
       matrix:
         TEST: ${{ fromJson(needs.binary-build.outputs.TEST_NAMES) }}
-    needs: binary-build
-    runs-on: ubuntu-20.04 # This cannot change
+    needs: [check-secret, binary-build]
+    if: needs.check-secret.outputs.is-secret-set == 'true'
+    runs-on: ubuntu-latest # This cannot change
     steps:
 
       - uses: actions/download-artifact@v3.0.2
@@ -213,7 +212,7 @@ jobs:
       - run: ls -laR
 
       - name: chmod +x
-        run: chmod +x ${{steps.download-artifact.outputs.download-path}}/kubescape-ubuntu-latest
+        run: chmod +x -R ${{steps.download-artifact.outputs.download-path}}/kubescape-ubuntu-latest
 
       - name: Checkout systests repo
         uses: actions/checkout@v3
diff --git a/.github/workflows/c-create-release.yaml b/.github/workflows/c-create-release.yaml
index cc6ac274..7d704fda 100644
--- a/.github/workflows/c-create-release.yaml
+++ b/.github/workflows/c-create-release.yaml
@@ -29,8 +29,6 @@ jobs:
         with:
           path: .
 
-      - run: ls -laR
-
       - name: artifacts rename
         run: |
 
@@ -38,14 +36,29 @@ jobs:
           UBUNTU_OS=ubuntu-latest
           WINDOWS_OS=windows-latest
 
-          mv ./kubescape-$MAC_OS/kubescape-$MAC_OS ./kubescape-$MAC_OS/kubescape-$MAC_OS-${{ inputs.TAG }}
-          mv ./kubescape-$MAC_OS/kubescape-$MAC_OS.sha256 ./kubescape-$MAC_OS/kubescape-$MAC_OS-${{ inputs.TAG }}.sha256
+          mv ./build/kubescape-$MAC_OS ./build/kubescape-$MAC_OS-${{ inputs.TAG }}
+          mv ./build/kubescape-$MAC_OS.sha256 ./build/kubescape-$MAC_OS-${{ inputs.TAG }}.sha256
 
-          mv ./kubescape-$UBUNTU_OS/kubescape-$UBUNTU_OS ./kubescape-$UBUNTU_OS/kubescape-$UBUNTU_OS-${{ inputs.TAG }}
-          mv ./kubescape-$UBUNTU_OS/kubescape-$UBUNTU_OS.sha256 ./kubescape-$UBUNTU_OS/kubescape-$UBUNTU_OS-${{ inputs.TAG }}.sha256
+          mv ./build/kubescape-$UBUNTU_OS ./build/kubescape-$UBUNTU_OS-${{ inputs.TAG }}
+          mv ./build/kubescape-$UBUNTU_OS.sha256 ./build/kubescape-$UBUNTU_OS-${{ inputs.TAG }}.sha256
 
-          mv ./kubescape-$WINDOWS_OS/kubescape-$WINDOWS_OS ./kubescape-$WINDOWS_OS/kubescape-$WINDOWS_OS-${{ inputs.TAG }}
-          mv ./kubescape-$WINDOWS_OS/kubescape-$WINDOWS_OS.sha256 ./kubescape-$WINDOWS_OS/kubescape-$WINDOWS_OS-${{ inputs.TAG }}.sha256
+          mv ./build/kubescape-$WINDOWS_OS ./build/kubescape-$WINDOWS_OS-${{ inputs.TAG }}
+          mv ./build/kubescape-$WINDOWS_OS.sha256 ./build/kubescape-$WINDOWS_OS-${{ inputs.TAG }}.sha256
+
+        # run: |
+
+        #   MAC_OS=macos-latest
+        #   UBUNTU_OS=ubuntu-latest
+        #   WINDOWS_OS=windows-latest
+
+        #   mv ./kubescape-$MAC_OS/kubescape-$MAC_OS ./kubescape-$MAC_OS/kubescape-$MAC_OS-${{ inputs.TAG }}
+        #   mv ./kubescape-$MAC_OS/kubescape-$MAC_OS.sha256 ./kubescape-$MAC_OS/kubescape-$MAC_OS-${{ inputs.TAG }}.sha256
+
+        #   mv ./kubescape-$UBUNTU_OS/kubescape-$UBUNTU_OS ./kubescape-$UBUNTU_OS/kubescape-$UBUNTU_OS-${{ inputs.TAG }}
+        #   mv ./kubescape-$UBUNTU_OS/kubescape-$UBUNTU_OS.sha256 ./kubescape-$UBUNTU_OS/kubescape-$UBUNTU_OS-${{ inputs.TAG }}.sha256
+
+        #   mv ./kubescape-$WINDOWS_OS/kubescape-$WINDOWS_OS ./kubescape-$WINDOWS_OS/kubescape-$WINDOWS_OS-${{ inputs.TAG }}
+        #   mv ./kubescape-$WINDOWS_OS/kubescape-$WINDOWS_OS.sha256 ./kubescape-$WINDOWS_OS/kubescape-$WINDOWS_OS-${{ inputs.TAG }}.sha256
 
       - name: Release
         uses: softprops/action-gh-release@v1
@@ -58,7 +71,9 @@ jobs:
           fail_on_unmatched_files: true
           prerelease: false
           files: |
-            ./kubescape-ubuntu-latest/*
-            ./kubescape-macos-latest/*
-            ./kubescape-windows-latest/*
+            ./build/*
+          # files: |
+          #   ./kubescape-ubuntu-latest/*
+          #   ./kubescape-macos-latest/*
+          #   ./kubescape-windows-latest/*