diff --git a/registry/nvcr.io/hpc/lammps/container.yaml b/registry/nvcr.io/hpc/lammps/container.yaml
index 61025a50d..5022d1683 100644
--- a/registry/nvcr.io/hpc/lammps/container.yaml
+++ b/registry/nvcr.io/hpc/lammps/container.yaml
@@ -16,3 +16,5 @@ tags:
   29Sep2021: sha256:6c40caaa7c2aadd0e49748ddef584a7d88235651479e416919ced889e2156596
 filter:
 - '2021'
+features:
+  gpu: true
diff --git a/registry/nvcr.io/hpc/namd/container.yaml b/registry/nvcr.io/hpc/namd/container.yaml
index 32b2f670e..b927737b4 100644
--- a/registry/nvcr.io/hpc/namd/container.yaml
+++ b/registry/nvcr.io/hpc/namd/container.yaml
@@ -23,3 +23,5 @@ aliases:
   psfgen: /usr/local/bin/psfgen
   sortreplicas: /usr/local/bin/sortreplicas
   vmd: /usr/local/bin/vmd
+features:
+  gpu: true
diff --git a/registry/nvcr.io/hpc/preflightcheck/container.yaml b/registry/nvcr.io/hpc/preflightcheck/container.yaml
index 1fbdd2673..9730a3719 100644
--- a/registry/nvcr.io/hpc/preflightcheck/container.yaml
+++ b/registry/nvcr.io/hpc/preflightcheck/container.yaml
@@ -9,3 +9,5 @@ maintainer: '@vsoch'
 url: https://ngc.nvidia.com/catalog/containers/hpc:preflightcheck
 description: The Pre-Flight Check container verifies that the container runtime is
   setup correctly for GPUs and InfiniBand.
+features:
+  gpu: true
diff --git a/registry/nvcr.io/hpc/quantum_espresso/container.yaml b/registry/nvcr.io/hpc/quantum_espresso/container.yaml
index eca38ec6b..b2f7b73c6 100644
--- a/registry/nvcr.io/hpc/quantum_espresso/container.yaml
+++ b/registry/nvcr.io/hpc/quantum_espresso/container.yaml
@@ -13,3 +13,5 @@ tags:
   qe-7.1: sha256:e525848fd411302f1e941b34f145a988a0ea2d300e14c93d3deec291c4c88edc
 filter:
 - v*
+features:
+  gpu: true
diff --git a/registry/nvcr.io/nvidia-hpcvis/paraview/container.yaml b/registry/nvcr.io/nvidia-hpcvis/paraview/container.yaml
index 73c5411c4..dce842f93 100644
--- a/registry/nvcr.io/nvidia-hpcvis/paraview/container.yaml
+++ b/registry/nvcr.io/nvidia-hpcvis/paraview/container.yaml
@@ -16,3 +16,5 @@ aliases:
   pvbatch: /opt/paraview/bin/pvbatch
   pypython: /opt/paraview/bin/pvpython
   pvserver: /opt/paraview/bin/pvserver
+features:
+  gpu: true
diff --git a/registry/nvcr.io/nvidia/digits/container.yaml b/registry/nvcr.io/nvidia/digits/container.yaml
index d1189d021..dead1519c 100644
--- a/registry/nvcr.io/nvidia/digits/container.yaml
+++ b/registry/nvcr.io/nvidia/digits/container.yaml
@@ -16,3 +16,6 @@ tags:
   21.07-tensorflow-py3: sha256:84a670644b33b6e1bfe19f67779517110ec6cb5a6082fb3ed974c79cc5a01389
 aliases:
   python: /usr/bin/python
+features:
+  gpu: true
+
diff --git a/registry/nvcr.io/nvidia/hpc-benchmarks/container.yaml b/registry/nvcr.io/nvidia/hpc-benchmarks/container.yaml
index 764fbcd82..23e20579e 100644
--- a/registry/nvcr.io/nvidia/hpc-benchmarks/container.yaml
+++ b/registry/nvcr.io/nvidia/hpc-benchmarks/container.yaml
@@ -22,3 +22,5 @@ maintainer: '@vsoch'
 url: https://ngc.nvidia.com/catalog/containers/nvidia:hpc-benchmarks/tags
 description: 'The NVIDIA HPC-Benchmarks collection provides three NVIDIA accelerated
   HPC benchmarks: HPL-NVIDIA, HPL-AI-NVIDIA, and HPCG-NVIDIA.'
+features:
+  gpu: true
diff --git a/registry/nvcr.io/nvidia/rapidsai/rapidsai/container.yaml b/registry/nvcr.io/nvidia/rapidsai/rapidsai/container.yaml
index eb92e7e73..f0d979d09 100644
--- a/registry/nvcr.io/nvidia/rapidsai/rapidsai/container.yaml
+++ b/registry/nvcr.io/nvidia/rapidsai/rapidsai/container.yaml
@@ -18,3 +18,5 @@ filter:
 - ^((?!base).)*$
 aliases:
   python: /opt/conda/bin/python
+features:
+  gpu: true
diff --git a/registry/nvcr.io/nvidia/tensorflow/container.yaml b/registry/nvcr.io/nvidia/tensorflow/container.yaml
index e88a094bb..7f1a8d1e5 100644
--- a/registry/nvcr.io/nvidia/tensorflow/container.yaml
+++ b/registry/nvcr.io/nvidia/tensorflow/container.yaml
@@ -28,3 +28,5 @@ tags:
   22.07-tf2-py3: sha256:5ceb426d476b0c24104fd8b036d6c8f7ef0d1579b133f53158f891861cddab1f
 filter:
 - 21*
+features:
+  gpu: true