diff --git a/.github/workflows/ci-ffi-python.yml b/.github/workflows/ci-ffi-python.yml
index 458ed5d..233e021 100644
--- a/.github/workflows/ci-ffi-python.yml
+++ b/.github/workflows/ci-ffi-python.yml
@@ -2,7 +2,7 @@ name: Python Package
 
 on:
   push:
-    branches: [ main ]
+    branches:
   pull_request:
     branches: [ main ]
 
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest # TODO try using grafana runners
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build in Docker
         run: make wheel/linux/amd64
 
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        PYTHON_VERSION: [ '3.7', '3.8', '3.9', '3.10', '3.11', '3.12']
+        PYTHON_VERSION: [ '3.9', '3.10', '3.11', '3.12', '3.13']
     needs: [ 'linux-build' ]
     name: Linux Test
     runs-on: ubuntu-latest
@@ -36,18 +36,18 @@ jobs:
       PYTHON_VERSION: ${{ matrix.PYTHON_VERSION }}
     steps:
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.PYTHON_VERSION }}
           architecture: x64
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
           name: "linux.whl"
           path: "${{github.workspace}}/python"
 
       - run: "cd ${{ github.workspace }}/python && ls -l"
       - run: "cd ${{ github.workspace }}/python && pip install *.whl"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: docker run -d -p4040:4040 grafana/pyroscope
       - run: python pyroscope_ffi/python/scripts/tests/test.py
 
@@ -56,7 +56,7 @@ jobs:
     runs-on: github-hosted-ubuntu-arm64
     steps:
       - uses: AutoModality/action-clean@v1
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Build in Docker
         run: make wheel/linux/arm64
 
@@ -70,8 +70,8 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Upgrade pip
@@ -91,33 +91,29 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - macos-version: "11.0"
+          - macos-version: "14"
             target: x86_64-apple-darwin
-            py-platform: macosx-11_0_x86_64
             mk-arch: amd64
-          - macos-version: "11.0"
+          - macos-version: "14"
             target: aarch64-apple-darwin
-            py-platform: macosx-11_0_arm64
             mk-arch: arm64
 
-    name: macOS - ${{ matrix.py-platform }}
+    name: macOS - ${{ matrix.target }}
     runs-on: macos-${{ matrix.macos-version }}
 
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          toolchain: 1.76.0
-          target: ${{ matrix.target }}
-          profile: minimal
-          override: true
+          toolchain: 1.82.0
+          targets: ${{ matrix.target }}
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.11
 
       - run: make wheel/mac/${{ matrix.mk-arch }}
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.sha }}
+          name: ${{ github.sha }}-python-${{ matrix.target }}
           path: pyroscope_ffi/python/dist/*
diff --git a/.github/workflows/ci-ffi-ruby.yml b/.github/workflows/ci-ffi-ruby.yml
index c1db0e7..5b26027 100644
--- a/.github/workflows/ci-ffi-ruby.yml
+++ b/.github/workflows/ci-ffi-ruby.yml
@@ -2,7 +2,7 @@ name: Ruby Package
 
 on:
   push:
-    branches: [main]
+    branches:
   pull_request:
     branches: [main]
 
@@ -13,7 +13,7 @@ jobs:
 
     steps:
       - uses: AutoModality/action-clean@v1
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: make gem/linux/amd64
       - uses: actions/upload-artifact@v4
         with:
@@ -24,12 +24,13 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - macos-version: "11.0"
+          - macos-version: "14"
             target: x86_64-apple-darwin
             mk-arch: amd64
-          - macos-version: "11.0"
+          - macos-version: "14"
             target: aarch64-apple-darwin
             mk-arch: arm64
+
     name: macOS - ${{ matrix.target }}
     runs-on: macos-${{ matrix.macos-version }}
 
@@ -37,20 +38,18 @@ jobs:
       RUST_TARGET: ${{ matrix.target }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1'
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          toolchain: 1.76.0
-          target: ${{ matrix.target }}
-          profile: minimal
-          override: true
+          toolchain: 1.82.0
+          targets: ${{ matrix.target }}
       - run: make gem/mac/${{ matrix.mk-arch }}
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ github.sha }}
+          name: ${{ github.sha }}-ruby-${{ matrix.target }}
           path: pyroscope_ffi/ruby/pkg/*.gem
 
   linux-test:
@@ -59,7 +58,7 @@ jobs:
       matrix:
         PYROSCOPE_DETECT_SUBPROCESSES: [1, 0]
         PYROSCOPE_ONCPU: [1, 0]
-        RUBY_VERSION: ['2.6', '2.7', '3.0', '3.1', '3.2']
+        RUBY_VERSION: ['3.1', '3.2', '3.3']
     needs: ['linux-build']
     name: Linux Test
     runs-on: ubuntu-latest
@@ -67,13 +66,13 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.RUBY_VERSION }}
-      - uses: actions/download-artifact@v2
+      - uses: actions/download-artifact@v4
         with:
           name: "linux.gem"
           path: "${{github.workspace}}/ruby"
       - run: "cd ${{ github.workspace }}/ruby && ls -l"
       - run: "cd ${{ github.workspace }}/ruby && gem install *.gem"
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run Ruby Script
         run: pyroscope_ffi/ruby/scripts/tests/test.rb
         env:
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index b0ba7b2..b370c15 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -11,11 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     if: "startsWith(github.event.release.tag_name, 'lib-')"
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          toolchain: stable
-          override: true
+          toolchain: 1.82.0
       - name: publish pyroscope crate
         continue-on-error: true
         run: |
@@ -26,13 +25,12 @@ jobs:
 #    runs-on: ubuntu-latest
 #    if: "startsWith(github.event.release.tag_name, 'cli-')"
 #    steps:
-#      - uses: actions/checkout@v3
+#      - uses: actions/checkout@v4
 #        with:
 #          submodules: recursive
-#      - uses: actions-rs/toolchain@v1
+#      - uses: dtolnay/rust-toolchain@v1
 #        with:
-#          toolchain: stable
-#          override: true
+#          toolchain: 1.82.0
 #      - name: install libunwind (for pprof)
 #        run: sudo apt install libunwind8-dev
 #      - name: publish pyroscope crate
@@ -45,11 +43,10 @@ jobs:
     runs-on: ubuntu-latest
     if: "startsWith(github.event.release.tag_name, 'pprofrs-')"
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          toolchain: stable
-          override: true
+          toolchain: 1.82.0
       - name: publish pprofrs crate
         continue-on-error: true
         run: |
@@ -60,11 +57,10 @@ jobs:
     runs-on: ubuntu-latest
     if: "startsWith(github.event.release.tag_name, 'rbspy-')"
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          toolchain: stable
-          override: true
+          toolchain: 1.82.0
       - name: publish rbspy crate
         continue-on-error: true
         run: |
@@ -75,11 +71,10 @@ jobs:
     runs-on: ubuntu-latest
     if: "startsWith(github.event.release.tag_name, 'pyspy-')"
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions-rs/toolchain@v1
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          toolchain: stable
-          override: true
+          toolchain: 1.82.0
       - name: publish pyspy crate
         continue-on-error: true
         run: |
@@ -90,7 +85,7 @@ jobs:
     runs-on: ubuntu-latest
     if: "startsWith(github.event.release.tag_name, 'python-')"
     steps:
-      - uses: robinraju/release-downloader@v1.4
+      - uses: robinraju/release-downloader@v1
         with: 
           tag: ${{ github.event.release.tag_name }}
           fileName: "*"
@@ -99,7 +94,7 @@ jobs:
           out-file-path: "dist"
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Publish a Python distribution to PyPI
-        uses: pypa/gh-action-pypi-publish@release/v1
+        uses: pypa/gh-action-pypi-publish@v1.12.2
         with:
           user: __token__
           password: ${{ secrets.PYPI_API_TOKEN }}
@@ -110,7 +105,7 @@ jobs:
     outputs:
       files_json: ${{ steps.list-files.outputs.files_json }}
     steps:
-      - uses: robinraju/release-downloader@v1.4
+      - uses: robinraju/release-downloader@v1
         with:
           tag: ${{ github.event.release.tag_name }}
           fileName: "*"
@@ -138,7 +133,7 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1'
-      - uses: robinraju/release-downloader@v1.4
+      - uses: robinraju/release-downloader@v1
         with: 
           tag: ${{ github.event.release.tag_name }}
           fileName: "*"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 671431c..d61e504 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -21,8 +21,8 @@ jobs:
     runs-on: ubuntu-latest
     if: "startsWith(github.ref, 'refs/tags/clibuilder-')"
     steps:
-      - uses: actions/checkout@v3
-      - uses: docker/login-action@v2
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
         name: Login to Docker Hub
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -34,8 +34,8 @@ jobs:
     runs-on: ubuntu-latest
     if: "startsWith(github.ref, 'refs/tags/manylinux-')"
     steps:
-      - uses: actions/checkout@v3
-      - uses: docker/login-action@v2
+      - uses: actions/checkout@v4
+      - uses: docker/login-action@v3
         name: Login to Docker Hub
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -63,10 +63,10 @@ jobs:
     needs: cli-release
     runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           submodules: recursive
-      - uses: docker/login-action@v2
+      - uses: docker/login-action@v3
         name: Login to Docker Hub
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
@@ -75,7 +75,7 @@ jobs:
       - run: DOCKER_EXTRA="--output=." make cli/docker-image
 
       - name: Upload release archive
-        uses: actions/upload-release-asset@v1.0.1
+        uses: actions/upload-release-asset@v1.0.2
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
@@ -128,7 +128,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: AutoModality/action-clean@v1
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: make wheel/linux/amd64
       - uses: actions/upload-artifact@v4
         with:
@@ -148,7 +148,7 @@ jobs:
     runs-on: github-hosted-ubuntu-arm64
     steps:
       - uses: AutoModality/action-clean@v1
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: make wheel/linux/arm64
       - uses: actions/upload-artifact@v4
         with:
@@ -168,29 +168,25 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - macos-version: "11.0"
+          - macos-version: "14"
             target: x86_64-apple-darwin
-            py-platform: macosx-11_0_x86_64
             mk-arch: amd64
-          - macos-version: "11.0"
+          - macos-version: "14"
             target: aarch64-apple-darwin
-            py-platform: macosx-11_0_arm64
             mk-arch: arm64
 
-    name: macOS - ${{ matrix.py-platform }}
+    name: macOS - ${{ matrix.target }}
     runs-on: macos-${{ matrix.macos-version }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          toolchain: 1.76.0
+          toolchain: 1.82.0
           target: ${{ matrix.target }}
-          profile: minimal
-          override: true
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.11
 
@@ -215,9 +211,9 @@ jobs:
 
     steps:
       - uses: AutoModality/action-clean@v1
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
-      - uses: actions/setup-python@v4
+      - uses: actions/setup-python@v5
         with:
           python-version: 3.9
       - name: Upgrade pip
@@ -261,7 +257,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: AutoModality/action-clean@v1
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: make gem/linux/amd64
       - uses: actions/upload-artifact@v4
         with:
@@ -281,7 +277,7 @@ jobs:
     name: Release Linux gem arm64
     runs-on: github-hosted-ubuntu-arm64
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: make gem/linux/arm64
       - uses: actions/upload-artifact@v4
         with:
@@ -302,10 +298,10 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - macos-version: "11.0"
+          - macos-version: "14"
             target: x86_64-apple-darwin
             mk-arch: amd64
-          - macos-version: "11.0"
+          - macos-version: "14"
             target: aarch64-apple-darwin
             mk-arch: arm64
 
@@ -313,16 +309,14 @@ jobs:
     runs-on: macos-${{ matrix.macos-version }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '3.1'
-      - uses: actions-rs/toolchain@v1
+      - uses: dtolnay/rust-toolchain@v1
         with:
-          toolchain: 1.76.0
+          toolchain: 1.82.0
           target: ${{ matrix.target }}
-          profile: minimal
-          override: true
 
       - run: make pyroscope_ffi/clean gem/mac/${{ matrix.mk-arch }}
 
@@ -346,7 +340,7 @@ jobs:
 
     steps:
       - uses: AutoModality/action-clean@v1
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: ruby/setup-ruby@v1
         with:
diff --git a/docker/Dockerfile.cli b/docker/Dockerfile.cli
index a587c95..ef1cb21 100644
--- a/docker/Dockerfile.cli
+++ b/docker/Dockerfile.cli
@@ -11,8 +11,6 @@ RUN --mount=type=cache,target=/root/.cargo/registry \
     cd pyroscope_cli && \
     cargo build --release --bin pyroscope-cli
 
-
-
 FROM scratch as final
 
 COPY --from=builder /app/pyroscope_cli/target/release/pyroscope-cli /pyroscope-cli
diff --git a/docker/Dockerfile.cli_builder b/docker/Dockerfile.cli_builder
index 590626b..c690c8f 100644
--- a/docker/Dockerfile.cli_builder
+++ b/docker/Dockerfile.cli_builder
@@ -1,13 +1,9 @@
-
-
-
-FROM alpine:3.18 as rust-builder
+FROM alpine:3.20 AS rust-builder
 
 RUN apk add wget
 ARG TARGETPLATFORM
 
-
-
+ENV RUST_VERSION=1.82
 RUN case "${TARGETPLATFORM}" in                       \
     "linux/amd64")                                    \
         echo 'export RUST_TARGET="x86_64-unknown-linux-musl"' > ./.env ;;    \
@@ -20,18 +16,19 @@ RUN case "${TARGETPLATFORM}" in                       \
 RUN source ./.env  && \
     wget https://static.rust-lang.org/rustup/dist/${RUST_TARGET}/rustup-init && \
     chmod +x rustup-init && \
-    ./rustup-init  -y --default-toolchain=1.76.0 --default-host=${RUST_TARGET}
+    ./rustup-init -y --default-toolchain=${RUST_VERSION} --default-host=${RUST_TARGET}
 ENV PATH=/root/.cargo/bin:$PATH
 
 
+ENV LIBUNWIND_VERSION=1.8.1
 RUN apk add make gcc musl-dev
 RUN source ./.env && \
-     wget https://github.com/libunwind/libunwind/releases/download/v1.6.2/libunwind-1.6.2.tar.gz && \
-     tar -zxvf libunwind-1.6.2.tar.gz && \
-     cd libunwind-1.6.2 && \
-     ./configure --disable-minidebuginfo --enable-ptrace --disable-tests --disable-documentation --prefix=/usr/local/musl/${RUST_TARGET} && \
-     make -j16 && \
-     make install
+    wget https://github.com/libunwind/libunwind/releases/download/v${LIBUNWIND_VERSION}/libunwind-${LIBUNWIND_VERSION}.tar.gz && \
+    tar -zxvf libunwind-${LIBUNWIND_VERSION}.tar.gz && \
+    cd libunwind-${LIBUNWIND_VERSION} && \
+    ./configure --disable-minidebuginfo --enable-ptrace --disable-tests --disable-documentation --prefix=/usr/local/musl/${RUST_TARGET} && \
+    make -j16 && \
+    make install
 
 RUN source ./.env && \
     wget https://zlib.net/zlib-1.3.1.tar.gz && \
diff --git a/docker/Dockerfile.manylinux2014_aarch64 b/docker/Dockerfile.manylinux2014_aarch64
index ddd5cf9..2c1fab4 100644
--- a/docker/Dockerfile.manylinux2014_aarch64
+++ b/docker/Dockerfile.manylinux2014_aarch64
@@ -1,16 +1,17 @@
 FROM --platform=linux/aarch64 quay.io/pypa/manylinux2014_aarch64
 
-
-RUN curl https://static.rust-lang.org/rustup/dist/aarch64-unknown-linux-musl/rustup-init -o ./rustup-init \
+ENV RUST_VERSION=1.82
+RUN curl https://static.rust-lang.org/rustup/dist/$(arch)-unknown-linux-musl/rustup-init -o ./rustup-init \
     && chmod +x ./rustup-init \
-    && ./rustup-init  -y --default-toolchain=1.76.0 --default-host=aarch64-unknown-linux-gnu
+    && ./rustup-init  -y --default-toolchain=${RUST_VERSION} --default-host=$(arch)-unknown-linux-gnu
 ENV PATH=/root/.cargo/bin:$PATH
 RUN yum -y install gcc libffi-devel openssl-devel wget
 
 # for python
-RUN wget https://github.com/libunwind/libunwind/releases/download/v1.6.2/libunwind-1.6.2.tar.gz \
-    && tar -zxvf libunwind-1.6.2.tar.gz \
-    && cd libunwind-1.6.2 \
+ENV LIBUNWIND_VERSION=1.8.1
+RUN wget https://github.com/libunwind/libunwind/releases/download/v${LIBUNWIND_VERSION}/libunwind-${LIBUNWIND_VERSION}.tar.gz \
+    && tar -zxvf libunwind-${LIBUNWIND_VERSION}.tar.gz \
+    && cd libunwind-${LIBUNWIND_VERSION} \
     && ./configure --disable-minidebuginfo --enable-ptrace --disable-tests --disable-documentation \
     && make \
     && make install
diff --git a/docker/Dockerfile.manylinux2014_x86_64 b/docker/Dockerfile.manylinux2014_x86_64
index da07ba2..97de0e3 100644
--- a/docker/Dockerfile.manylinux2014_x86_64
+++ b/docker/Dockerfile.manylinux2014_x86_64
@@ -1,16 +1,17 @@
 FROM --platform=linux/amd64 quay.io/pypa/manylinux2014_x86_64
 
-
-RUN curl https://static.rust-lang.org/rustup/dist/x86_64-unknown-linux-musl/rustup-init -o ./rustup-init \
+ENV RUST_VERSION=1.82
+RUN curl https://static.rust-lang.org/rustup/dist/$(arch)-unknown-linux-musl/rustup-init -o ./rustup-init \
     && chmod +x ./rustup-init \
-    && ./rustup-init  -y --default-toolchain=1.76.0 --default-host=x86_64-unknown-linux-gnu
+    && ./rustup-init  -y --default-toolchain=${RUST_VERSION} --default-host=$(arch)-unknown-linux-gnu
 ENV PATH=/root/.cargo/bin:$PATH
 RUN yum -y install gcc libffi-devel openssl-devel wget
 
 # for python
-RUN wget https://github.com/libunwind/libunwind/releases/download/v1.6.2/libunwind-1.6.2.tar.gz \
-    && tar -zxvf libunwind-1.6.2.tar.gz \
-    && cd libunwind-1.6.2 \
+ENV LIBUNWIND_VERSION=1.8.1
+RUN wget https://github.com/libunwind/libunwind/releases/download/v${LIBUNWIND_VERSION}/libunwind-${LIBUNWIND_VERSION}.tar.gz \
+    && tar -zxvf libunwind-${LIBUNWIND_VERSION}.tar.gz \
+    && cd libunwind-${LIBUNWIND_VERSION} \
     && ./configure --disable-minidebuginfo --enable-ptrace --disable-tests --disable-documentation \
     && make \
     && make install
diff --git a/docker/gem.Dockerfile b/docker/gem.Dockerfile
index 06bb887..44f36b2 100644
--- a/docker/gem.Dockerfile
+++ b/docker/gem.Dockerfile
@@ -1,6 +1,5 @@
 ARG BASE
 
-
 FROM ${BASE} as builder-native
 
 WORKDIR /pyroscope-rs
@@ -18,9 +17,7 @@ ADD pyroscope_ffi/ pyroscope_ffi/
 RUN cargo build -p rbspy --release
 RUN cargo build -p thread_id --release
 
-
-
-FROM ruby:3.1 as builder-gem
+FROM ruby:3.3 as builder-gem
 WORKDIR /gem
 ADD pyroscope_ffi/ruby /gem/
 
@@ -32,4 +29,4 @@ ARG TARGET_TASK
 RUN rake ${TARGET_TASK}
 
 FROM scratch
-COPY --from=builder-gem /gem/pkg/ /pkg/
\ No newline at end of file
+COPY --from=builder-gem /gem/pkg/ /pkg/
diff --git a/docker/wheel.Dockerfile b/docker/wheel.Dockerfile
index 40c2274..4e4a867 100644
--- a/docker/wheel.Dockerfile
+++ b/docker/wheel.Dockerfile
@@ -1,6 +1,21 @@
-ARG BASE
+ARG PLATFORM=x86_64
+FROM quay.io/pypa/manylinux2014_${PLATFORM} AS builder
 
-FROM ${BASE} as builder
+ENV RUST_VERSION=1.82
+RUN curl https://static.rust-lang.org/rustup/dist/$(arch)-unknown-linux-musl/rustup-init -o ./rustup-init \
+    && chmod +x ./rustup-init \
+    && ./rustup-init  -y --default-toolchain=${RUST_VERSION} --default-host=$(arch)-unknown-linux-gnu
+ENV PATH=/root/.cargo/bin:$PATH
+RUN yum -y install gcc libffi-devel openssl-devel wget gcc-c++ glibc-devel make
+
+# for python
+ENV LIBUNWIND_VERSION=1.8.1
+RUN wget https://github.com/libunwind/libunwind/releases/download/v${LIBUNWIND_VERSION}/libunwind-${LIBUNWIND_VERSION}.tar.gz \
+    && tar -zxvf libunwind-${LIBUNWIND_VERSION}.tar.gz \
+    && cd libunwind-${LIBUNWIND_VERSION} \
+    && ./configure --disable-minidebuginfo --enable-ptrace --disable-tests --disable-documentation \
+    && make \
+    && make install
 
 WORKDIR /pyroscope-rs
 
@@ -18,4 +33,4 @@ ADD pyroscope_ffi/ pyroscope_ffi/
 RUN cd /pyroscope-rs/pyroscope_ffi/python && ./manylinux.sh
 
 FROM scratch
-COPY --from=builder /pyroscope-rs/pyroscope_ffi/python/dist dist/
\ No newline at end of file
+COPY --from=builder /pyroscope-rs/pyroscope_ffi/python/dist dist/
diff --git a/ffi.mk b/ffi.mk
index 9ff25cd..95f3d36 100644
--- a/ffi.mk
+++ b/ffi.mk
@@ -14,7 +14,7 @@ pyroscope_ffi/clean:
 .phony: wheel/linux/amd64
 wheel/linux/amd64: pyroscope_ffi/clean
 	docker buildx build \
-		--build-arg=BASE=$(MANYLINUX_PREFIX)_$(BUILD_ARCH_AMD):$(MANYLINUX_VERSION) \
+		--build-arg=PLATFORM=x86_64 \
 	 	--platform=linux/amd64 \
 	 	--output=pyroscope_ffi/python \
 	 	-f docker/wheel.Dockerfile \
@@ -23,7 +23,7 @@ wheel/linux/amd64: pyroscope_ffi/clean
 .phony: wheel/linux/arm64
 wheel/linux/arm64: pyroscope_ffi/clean
 	docker buildx build \
-		--build-arg=BASE=$(MANYLINUX_PREFIX)_$(BUILD_ARCH_ARM):$(MANYLINUX_VERSION) \
+		--build-arg=PLATFORM=aarch64 \
 	 	--platform=linux/arm64 \
 	 	--output=pyroscope_ffi/python \
 	 	-f docker/wheel.Dockerfile \
diff --git a/pyroscope_ffi/python/manylinux.sh b/pyroscope_ffi/python/manylinux.sh
index 9a17cb3..ea338dd 100755
--- a/pyroscope_ffi/python/manylinux.sh
+++ b/pyroscope_ffi/python/manylinux.sh
@@ -5,7 +5,7 @@ cargo --version
 
 # Build wheels
 # todo this one is deprecated, use "build" package
-/opt/python/cp37-cp37m/bin/python setup.py bdist_wheel
+/opt/python/cp39-cp39/bin/python setup.py bdist_wheel
 
 # Audit wheels
 for wheel in dist/*-linux_*.whl; do
diff --git a/pyroscope_ffi/python/setup.cfg b/pyroscope_ffi/python/setup.cfg
index 43c5679..cd0aee6 100644
--- a/pyroscope_ffi/python/setup.cfg
+++ b/pyroscope_ffi/python/setup.cfg
@@ -8,7 +8,8 @@ url = https://pyroscope.io
 maintainer = Abid Omar 
 maintainer_email = contact@pyroscope.io 
 license = Apache 2.0
-license_file = LICENSE
+license_files = 
+    LICENSE
 classifiers =
     Intended Audience :: Developers
     License :: OSI Approved :: Apache Software License