diff --git a/.github/workflows/pypi.yml b/.github/workflows/pypi.yml
deleted file mode 100644
index 621033d4..00000000
--- a/.github/workflows/pypi.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: PyPi upload
-
-env:
-  CIBW_TEST_REQUIRES: pytest
-  CIBW_TEST_COMMAND: "pytest tests"
-
-on: [push]
-
-jobs:
-  upload_all:
-    needs: [build_wheels, make_sdist]
-    environment: pypi
-    permissions:
-      id-token: write
-    runs-on: ubuntu-latest
-    if: github.event_name == 'release' && github.event.action == 'published'
-    steps:
-    - uses: actions/download-artifact@v4
-      with:
-        pattern: cibw-*
-        path: dist
-        merge-multiple: true
-
-    - uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/.github/workflows/sdist.yml b/.github/workflows/sdist.yml
index 2becdf1f..6ab0afff 100644
--- a/.github/workflows/sdist.yml
+++ b/.github/workflows/sdist.yml
@@ -1,25 +1,65 @@
-name: Python Package using Conda
+name: Gen sdist and upload to PyPI
 
 env:
   CIBW_TEST_REQUIRES: pytest
   CIBW_TEST_COMMAND: "pytest tests"
 
-on: [push]
+on:
+  workflow_dispatch:
+  pull_request:
+  push:
+    branches:
+      - main
+  release:
+    types:
+      - published
 
 jobs:
-  make_sdist:
-    name: Make SDist
+  # build_wheels:
+  #   name: Build wheels on ${{ matrix.os }}
+  #   runs-on: ${{ matrix.os }}
+  #   strategy:
+  #     matrix:
+  #       # macos-13 is an intel runner, macos-14 is apple silicon
+  #       os: [ubuntu-22.04, windows-2022, macos-13, macos-14]
+
+  #   steps:
+  #     - uses: actions/checkout@v4
+
+  #     - name: Build wheels
+  #       uses: pypa/cibuildwheel@v2.16.5
+
+  #     - uses: actions/upload-artifact@v4
+  #       with:
+  #         name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
+  #         path: ./wheelhouse/*.whl
+  build_sdist:
+    name: Build source distribution
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-      with:
-        fetch-depth: 0  # Optional, use if you use setuptools_scm
-        submodules: true  # Optional, use if you have submodules
-
-    - name: Build SDist
-      run: pipx run build --sdist
-
-    - uses: actions/upload-artifact@v4
-      with:
-        name: cibw-sdist
-        path: dist/*.tar.gz
+      - uses: actions/checkout@v4
+
+      - name: Build sdist
+        run: pipx run build --sdist
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: cibw-sdist
+          path: dist/*.tar.gz
+
+  upload_pypi:
+    needs: [build_sdist]
+    runs-on: ubuntu-latest
+    environment: pypi
+    permissions:
+      id-token: write
+    if: github.event_name == 'release' && github.event.action == 'published'
+    steps:
+      - uses: actions/download-artifact@v4
+        with:
+          # unpacks all CIBW artifacts into dist/
+          pattern: cibw-*
+          path: dist
+          merge-multiple: true
+
+      - uses: pypa/gh-action-pypi-publish@release/v1
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0597b157..c9736b0f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,9 +3,11 @@ cmake_minimum_required(VERSION 3.15...3.26)
 project(${SKBUILD_PROJECT_NAME} LANGUAGES CXX)
 message(STATUS '${SKBUILD_PROJECT_NAME}')
 set(CMAKE_VERBOSE_MAKEFILE ON)
-find_package(Python COMPONENTS Interpreter Development.Module REQUIRED)
 
+
+find_package(Python COMPONENTS Interpreter Development.Module REQUIRED)
 find_package(Python COMPONENTS Interpreter Development.Embed REQUIRED)
+
 set(PYBIND11_FINDPYTHON ON)
 find_package(pybind11 CONFIG REQUIRED)