diff --git a/Project.toml b/Project.toml
index d1b245e..a38e7ee 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "KrylovPreconditioners"
 uuid = "45d422c2-293f-44ce-8315-2cb988662dec"
 authors = ["Alexis Montoison <alexis.montoison@polymtl.ca>"]
-version = "0.3.8"
+version = "0.4.0"
 
 [deps]
 Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e"
@@ -13,18 +13,21 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 
 [weakdeps]
 AMDGPU = "21141c5a-9bdb-4563-92ae-f87d6854732e"
-CUDA = "052768ef-5323-5732-b1bb-66c8b64840ba"
+CUDACore = "bd0ed864-bdfe-4181-a5ed-ce625a5fdea2"
+cuBLAS = "182d3088-87b7-4494-8cad-fc6afaa545bc"
+cuSPARSE = "b26da814-b3bc-49ef-b0ee-c816305aa060"
 oneAPI = "8f75cd03-7ff8-4ecb-9b8f-daf728133b1b"
 
 [extensions]
 KrylovPreconditionersAMDGPUExt = "AMDGPU"
-KrylovPreconditionersCUDAExt = "CUDA"
+KrylovPreconditionersCuBLASExt = ["CUDACore", "cuSPARSE", "cuBLAS"]
+KrylovPreconditionersCuSPARSEExt = ["CUDACore", "cuSPARSE"]
 KrylovPreconditionersOneAPIExt = "oneAPI"
 
 [compat]
 AMDGPU = "2.0.1"
 Adapt = "4"
-CUDA = "5.7.3, 6.2"
+CUDACore = "6.2"
 Graphs = "1.13.0"
 KernelAbstractions = "0.9"
 Krylov = "0.10.0"
@@ -33,6 +36,8 @@ Metis = "1"
 Random = "1.10"
 SparseArrays = "1.10"
 Test = "1.10"
+cuBLAS = "6.2"
+cuSPARSE = "6.2"
 julia = "1.10"
 oneAPI = "2.1.0"
 
diff --git a/ext/CUDA/block_jacobi.jl b/ext/CUDA/block_jacobi.jl
index d6af23c..7db787a 100644
--- a/ext/CUDA/block_jacobi.jl
+++ b/ext/CUDA/block_jacobi.jl
@@ -29,8 +29,8 @@ function _update_gpu(p, j_rowptr, j_colval, j_nzval, device::CUDABackend)
     for b in 1:nblocks
         p.blocklist[b] .= p.cublocks[:,:,b]
     end
-    CUDA.@sync pivot, info = CUBLAS.getrf_batched!(p.blocklist, true)
-    CUDA.@sync pivot, info, p.blocklist = CUBLAS.getri_batched(p.blocklist, pivot)
+    @sync pivot, info = CUBLAS.getrf_batched!(p.blocklist, true)
+    @sync pivot, info, p.blocklist = CUBLAS.getri_batched(p.blocklist, pivot)
     for b in 1:nblocks
         p.cublocks[:,:,b] .= p.blocklist[b]
     end
diff --git a/ext/KrylovPreconditionersCuBLASExt.jl b/ext/KrylovPreconditionersCuBLASExt.jl
new file mode 100644
index 0000000..5294f77
--- /dev/null
+++ b/ext/KrylovPreconditionersCuBLASExt.jl
@@ -0,0 +1,18 @@
+module KrylovPreconditionersCuBLASExt
+using LinearAlgebra
+using SparseArrays
+using CUDACore
+using CUDACore: @sync
+using cuSPARSE
+using cuBLAS
+const CUSPARSE = cuSPARSE
+const CUBLAS = cuBLAS
+
+using KrylovPreconditioners
+const KP = KrylovPreconditioners
+using KernelAbstractions
+const KA = KernelAbstractions
+
+include("CUDA/block_jacobi.jl")
+
+end
diff --git a/ext/KrylovPreconditionersCUDAExt.jl b/ext/KrylovPreconditionersCuSPARSEExt.jl
similarity index 77%
rename from ext/KrylovPreconditionersCUDAExt.jl
rename to ext/KrylovPreconditionersCuSPARSEExt.jl
index c30570a..7fa0c05 100644
--- a/ext/KrylovPreconditionersCUDAExt.jl
+++ b/ext/KrylovPreconditionersCuSPARSEExt.jl
@@ -1,8 +1,9 @@
-module KrylovPreconditionersCUDAExt
+module KrylovPreconditionersCuSPARSEExt
 using LinearAlgebra
 using SparseArrays
-using CUDA
-using CUDA.CUSPARSE, CUDA.CUBLAS
+using CUDACore
+using cuSPARSE
+const CUSPARSE = cuSPARSE
 using LinearAlgebra: checksquare, BlasReal, BlasFloat
 import LinearAlgebra: ldiv!, mul!
 import Base: size, eltype, unsafe_convert
@@ -14,7 +15,6 @@ const KA = KernelAbstractions
 
 include("CUDA/ic0.jl")
 include("CUDA/ilu0.jl")
-include("CUDA/block_jacobi.jl")
 include("CUDA/operators.jl")
 include("CUDA/scaling.jl")
 
diff --git a/test/gpu/nvidia.jl b/test/gpu/nvidia.jl
index c51d644..4c8e0d9 100644
--- a/test/gpu/nvidia.jl
+++ b/test/gpu/nvidia.jl
@@ -1,4 +1,4 @@
-using CUDA, CUDA.CUSPARSE, CUDA.CUSOLVER
+using CUDA, CUDA.cuSPARSE
 
 _get_type(J::CuSparseMatrixCSR) = CuArray{Float64, 1, CUDA.DeviceMemory}
 _get_type(J::CuSparseMatrixCSC) = CuArray{Float64, 1, CUDA.DeviceMemory}