diff --git a/.version b/.version
index fd2a018..944880f 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-3.1.0
+3.2.0
diff --git a/containers/Rocky.Cloud.Dockerfile b/containers/Rocky.Cloud.Dockerfile
index cd267a1..52ffab2 100644
--- a/containers/Rocky.Cloud.Dockerfile
+++ b/containers/Rocky.Cloud.Dockerfile
@@ -4,12 +4,8 @@ LABEL org.opencontainers.image.source https://github.com/dotmh/devcontainer
 LABEL org.opencontainers.image.licenses apache-2.0
 
 # Install Terraform
-RUN dnf install -y dnf-plugins-core &&\
-    dnf config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo &&\
+RUN dnf config-manager --add-repo https://rpm.releases.hashicorp.com/RHEL/hashicorp.repo &&\
     dnf install terraform -y
 
 # Install AWS 
-RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" &&\
-    which unzip &&\
-    \unzip ./awscliv2.zip &&\
-    ./aws/install
\ No newline at end of file
+RUN dnf -y install awscli
\ No newline at end of file
diff --git a/containers/Rocky.Dockerfile b/containers/Rocky.Dockerfile
index e9bd226..c9331fa 100644
--- a/containers/Rocky.Dockerfile
+++ b/containers/Rocky.Dockerfile
@@ -4,17 +4,15 @@ LABEL dev.containers.features="common"
 LABEL org.opencontainers.image.source https://github.com/dotmh/devcontainer
 LABEL org.opencontainers.image.licenses apache-2.0
 
+# Set up  extended repos
+RUN dnf -y install dnf-plugins-core &&\
+    dnf -y install epel-release
+
 RUN dnf -y update
 
 # Instal Development Tools (going to need these)
 RUN dnf -y group install "Development Tools"
 
-# Install some quailty of life utils
-RUN dnf -y install wget && dnf -y install unzip
-
-# Install RUST this is for EZA , BAT and Just
-RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y
-
 # Install ZSH
 RUN dnf -y install util-linux-user &&\ 
     dnf -y install zsh &&\ 
@@ -24,13 +22,10 @@ RUN dnf -y install util-linux-user &&\
 RUN sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
 
 # Install EZA https://github.com/eza-community/eza
-RUN . "$HOME/.cargo/env" &&\
-    cargo install eza
+RUN dnf -y install eza
 
 # Install BAT https://github.com/sharkdp/bat
-RUN . "$HOME/.cargo/env" &&\
-    cargo install bat
+RUN dnf -y install bat
 
 # Install Just https://github.com/casey/just
-RUN . "$HOME/.cargo/env" &&\
-    cargo install just
+RUN curl --proto '=https' --tlsv1.2 -sSf https://just.systems/install.sh | bash -s -- --to /usr/bin