diff --git a/stacks/pinot-noir/definitions_acc_cuda.yaml b/stacks/pinot-noir/definitions_acc_cuda.yaml
index 596c814bd1eb002ff9255656e9aee31419e11411..30bdd68fb0213b67952710d81f977de319faadc7 100644
--- a/stacks/pinot-noir/definitions_acc_cuda.yaml
+++ b/stacks/pinot-noir/definitions_acc_cuda.yaml
@@ -4,7 +4,7 @@ definitions:
   - cuda_serial_codes:
       - cuda
       - cudnn
-      - namd ^fftw ~mpi ^charmpp ~cuda
+      - namd ^fftw ~mpi
       - nccl
 
   - cuda_mpi_codes:
diff --git a/stacks/pinot-noir/packages_acc_cuda.yaml b/stacks/pinot-noir/packages_acc_cuda.yaml
index 3c9c4b0bc14ffc99f12a9c9f098e14ba085b38e0..f4eccc4f58d3513614e39f544fcff836ce49268e 100644
--- a/stacks/pinot-noir/packages_acc_cuda.yaml
+++ b/stacks/pinot-noir/packages_acc_cuda.yaml
@@ -16,6 +16,9 @@ packages:
   amber:
     require: ['+nccl']
 
+  charmpp:
+    require: ['+smp', '~cuda']
+
   cuda:
     prefer:
     - spec: "^gcc-runtime@{gcc_version} target={target}"