diff --git a/ubuntu/22.04/Dockerfile b/ubuntu/22.04/Dockerfile
index 791ac0189c..025ab6e124 100644
--- a/ubuntu/22.04/Dockerfile
+++ b/ubuntu/22.04/Dockerfile
@@ -26,7 +26,11 @@ RUN apt-get -qq update && \
       valgrind \
       vim \
       wget \
-      xsltproc
+      xsltproc \
+      ncurses-bin \
+      libncurses-dev \
+      && rm -rf /var/lib/apt/lists/* \
+      && apt-get clean
 
 # Install Clingo for Spack
 RUN python3 -m pip install --upgrade pip && \
@@ -48,6 +52,7 @@ RUN python3 -m pip install botocore boto3 && \
 # Find packages already installed on system, e.g. autoconf
 RUN spack external find && \
     spack config add 'packages:all:target:[x86_64]' && \
+    spack config add 'concretizer:reuse:true' && \
     # Install a new CMake
     spack install cmake@3.20.4
 
diff --git a/ubuntu/dpcpp-cuda/Dockerfile b/ubuntu/dpcpp-cuda/Dockerfile
new file mode 100644
index 0000000000..d049532da2
--- /dev/null
+++ b/ubuntu/dpcpp-cuda/Dockerfile
@@ -0,0 +1,11 @@
+ARG cuda_version
+FROM ghcr.io/rse-ops/cuda-ubuntu-22.04:$cuda_version
+
+# Install dpc++ with spack
+ARG dpcpp_version
+ENV dpcpp_version=$dpcpp_version
+ENV spack_spec=dpcpp@${dpcpp_version} build_type=MinSizeRel +cuda+lld+openmp+shared
+
+RUN spack install ${spack_spec}
+RUN spack view --dependencies no symlink --ignore-conflicts /opt/view ${spack_spec} && \
+  spack compiler find
diff --git a/ubuntu/dpcpp-cuda/uptodate.yaml b/ubuntu/dpcpp-cuda/uptodate.yaml
new file mode 100644
index 0000000000..a1832ead9c
--- /dev/null
+++ b/ubuntu/dpcpp-cuda/uptodate.yaml
@@ -0,0 +1,16 @@
+dockerbuild:
+  build_args:
+    dpcpp_version:
+      key: dpcpp
+      name: dpcpp
+      type: spack
+      startat: "2021.09"
+
+    # Look for ubuntu versions for our base builds
+    cuda_version:
+      key: cuda
+      name: ghcr.io/rse-ops/cuda-ubuntu-22.04
+      type: container
+      startat: "10.1.243"
+      # filter:
+      #   - "^[0-9]+[.]04$"
diff --git a/ubuntu/dpcpp-hip/Dockerfile b/ubuntu/dpcpp-hip/Dockerfile
new file mode 100644
index 0000000000..d8320794c4
--- /dev/null
+++ b/ubuntu/dpcpp-hip/Dockerfile
@@ -0,0 +1,11 @@
+ARG hip_version
+FROM ghcr.io/rse-ops/hip-ubuntu-22.04:$hip_version
+
+# Install dpc++ with spack
+ARG dpcpp_version
+ENV dpcpp_version=$dpcpp_version
+ENV spack_spec=dpcpp@${dpcpp_version} build_type=MinSizeRel +rocm+lld+openmp+shared
+
+RUN spack install ${spack_spec}
+RUN spack view --dependencies no symlink --ignore-conflicts /opt/view ${spack_spec} && \
+  spack compiler find
diff --git a/ubuntu/dpcpp-hip/uptodate.yaml b/ubuntu/dpcpp-hip/uptodate.yaml
new file mode 100644
index 0000000000..be50aba85c
--- /dev/null
+++ b/ubuntu/dpcpp-hip/uptodate.yaml
@@ -0,0 +1,16 @@
+dockerbuild:
+  build_args:
+    dpcpp_version:
+      key: dpcpp
+      name: dpcpp
+      type: spack
+      startat: "2021.09"
+
+    # Look for ubuntu versions for our base builds
+    hip_version:
+      key: hip
+      name: ghcr.io/rse-ops/hip-ubuntu-22.04
+      type: container
+      startat: "4.2.0"
+      # filter:
+      #   - "^[0-9]+[.]04$"