diff --git a/.common-ci.yml b/.common-ci.yml
index 7280ff1..d2d4b29 100644
--- a/.common-ci.yml
+++ b/.common-ci.yml
@@ -75,6 +75,12 @@ stages:
     LOWER_CASE_SAMPLE: devicequery
     PUSH_SAMPLE_ONLY_TAG: "true"
 
+.sample-simple-multi-gpu:
+  variables:
+    SAMPLE: simpleMultiGPU
+    LOWER_CASE_SAMPLE: simplemultigpu
+    PUSH_SAMPLE_ONLY_TAG: "true"
+
 # Make buildx available as a docker CLI plugin
 .buildx-setup:
   before_script:
diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
index 7a8a223..d9d01ea 100644
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -39,6 +39,7 @@ jobs:
         - nbody
         - deviceQuery
         - nvbandwidth
+        - simpleMultiGPU
         exclude:
         - dist: ubi9
           sample: deviceQuery
@@ -46,6 +47,8 @@ jobs:
           sample: nbody
         - dist: ubi9
           sample: nvbandwidth
+        - dist: ubi9
+          sample: simpleMultiGPU
 
     steps:
       - uses: actions/checkout@v4
diff --git a/.nvidia-ci.yml b/.nvidia-ci.yml
index d14f52f..dbafd24 100644
--- a/.nvidia-ci.yml
+++ b/.nvidia-ci.yml
@@ -90,6 +90,12 @@ image-nbody-ubuntu22.04:
     - .dist-ubuntu22.04
     - .sample-nbody
 
+image-simple-multi-gpu-ubuntu22.04:
+  extends:
+    - .image-pull
+    - .dist-ubuntu22.04
+    - .sample-simple-multi-gpu
+
 # The .scan step forms the base of the image scan operation performed before releasing
 # images.
 .scan:
@@ -198,6 +204,25 @@ scan-nbody-ubuntu22.04-arm64:
     - image-nbody-ubuntu22.04
     - scan-nbody-ubuntu22.04-amd64
 
+scan-simple-multi-gpu-ubuntu22.04-amd64:
+  extends:
+    - .scan
+    - .sample-simple-multi-gpu
+    - .dist-ubuntu22.04
+    - .platform-amd64
+  needs:
+    - image-simple-multi-gpu-ubuntu22.04
+
+scan-simple-multi-gpu-ubuntu22.04-arm64:
+  extends:
+    - .scan
+    - .sample-simple-multi-gpu
+    - .dist-ubuntu22.04
+    - .platform-arm64
+  needs:
+    - image-simple-multi-gpu-ubuntu22.04
+    - scan-simple-multi-gpu-ubuntu22.04-amd64
+
 # Define external release helpers
 .release:ngc:
   extends:
@@ -233,3 +258,9 @@ release:ngc-nbody-ubuntu22.04:
     - .release:ngc
     - .dist-ubuntu22.04
     - .sample-nbody
+
+release:ngc-simple-multi-gpu-ubuntu22.04:
+  extends:
+    - .release:ngc
+    - .dist-ubuntu22.04
+    - .sample-simple-multi-gpu
diff --git a/mps/cuda-samples/Dockerfile b/mps/cuda-samples/Dockerfile
deleted file mode 100644
index 4b90741..0000000
--- a/mps/cuda-samples/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM nvidia/cuda:9.0-base-ubuntu16.04
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-        cuda-samples-$CUDA_PKG_VERSION && \
-    rm -rf /var/lib/apt/lists/*
-
-WORKDIR /usr/local/cuda/samples/5_Simulations/nbody
-
-RUN make -j"$(nproc)"
-
-CMD ["./nbody", "-benchmark", "-i=10000"]