diff --git a/Dockerfile.cpu b/Dockerfile.cpu
index c07f1740a..15360a55d 100644
--- a/Dockerfile.cpu
+++ b/Dockerfile.cpu
@@ -1,28 +1,46 @@
-FROM ledatelescope/bifrost:cpu-base
+FROM ubuntu:20.04
 
 MAINTAINER Ben Barsdell <benbarsdell@gmail.com>
 
 ARG DEBIAN_FRONTEND=noninteractive
 
-ENV TERM xterm
-
 # Get dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
-        python-pip \
+        build-essential \
+        curl \
+        git \
+        pkg-config \
+        software-properties-common \
+        python3 \
+        python3-dev \
+        python3-pip \
+        python-is-python3 \
         pylint \
+        doxygen \
+        exuberant-ctags \
+        nano \
+        vim \
         && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-# Update ctypesgen
 RUN pip --no-cache-dir install \
-        ctypesgen==1.0.2
+        setuptools \
+        numpy \
+        matplotlib \
+        contextlib2 \
+        simplejson \
+        pint \
+        ctypesgen==1.0.2 \
+        graphviz
+
+ENV TERM xterm
 
 # Build the library
 WORKDIR /bifrost
 COPY . .
-RUN make clean && \
-    make -j NOCUDA=1 && \
+RUN ./configure --disable-cuda && \
+    make -j && \
     make doc && \
     make install
 
diff --git a/Dockerfile.gpu b/Dockerfile.gpu
index c67f144ba..393bc1ca7 100644
--- a/Dockerfile.gpu
+++ b/Dockerfile.gpu
@@ -1,4 +1,4 @@
-FROM nvidia/cuda:10.2-devel-ubuntu18.04
+FROM nvidia/cuda:12.2.0-devel-ubuntu20.04
 
 MAINTAINER Ben Barsdell <benbarsdell@gmail.com>
 
@@ -11,9 +11,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         git \
         pkg-config \
         software-properties-common \
-        python \
-        python-dev \
-        python-pip \
+        python3 \
+        python3-dev \
+        python3-pip \
+        python-is-python3 \
         pylint \
         doxygen \
         exuberant-ctags \
@@ -38,7 +39,7 @@ ENV TERM xterm
 # Build the library
 WORKDIR /bifrost
 COPY . .
-RUN make clean && \
+RUN ./configure && \
     make -j && \
     make doc && \
     make install
diff --git a/Dockerfile_prereq.gpu b/Dockerfile_prereq.gpu
index ca8ca4e9c..5f3df4d98 100644
--- a/Dockerfile_prereq.gpu
+++ b/Dockerfile_prereq.gpu
@@ -1,4 +1,4 @@
-FROM nvidia/cuda:10.2-devel-ubuntu18.04
+FROM nvidia/cuda:12.2.0-devel-ubuntu20.04
 
 MAINTAINER Ben Barsdell <benbarsdell@gmail.com>
 
@@ -11,9 +11,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
         git \
         pkg-config \
         software-properties-common \
-        python \
-        python-dev \
-        python-pip \
+        python3 \
+        python3-dev \
+        python3-pip \
+        python-is-python3 \
+        pylint \
         doxygen \
         exuberant-ctags \
         nano \