diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bbca5ada8..3336555cb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -57,7 +57,7 @@ simulation_stack:
 .spack_nvhpc:
   variables:
     SPACK_PACKAGE_COMPILER: nvhpc
-    SPACK_PACKAGE_DEPENDENCIES: ^hpe-mpi%gcc ^caliper~libdw~adiak~libunwind%gcc+cuda cuda_arch=70 ^python%gcc
+    SPACK_PACKAGE_DEPENDENCIES: ^hpe-mpi%gcc ^python%gcc
 .build_neuron:
   extends: [.build]
   timeout: two hours
@@ -183,44 +183,44 @@ build:neuron:nmodl:intel:shared:debug:
 build:neuron:mod2c:nvhpc:acc:shared:
   extends: [.build_neuron, .spack_nvhpc]
   variables:
-    SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit~nmodl~openmp+shared+tests~unified build_type=RelWithDebInfo
+    SPACK_PACKAGE_SPEC: ~caliper+gpu+coreneuron~legacy-unit~nmodl~openmp+shared+tests~unified build_type=RelWithDebInfo
 #  needs: ["build:coreneuron:mod2c:nvhpc:acc:shared"]
 
 build:neuron:nmodl:nvhpc:acc:debug:legacy:
   extends: [.build_neuron, .spack_nvhpc]
   needs: ["build:nmodl"]
   variables:
-    SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit+nmodl~openmp~shared~sympy+tests~unified build_type=Debug
+    SPACK_PACKAGE_SPEC: ~caliper+gpu+coreneuron~legacy-unit+nmodl~openmp~shared~sympy+tests~unified build_type=Debug
 #  needs: ["build:coreneuron:nmodl:nvhpc:acc:debug:legacy"]
 
 build:neuron:nmodl:nvhpc:acc:shared:
   extends: [.build_neuron, .spack_nvhpc]
   needs: ["build:nmodl"]
   variables:
-    SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit+nmodl~openmp+shared+sympy+tests~unified build_type=RelWithDebInfo
+    SPACK_PACKAGE_SPEC: ~caliper+gpu+coreneuron~legacy-unit+nmodl~openmp+shared+sympy+tests~unified build_type=RelWithDebInfo
 #  needs: ["build:coreneuron:nmodl:nvhpc:acc:shared"]
 
 build:neuron:nmodl:nvhpc:omp:legacy:
   extends: [.build_neuron, .spack_nvhpc]
   needs: ["build:nmodl"]
   variables:
-    SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit+nmodl+openmp~shared~sympy+tests~unified build_type=RelWithDebInfo
+    SPACK_PACKAGE_SPEC: ~caliper+gpu+coreneuron~legacy-unit+nmodl+openmp~shared~sympy+tests~unified build_type=RelWithDebInfo
 #  needs: ["build:coreneuron:nmodl:nvhpc:omp:legacy"]
 
 build:neuron:nmodl:nvhpc:omp:debug:
   extends: [.build_neuron, .spack_nvhpc]
   needs: ["build:nmodl"]
   variables:
-    SPACK_PACKAGE_SPEC: +caliper+gpu~legacy-unit+nmodl+openmp~shared+sympy+tests~unified build_type=Debug
+    SPACK_PACKAGE_SPEC: ~caliper+gpu+coreneuron~legacy-unit+nmodl+openmp~shared+sympy+tests~unified build_type=Debug
 #  needs: ["build:coreneuron:nmodl:nvhpc:omp:debug"]
 
 # Test CoreNEURON
-test:coreneuron:mod2c:intel:shared:debug:
-  extends: [.ctest]
+#test:coreneuron:mod2c:intel:shared:debug:
+#  extends: [.ctest]
 #  needs: ["build:coreneuron:mod2c:intel:shared:debug"]
 
-test:coreneuron:nmodl:intel:debug:legacy:
-  extends: [.ctest]
+#test:coreneuron:nmodl:intel:debug:legacy:
+#  extends: [.ctest]
 #  needs: ["build:coreneuron:nmodl:intel:debug:legacy"]
 
 #test:coreneuron:nmodl:intel:shared:debug: