diff --git a/server/docker/containers/cpuhorovod/Dockerfile b/server/docker/containers/cpuhorovod/Dockerfile
index b616878..7a981b1 100644
--- a/server/docker/containers/cpuhorovod/Dockerfile
+++ b/server/docker/containers/cpuhorovod/Dockerfile
@@ -1,45 +1,7 @@
-ARG UBUNTU_VERSION=18.04
-FROM ubuntu:${UBUNTU_VERSION}
+from horovod/horovod-cpu
+# Switch to root user to install additional software
+USER 0
 
-# Arguments for the build. UBUNTU_VERSION needs to be repeated because
-# the first usage only applies to the FROM tag.
-ARG UBUNTU_VERSION=18.04
-ARG MPI_KIND=OpenMPI
-ARG PYTHON_VERSION=3.6
-ARG GPP_VERSION=7
-# NOTE: keep versions in sync with setup.py extras_require{'dev'}:
-ARG TENSORFLOW_PACKAGE=tensorflow-cpu==1.15.0
-ARG KERAS_PACKAGE=keras==2.2.4
-ARG PYTORCH_PACKAGE=torch==1.2.0+cpu
-ARG PYTORCH_LIGHTNING_PACKAGE=pytorch_lightning==0.7.6
-ARG TORCHVISION_PACKAGE=torchvision==0.4.0+cpu
-ARG MXNET_PACKAGE=mxnet==1.5.0
-ARG PYSPARK_PACKAGE=pyspark==2.4.7
-# if SPARK_PACKAGE is set, installs Spark into /spark from the tgz archive
-# if SPARK_PACKAGE is a preview version, installs PySpark from the tgz archive
-# see https://archive.apache.org/dist/spark/ for available packages, version must match PYSPARK_PACKAGE
-ARG SPARK_PACKAGE=spark-2.4.7/spark-2.4.7-bin-hadoop2.7.tgz
-ARG CCL_PACKAGE=master
-ARG HOROVOD_BUILD_FLAGS=""
-
-# Set default shell to /bin/bash
-SHELL ["/bin/bash", "-cu"]
-
-# Prepare to install specific g++ versions
-RUN apt-get update -qq && apt-get install -y --no-install-recommends software-properties-common
-RUN add-apt-repository ppa:ubuntu-toolchain-r/test
-
-# Install essential packages.
-RUN apt-get update -qq && apt-get install -y --no-install-recommends \
-        wget \
-        ca-certificates \
-        cmake \
-        openssh-client \
-        openssh-server \
-        git \
-        build-essential \
-        g++-${GPP_VERSION} \
-        moreutils
 
 # Make sure we don't get notifications we can't answer during building.
 env    DEBIAN_FRONTEND noninteractive
@@ -48,11 +10,6 @@ env    DEBIAN_FRONTEND noninteractive
 # Prepare scripts and configs
 add    ./scripts/start /start
 
-# Download and install everything from the repos.
-run    apt-get -q -y update; apt-get -q -y upgrade && \
-       apt-get -q -y install sudo openssh-server && \
-       mkdir /var/run/sshd
-
 
 # Set root password
 run    echo 'root:password' >> /root/passwdfile
@@ -75,225 +32,10 @@ expose 22
 # Assign /data as static volume.
 volume ["/data"]
 
-# Install Python.
-RUN apt-get update -qq && apt-get install -y python${PYTHON_VERSION} python${PYTHON_VERSION}-dev python${PYTHON_VERSION}-distutils
-RUN ln -s -f /usr/bin/python${PYTHON_VERSION} /usr/bin/python
-RUN ln -s -f /usr/bin/python${PYTHON_VERSION} /usr/bin/python${PYTHON_VERSION/%.*/}
-RUN wget --progress=dot:mega https://bootstrap.pypa.io/get-pip.py && python get-pip.py && rm get-pip.py
-RUN pip install --no-cache-dir -U --force pip setuptools requests pytest mock pytest-forked parameterized
-
-# Add launch helper scripts
-RUN echo "env SPARK_HOME=/spark SPARK_DRIVER_MEM=512m PYSPARK_PYTHON=/usr/bin/python${PYTHON_VERSION} PYSPARK_DRIVER_PYTHON=/usr/bin/python${PYTHON_VERSION} \"\$@\"" > /spark_env.sh
-RUN echo /spark_env.sh pytest -v --capture=no --continue-on-collection-errors --junit-xml=/artifacts/junit.\$1.\${HOROVOD_RANK:-\${OMPI_COMM_WORLD_RANK:-\${PMI_RANK}}}.\$2.xml \${@:2} > /pytest.sh
-RUN echo /spark_env.sh pytest -v --capture=no --continue-on-collection-errors --junit-xml=/artifacts/junit.\$1.standalone.\$2.xml \${@:2} > /pytest_standalone.sh
-RUN chmod a+x /spark_env.sh
-RUN chmod a+x /pytest.sh
-RUN chmod a+x /pytest_standalone.sh
-
-# Install Spark stand-alone cluster.
-RUN if [[ -n ${SPARK_PACKAGE} ]]; then \
-        wget --progress=dot:giga "https://www.apache.org/dyn/closer.lua/spark/${SPARK_PACKAGE}?action=download" -O - | tar -xzC /tmp; \
-        archive=$(basename "${SPARK_PACKAGE}") bash -c "mv -v /tmp/\${archive/%.tgz/} /spark"; \
-    fi
-
-# Install PySpark.
-RUN apt-get update -qq && apt install -y openjdk-8-jdk-headless
-RUN if [[ ${SPARK_PACKAGE} != *"-preview"* ]]; then \
-        pip install --no-cache-dir ${PYSPARK_PACKAGE}; \
-    else \
-        apt-get update -qq && apt-get install pandoc; \
-        pip install --no-cache-dir pypandoc; \
-        (cd /spark/python && python setup.py sdist && pip install --no-cache-dir dist/pyspark-*.tar.gz && rm dist/pyspark-*); \
-    fi
-
-# Install Ray.
-RUN pip install --no-cache-dir ray==1.3.0
-
-# Install MPI.
-RUN if [[ ${MPI_KIND} == "OpenMPI" ]]; then \
-        wget --progress=dot:mega -O /tmp/openmpi-3.0.0-bin.tar.gz https://github.com/horovod/horovod/files/1596799/openmpi-3.0.0-bin.tar.gz && \
-            cd /usr/local && tar -zxf /tmp/openmpi-3.0.0-bin.tar.gz && ldconfig && \
-            echo "mpirun -allow-run-as-root -np 2 -H localhost:2 -bind-to none -map-by slot -mca mpi_abort_print_stack 1" > /mpirun_command; \
-    elif [[ ${MPI_KIND} == "ONECCL" ]]; then \
-        wget --progress=dot:mega -O /tmp/oneccl.tar.gz https://github.com/oneapi-src/oneCCL/archive/${CCL_PACKAGE}.tar.gz && \
-            cd /tmp && tar -zxf oneccl.tar.gz && \
-            mkdir oneCCL-${CCL_PACKAGE}/build && cd oneCCL-${CCL_PACKAGE}/build && cmake .. -DCMAKE_INSTALL_PREFIX=/usr/local/oneccl -DCMAKE_BUILD_TYPE=Release && make -j install && \
-            cp /tmp/oneCCL-${CCL_PACKAGE}/mpi/include/*.h /usr/local/oneccl/include && \
-            cp /tmp/oneCCL-${CCL_PACKAGE}/mpi/bin/mpicc /usr/local/oneccl/bin && \
-            chmod +x /usr/local/oneccl/bin/mpicc && \
-            cp /tmp/oneCCL-${CCL_PACKAGE}/mpi/bin/mpicxx /usr/local/oneccl/bin && \
-            chmod +x /usr/local/oneccl/bin/mpicxx && \
-            cp /tmp/oneCCL-${CCL_PACKAGE}/mpi/bin/mpigcc /usr/local/oneccl/bin && \
-            chmod +x /usr/local/oneccl/bin/mpigcc && \
-            cp /tmp/oneCCL-${CCL_PACKAGE}/mpi/bin/mpigxx /usr/local/oneccl/bin && \
-            chmod +x /usr/local/oneccl/bin/mpigxx && \
-            cp /tmp/oneCCL-${CCL_PACKAGE}/mpi/lib/libmpicxx.so /usr/local/oneccl/lib && \
-            chmod +x /usr/local/oneccl/lib/libmpicxx.so && \
-            cp /tmp/oneCCL-${CCL_PACKAGE}/mpi/lib/libmpifort.so /usr/local/oneccl/lib && \
-            chmod +x /usr/local/oneccl/lib/libmpifort.so && \
-            sed -i 's/if \[ -z \"\${I_MPI_ROOT}\" \]/if [ -z \"${I_MPI_ROOT:-}\" ]/g' /usr/local/oneccl/env/setvars.sh && \
-            sed -i 's/ \$1/ \${1:-}/g' /usr/local/oneccl/env/setvars.sh && \
-            echo ". /usr/local/oneccl/env/setvars.sh" > /oneccl_env && \
-            chmod +x /oneccl_env && \
-            echo "export CCL_ATL_TRANSPORT=ofi; \
-                  export HOROVOD_CCL_CACHE=1; \
-                  echo \"\$(env)\"; \
-                  echo \"mpirun is \$(which mpirun)\"; \
-                  echo \"LD_LIBRARY_PATH is \$(echo \$LD_LIBRARY_PATH)\"; \
-                  echo \"oneCCL links with \$(ldd /usr/local/oneccl/lib/libccl.so)\"; \
-                  mpirun -np 2 -hosts localhost \$@" > /mpirun_command_ofi && \
-            chmod +x /mpirun_command_ofi && \
-            cp /mpirun_command_ofi /mpirun_command_mpi && \
-            sed -i 's/export CCL_ATL_TRANSPORT=ofi;/export CCL_ATL_TRANSPORT=mpi;/g' /mpirun_command_mpi && \
-            sed -i 's/export HOROVOD_CCL_CACHE=1;/export HOROVOD_CCL_CACHE=0;/g' /mpirun_command_mpi && \
-            echo "/mpirun_command_mpi" > /mpirun_command && \
-            echo "-L/usr/local/oneccl/lib -lmpi -I/usr/local/oneccl/include" > /mpicc_oneccl && \
-            chmod +x /mpicc_oneccl; \
-    elif [[ ${MPI_KIND} == "MPICH" ]]; then \
-        apt-get update -qq && apt-get install -y mpich && \
-            echo "mpirun -np 2" > /mpirun_command; \
-    fi
-
-# Install mpi4py.
-RUN if [[ ${MPI_KIND} != "None" ]]; then \
-        if [[ ${MPI_KIND} == "ONECCL" ]]; then \
-            export I_MPI_ROOT=/usr/local/oneccl; \
-            export MPICC=/usr/local/oneccl/bin/mpicc; \
-        fi; \
-        pip install --no-cache-dir mpi4py; \
-    fi
-
-# Install TensorFlow and Keras (releases).
-# Pin h5py only for tensorflow<2.5: https://github.com/h5py/h5py/issues/1732
-# Pin scipy!=1.4.0: https://github.com/scipy/scipy/issues/11237
-RUN if [[ ${TENSORFLOW_PACKAGE} != "tf-nightly" ]]; then \
-        pip install --no-cache-dir ${TENSORFLOW_PACKAGE}; \
-        if [[ ${KERAS_PACKAGE} != "None" ]]; then \
-            if [[ ${TENSORFLOW_PACKAGE} == tensorflow*==1.* ]] || [[ ${TENSORFLOW_PACKAGE} == tensorflow*==2.[01234].* ]]; then \
-                h5py="h5py<3"; \
-            fi; \
-            pip install --no-cache-dir ${KERAS_PACKAGE} ${h5py:-} "scipy!=1.4.0" "pandas<1.1.0"; \
-        fi; \
-        mkdir -p ~/.keras; \
-        python -c "import tensorflow as tf; tf.keras.datasets.mnist.load_data()"; \
-    fi
-
-# Install PyTorch (releases).
-# Pin Pillow<7.0 for torchvision < 0.5.0: https://github.com/pytorch/vision/issues/1718
-RUN if [[ ${PYTORCH_PACKAGE} != "torch-nightly" ]]; then \
-        pip install --no-cache-dir ${PYTORCH_PACKAGE} ${TORCHVISION_PACKAGE} -f https://download.pytorch.org/whl/torch_stable.html; \
-        if [[ "${TORCHVISION_PACKAGE/%+*/}" == torchvision==0.[1234].* ]]; then \
-            pip install --no-cache-dir "Pillow<7.0" --no-deps; \
-        fi; \
-    fi
-RUN pip install ${PYTORCH_LIGHTNING_PACKAGE}
-
-
-# Install MXNet (releases).
-RUN if [[ ${MXNET_PACKAGE} != "mxnet-nightly" ]]; then \
-        pip install --no-cache-dir ${MXNET_PACKAGE} ; \
-    fi
-
-# Prefetch Spark MNIST dataset.
-RUN mkdir -p /work
-RUN mkdir -p /data && wget --progress=dot:mega https://horovod-datasets.s3.amazonaws.com/mnist.bz2 -O /data/mnist.bz2
-
-# Prefetch Spark Rossmann dataset.
-RUN mkdir -p /work
-RUN mkdir -p /data && wget --progress=dot:mega https://horovod-datasets.s3.amazonaws.com/rossmann.tgz -O - | tar -xzC /data
-
-# Prefetch PyTorch datasets.
-RUN wget --progress=dot:mega https://horovod-datasets.s3.amazonaws.com/pytorch_datasets.tgz -O - | tar -xzC /data
-
-### END OF CACHE ###
-COPY . /horovod
-
-# Install nightly packages here so they do not get cached
-
-# Install TensorFlow and Keras (nightly).
-# Do not pin h5py since tf>=2.5 requires h5py~=3.1
-# Pin scipy!=1.4.0: https://github.com/scipy/scipy/issues/11237
-RUN if [[ ${TENSORFLOW_PACKAGE} == "tf-nightly" ]]; then \
-        pip install --no-cache-dir ${TENSORFLOW_PACKAGE}; \
-        if [[ ${KERAS_PACKAGE} != "None" ]]; then \
-            pip install --no-cache-dir ${KERAS_PACKAGE} "scipy!=1.4.0" "pandas<1.1.0"; \
-        fi; \
-        mkdir -p ~/.keras; \
-        python -c "import tensorflow as tf; tf.keras.datasets.mnist.load_data()"; \
-    fi
-
-# Install PyTorch (nightly).
-# Pin Pillow<7.0 for torchvision < 0.5.0: https://github.com/pytorch/vision/issues/1718
-RUN if [[ ${PYTORCH_PACKAGE} == "torch-nightly" ]]; then \
-        pip install --no-cache-dir --pre torch ${TORCHVISION_PACKAGE} -f https://download.pytorch.org/whl/nightly/cpu/torch_nightly.html; \
-        if [[ "${TORCHVISION_PACKAGE/%+*/}" == torchvision==0.[1234].* ]]; then \
-            pip install --no-cache-dir "Pillow<7.0" --no-deps; \
-        fi; \
-    fi
-
-# Install MXNet (nightly).
-RUN if [[ ${MXNET_PACKAGE} == "mxnet-nightly" ]]; then \
-        pip install --no-cache-dir --pre mxnet -f https://dist.mxnet.io/python/all; \
-    fi
-
-# Install Horovod.
-RUN if [[ ${MPI_KIND} == "ONECCL" ]]; then \
-      if [ -z "${LD_LIBRARY_PATH:-}" ]; then \
-          export LD_LIBRARY_PATH=""; \
-      fi; \
-      if [ -z "${PYTHONPATH:-}" ]; then \
-          export PYTHONPATH=""; \
-      fi; \
-      . /usr/local/oneccl/env/setvars.sh; \
-      export I_MPI_ROOT=/usr/local/oneccl; \
-      echo "horovod python setup.py sdist, mpicxx is $(which mpicxx)"; \
-    fi; \
-    cd /horovod && \
-    python setup.py sdist && \
-    bash -c "${HOROVOD_BUILD_FLAGS} HOROVOD_WITH_TENSORFLOW=1 HOROVOD_WITH_PYTORCH=1 HOROVOD_WITH_MXNET=1 pip install --no-cache-dir -v $(ls /horovod/dist/horovod-*.tar.gz)[spark,ray]"
-
-# Hack for compatibility of MNIST example with TensorFlow 1.1.0.
-RUN if [[ ${TENSORFLOW_PACKAGE} == "tensorflow==1.1.0" ]]; then \
-        sed -i "s/from tensorflow import keras/from tensorflow.contrib import keras/" /horovod/examples/tensorflow/tensorflow_mnist.py; \
-    fi
-
-# Hack TensorFlow MNIST example to be smaller.
-RUN sed -i "s/last_step=20000/last_step=100/" /horovod/examples/tensorflow/tensorflow_mnist.py
-
-# Hack TensorFlow Eager MNIST example to be smaller.
-RUN sed -i "s/dataset.take(20000/dataset.take(100/" /horovod/examples/tensorflow/tensorflow_mnist_eager.py
-
-# Hack TensorFlow 2.0 example to be smaller.
-RUN sed -i "s/dataset.take(10000/dataset.take(100/" /horovod/examples/tensorflow2/tensorflow2_mnist.py
-
-# Hack Keras MNIST advanced example to be smaller.
-RUN sed -i "s/'--epochs', type=int, default=24,/'--epochs', type=int, default=9,/" /horovod/examples/keras/keras_mnist_advanced.py
-RUN sed -i "s/model.add(Conv2D(32, kernel_size=(3, 3),/model.add(Conv2D(1, kernel_size=(3, 3),/" /horovod/examples/keras/keras_mnist_advanced.py
-RUN sed -i "s/model.add(Conv2D(64, (3, 3), activation='relu'))//" /horovod/examples/keras/keras_mnist_advanced.py
-
-# Hack TensorFlow 2.0 Keras MNIST advanced example to be smaller.
-RUN sed -i "s/epochs = .*/epochs = 9/" /horovod/examples/tensorflow2/tensorflow2_keras_mnist.py
-RUN sed -i "s/tf.keras.layers.Conv2D(32, \\[3, 3\\],/tf.keras.layers.Conv2D(1, [3, 3],/" /horovod/examples/tensorflow2/tensorflow2_keras_mnist.py
-RUN sed -i "s/tf.keras.layers.Conv2D(64, \\[3, 3\\], activation='relu')),//" /horovod/examples/tensorflow2/tensorflow2_keras_mnist.py
-
-# Hack PyTorch MNIST example to be smaller.
-RUN sed -i "s/'--epochs', type=int, default=10,/'--epochs', type=int, default=2,/" /horovod/examples/pytorch/pytorch_mnist.py
-RUN sed -i "s/self.fc1 = nn.Linear(320, 50)/self.fc1 = nn.Linear(784, 50)/" /horovod/examples/pytorch/pytorch_mnist.py
-RUN sed -i "s/x = F.relu(F.max_pool2d(self.conv1(x), 2))//" /horovod/examples/pytorch/pytorch_mnist.py
-RUN sed -i "s/x = F.relu(F.max_pool2d(self.conv2_drop(self.conv2(x)), 2))//" /horovod/examples/pytorch/pytorch_mnist.py
-RUN sed -i "s/x = x.view(-1, 320)/x = x.view(-1, 784)/" /horovod/examples/pytorch/pytorch_mnist.py
-
-# Hack Keras Spark Rossmann Run example to be smaller.
-RUN sed -i "s/x = Dense(1000,/x = Dense(100,/g" /horovod/examples/spark/keras/keras_spark_rossmann_run.py
-RUN sed -i "s/x = Dense(500,/x = Dense(50,/g" /horovod/examples/spark/keras/keras_spark_rossmann_run.py
-
-# Hack Keras Spark Rossmann Estimator example to be smaller.
-RUN sed -i "s/x = Dense(1000,/x = Dense(100,/g" /horovod/examples/spark/keras/keras_spark_rossmann_estimator.py
-RUN sed -i "s/x = Dense(500,/x = Dense(50,/g" /horovod/examples/spark/keras/keras_spark_rossmann_estimator.py
 
 # Fix all permissions
 run    chmod +x /start
 
 
 # Starting sshd
-cmd    ["/start"]
+cmd    ["/start"]
\ No newline at end of file