diff --git a/README.md b/README.md
index eb2b3ab..939978b 100644
--- a/README.md
+++ b/README.md
@@ -7,5 +7,7 @@
 - npm
 - Serverless
 - Python
-- AWS CLI
+- AWS CLI v1 as `awsv1` and v2 as `aws`
 - jq
+- libxml
+- Org Formation CLI
diff --git a/default/Dockerfile b/default/Dockerfile
index b2e8caf..086083a 100644
--- a/default/Dockerfile
+++ b/default/Dockerfile
@@ -1,24 +1,43 @@
-FROM amazonlinux:2017.09-with-sources
-LABEL maintainer="Jared Short <jshort@trek10.com>"
+FROM public.ecr.aws/amazonlinux/amazonlinux:2.0.20201111.0
+LABEL maintainer="Lucas Pearson <lpearson@trek10.com>"
 
-RUN yum update -y
 # add nodejs repo
-RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash -
+RUN curl --silent --location https://rpm.nodesource.com/setup_14.x | bash -
 RUN yum -y install \
+  zip \
+  unzip \
   git \
   jq \
   nodejs \
   openssl-devel \
   python27-devel.x86_64 \
-  python36-devel \
+  python3 \
+  python3-devel \
   gcc \
+  libxml2-devel \
+  libxslt-devel \
   zlib-devel
 
-# install pip + aws cli
+# install pip + aws cli + libxml
 RUN curl -O https://bootstrap.pypa.io/get-pip.py && \
     python3 get-pip.py
 RUN pip install awscli --upgrade
-RUN pip install aws-sam-cli
+RUN pip install lxml
+
+# Move aws v1 to its own command awsv1
+RUN mv /usr/local/bin/aws /usr/local/bin/awsv1 
+
+# Latest version of aws cli
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
+    unzip awscliv2.zip && \
+    ./aws/install && \
+    rm -rf awscliv2.zip ./aws
 
 # update npm to latest version
 RUN npm install -g npm
+
+# Install sam cli
+RUN pip install aws-sam-cli
+
+# install org formation
+RUN npm install -g --production aws-organization-formation@0.9.17
diff --git a/serverless/Dockerfile b/serverless/Dockerfile
index b2b4d4e..6771cc6 100644
--- a/serverless/Dockerfile
+++ b/serverless/Dockerfile
@@ -1,27 +1,43 @@
-FROM amazonlinux:with-sources
-LABEL maintainer="Jared Short <jshort@trek10.com>"
+FROM public.ecr.aws/amazonlinux/amazonlinux:2.0.20201111.0
+LABEL maintainer="Lucas Pearson <lpearson@trek10.com>"
 
-RUN yum update -y
 # add nodejs repo
-RUN curl --silent --location https://rpm.nodesource.com/setup_8.x | bash -
+RUN curl --silent --location https://rpm.nodesource.com/setup_14.x | bash -
 RUN yum -y install \
+  zip \
+  unzip \
   git \
   jq \
   nodejs \
   openssl-devel \
-  python-devel.x86_64 \
+  python27-devel.x86_64 \
+  python3 \
+  python3-devel \
+  gcc \
+  libxml2-devel \
+  libxslt-devel \
   zlib-devel
 
-# install pip + aws cli
+# install pip + aws cli + libxml
 RUN curl -O https://bootstrap.pypa.io/get-pip.py && \
-    python get-pip.py
+    python3 get-pip.py
 RUN pip install awscli --upgrade
+RUN pip install lxml
 
-# install python 3
-RUN amazon-linux-extras install python3
+# Move aws v1 to its own command awsv1
+RUN mv /usr/local/bin/aws /usr/local/bin/awsv1 
+
+# Latest version of aws cli
+RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
+    unzip awscliv2.zip && \
+    ./aws/install && \
+    rm -rf awscliv2.zip ./aws
 
 # update npm to latest version
 RUN npm install -g npm
 
 # install serverless framework
-RUN npm install -g serverless@1.28.0
+RUN npm install -g serverless@2.52.1
+
+# install org formation
+RUN npm install -g --production aws-organization-formation@0.9.17