diff --git a/utils/containers/sundials/Dockerfile b/utils/containers/Dockerfile
similarity index 53%
rename from utils/containers/sundials/Dockerfile
rename to utils/containers/Dockerfile
index 03b5d5e66c90188774bd350a2ed2ece70bb31a09..b3760588dd3f4f9c438cea859ffa0a546015521b 100644
--- a/utils/containers/sundials/Dockerfile
+++ b/utils/containers/Dockerfile
@@ -20,17 +20,17 @@ RUN apt-get update -y && \
python3-pip \
valgrind \
gdb &&\
- valgrind &&\
apt-get autoclean
RUN pip3 install xarray
RUN pip3 install netcdf4
-# Install the C++ Actor Framework From Git
-RUN git clone https://github.com/actor-framework/actor-framework.git
-WORKDIR /code/actor-framework
+# Install the C++ Actor Framework 0.18.6
+RUN wget https://github.com/actor-framework/actor-framework/archive/refs/tags/0.18.6.tar.gz
+RUN tar -xvf 0.18.6.tar.gz
+WORKDIR /code/actor-framework-0.18.6
RUN ./configure
-WORKDIR /code/actor-framework/build
+WORKDIR /code/actor-framework-0.18.6/build
RUN make
RUN make test
RUN make install
@@ -38,17 +38,16 @@ RUN make install
WORKDIR /code
# Install Sundials
-RUN wget https://github.com/LLNL/sundials/releases/download/v5.8.0/sundials-5.8.0.tar.gz
-RUN tar -xzf sundials-5.8.0.tar.gz
+RUN wget https://github.com/LLNL/sundials/releases/download/v6.3.0/sundials-6.3.0.tar.gz
+RUN tar -xzf sundials-6.3.0.tar.gz
RUN mkdir sundials
WORKDIR /code/sundials
-RUN mkdir instdir
+RUN mkdir /usr/local/sundials
RUN mkdir builddir
WORKDIR /code/sundials/builddir
-RUN cmake ../../sundials-5.8.0 -DBUILD_FORTRAN_MODULE_INTERFACE=ON -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_INSTALL_PREFIX=/code/sundials/instdir -DEXAMPLES_INSTALL_PATH=/code/sundials/instdir/examples
+RUN cmake ../../sundials-6.3.0 -DBUILD_FORTRAN_MODULE_INTERFACE=ON -DCMAKE_Fortran_COMPILER=gfortran -DCMAKE_INSTALL_PREFIX=/usr/local/sundials -DEXAMPLES_INSTALL_PATH=/code/sundials/instdir/examples
RUN make
RUN make install
# Change workdir for when we attach to this container
-WORKDIR /Summa-Actors
-ENV LD_LIBRARY_PATH=/Summa-Actors/bin:/usr/local/lib:/code/sundials/instdir/lib
\ No newline at end of file
+WORKDIR /Summa-Actors
\ No newline at end of file
diff --git a/utils/containers/apptainer/build_apptainer_container.sh b/utils/containers/apptainer/build_apptainer_container.sh
deleted file mode 100755
index fc9e567c6c5f29e0fdfd06dd26e152daaa947608..0000000000000000000000000000000000000000
--- a/utils/containers/apptainer/build_apptainer_container.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/bash
-
-sudo apptainer build summa_actors.sif summa_actors.def
diff --git a/utils/containers/apptainer/summa_actors.def b/utils/containers/apptainer/summa_actors.def
deleted file mode 100644
index ef19ce71362f426dc989b3548dd66197f5f73715..0000000000000000000000000000000000000000
--- a/utils/containers/apptainer/summa_actors.def
+++ /dev/null
@@ -1,36 +0,0 @@
-Bootstrap: docker
-From: ubuntu:20.04
-
-%post
- apt-get update
- # need to install locales and set to en_CA.UTF-8
- # this causes issues if not done
- apt-get install locales
- locale-gen en_CA.UTF-8
- apt-get upgrade -y && \
- DEBIAN_FRONTEND="noninteractive" apt-get install -y software-properties-common \
- libnetcdf-dev \
- libnetcdff-dev \
- liblapack-dev \
- libopenblas-dev \
- cmake \
- g++ \
- git \
- libssl-dev \
- make \
- gfortran \
- python3.8 \
- python3-pip \
- gdb &&\
- apt-get autoclean
-
- pip3 install xarray
- pip3 install netcdf4
- cd /opt
- git clone https://github.com/actor-framework/actor-framework.git
- cd actor-framework
- ./configure
- cd build
- make
- make test
- make install
diff --git a/utils/containers/docker/Dockerfile b/utils/containers/docker/Dockerfile
deleted file mode 100755
index 5e8d61e0841e70583d6d6975c917288ec2f1b46d..0000000000000000000000000000000000000000
--- a/utils/containers/docker/Dockerfile
+++ /dev/null
@@ -1,42 +0,0 @@
-FROM ubuntu:20.04
-
-WORKDIR /code
-
-# Get library dependencies
-RUN apt-get update -y && \
- apt-get upgrade -y && \
- DEBIAN_FRONTEND="noninteractive" apt-get install -y software-properties-common \
- libnetcdf-dev \
- libnetcdff-dev \
- liblapack-dev \
- libopenblas-dev \
- cmake \
- g++ \
- git \
- libssl-dev \
- make \
- gfortran \
- python3-pip \
- gdb &&\
- apt-get autoclean
-
-RUN pip3 install xarray
-RUN pip3 install netcdf4
-
-
-# Install the C++ Actor Framework From Git
-RUN git clone https://github.com/actor-framework/actor-framework.git
-WORKDIR /code/actor-framework
-RUN ./configure
-WORKDIR /code/actor-framework/build
-RUN make
-RUN make test
-RUN make install
-# Change workdir for when we attach to this container
-WORKDIR /Summa-Actors
-ENV LD_LIBRARY_PATH=/Summa-Actors/bin:/usr/local/lib
-
-
-
-
-
diff --git a/utils/containers/docker/build_docker_container.sh b/utils/containers/docker/build_docker_container.sh
deleted file mode 100755
index 1c462c678037556d8ecd856dad64c2fd4c3cc7eb..0000000000000000000000000000000000000000
--- a/utils/containers/docker/build_docker_container.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/bash
-
-docker build -t summa-actors .
\ No newline at end of file
diff --git a/utils/containers/docker/launch_docker_container.sh b/utils/containers/docker/launch_docker_container.sh
deleted file mode 100755
index 94723c4adea29c655bfeedd9e09f039c28999318..0000000000000000000000000000000000000000
--- a/utils/containers/docker/launch_docker_container.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/bash
-
-export PROJECT_DIR=/home/local/kck540/SUMMA-Projects/Summa-Distributed/Summa-Actors
-export GLADWELL=/gladwell
-docker run -d -it --name SUMMA-Actors --mount type=bind,source=${PROJECT_DIR},target=/Summa-Actors \
- --mount type=bind,source=${GLADWELL},target=/gladwell summa-actors:latest
\ No newline at end of file
diff --git a/utils/containers/sundials/build_docker_container.sh b/utils/containers/sundials/build_docker_container.sh
deleted file mode 100755
index f67064f8902c0569b5b3b4ede949bdcceccb513e..0000000000000000000000000000000000000000
--- a/utils/containers/sundials/build_docker_container.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/bash
-
-docker build -t summa-sundials .
\ No newline at end of file
diff --git a/utils/containers/sundials/launch_docker_container.sh b/utils/containers/sundials/launch_docker_container.sh
deleted file mode 100755
index 05c14770b41667d606c6e36fa5a7c24f97b37b5d..0000000000000000000000000000000000000000
--- a/utils/containers/sundials/launch_docker_container.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#! /bin/bash
-
-# Program Locations to bind
-export SUMMA_ACTORS=/Users/kyleklenk/SUMMA-Projects/Summa-Actors
-export SUMMA=/Users/kyleklenk/SUMMA-Projects/Summa-Sundials/summa
-export CONTAINTER_NAME="Summa-Sundials"
-docker run -d -it --name ${CONTAINTER_NAME} --mount type=bind,source=${SUMMA_ACTORS},target=/Summa-Actors \
- --mount type=bind,source=${SUMMA},target=/SUMMA summa-sundials:latest