diff --git a/.github/workflows/build-dev.yml b/.github/workflows/build-dev.yml
new file mode 100644
index 00000000..828e77e1
--- /dev/null
+++ b/.github/workflows/build-dev.yml
@@ -0,0 +1,40 @@
+name: Build Dev
+
+on:
+  pull_request:
+    branches:
+      - dev
+    paths:
+      - icicle/**
+      - src/**
+      - Cargo.toml
+      - build.rs
+
+env:
+  CARGO_TERM_COLOR: always
+  ARCH_TYPE: sm_70
+
+jobs:
+  build-linux:
+    runs-on: [self-hosted, Linux, X64, icicle]
+    steps:
+    - name: Checkout Repo
+      uses: actions/checkout@v3
+    - name: Build
+      run: cargo build --release --verbose
+      
+  
+  build-windows:
+    runs-on: windows-2022
+    steps:     
+    - name: Checkout Repo
+      uses: actions/checkout@v3
+    - name: Download and Install Cuda
+      uses: Jimver/cuda-toolkit@v0.2.11
+      with:
+        cuda: '12.0.0'
+        method: 'network'
+        # https://docs.nvidia.com/cuda/archive/12.0.0/cuda-installation-guide-microsoft-windows/index.html
+        sub-packages: '["cudart", "nvcc", "thrust"]'
+    - name: Build
+      run: cargo build --release --verbose
\ No newline at end of file
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 250d170a..fa130f86 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -7,16 +7,6 @@ on:
       - opened
     branches:
       - main
-      - dev
-    paths:
-      - icicle/**
-      - src/**
-      - Cargo.toml
-      - build.rs
-  push:
-    branches-ignore:
-      - main
-      - dev
     paths:
       - icicle/**
       - src/**
@@ -29,32 +19,25 @@ env:
 
 jobs:
   build-linux:
-    runs-on: ubuntu-latest
-
+    runs-on: [self-hosted, Linux, X64, icicle]
     steps:
-    # Checkout code
-    - uses: actions/checkout@v3
-    # Download (or from cache) and install CUDA Toolkit 12.1.0
-    - uses: Jimver/cuda-toolkit@v0.2.9
-      id: cuda-toolkit
-      with:
-        cuda: '12.1.0'
-        use-github-cache: true
-      # Build from cargo - Rust utils are preinstalled on latest images
-      # https://github.com/actions/runner-images/blob/main/images/linux/Ubuntu2204-Readme.md#rust-tools
+    - name: Checkout Repo
+      uses: actions/checkout@v3
     - name: Build
       run: cargo build --release --verbose
       
   
   build-windows:
-    runs-on: windows-latest
-
+    runs-on: windows-2022
     steps:     
-    - uses: actions/checkout@v3
-    - uses: Jimver/cuda-toolkit@v0.2.9
-      id: cuda-toolkit
+    - name: Checkout Repo
+      uses: actions/checkout@v3
+    - name: Download and Install Cuda
+      uses: Jimver/cuda-toolkit@v0.2.11
       with:
-        cuda: '12.1.0'
-        use-github-cache: true
+        cuda: '12.0.0'
+        method: 'network'
+        # https://docs.nvidia.com/cuda/archive/12.0.0/cuda-installation-guide-microsoft-windows/index.html
+        sub-packages: '["cudart", "nvcc", "thrust"]'
     - name: Build
       run: cargo build --release --verbose
\ No newline at end of file