diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 7ab8065..bd633c5 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -14,3 +14,58 @@ FROM ghcr.io/containercraft/devcontainer:latest
 #    && apt-get clean \
 #    && rm -rf /var/lib/apt/lists/* \
 #    && echo
+
+##################################################################################
+# Install AWS CLI v2
+
+USER root
+RUN echo \
+    && ARCH=$(uname -m | awk '{ if ($1 == "x86_64") print "x86_64"; else if ($1 == "aarch64" || $1 == "arm64") print "aarch64"; else print "unknown" }') \
+    && NAME="aws" \
+    && PKG="awscli-exe-linux-${ARCH}.zip" \
+    && URL="https://awscli.amazonaws.com/${PKG}" \
+    && DIR="/tmp/awscli" \
+    && echo "---------------------------------------------------------"\
+    && echo "INFO[${NAME}] Installed:" \
+    && echo "INFO[${NAME}]   Command:        ${NAME}" \
+    && echo "INFO[${NAME}]   Package:        ${PKG}" \
+    && echo "INFO[${NAME}]   Architecture:   ${ARCH}" \
+    && echo "INFO[${NAME}]   Source:         ${URL}" \
+    && echo "---------------------------------------------------------"\
+    && mkdir -p ${DIR} \
+    && curl -L ${URL} --output ${DIR}/${PKG} \
+    && unzip ${DIR}/${PKG} -d ${DIR} \
+    && bash ${DIR}/aws/install \
+    && rm -rf ${DIR} \
+    && aws --version \
+    && echo
+USER vscode
+
+###################################################################################
+## Install Google Cloud SDK
+#
+#ENV CLOUDSDK_INSTALL_DIR /usr/local/gcloud/
+#ENV PATH $PATH:/usr/local/gcloud/google-cloud-sdk/bin
+#
+#USER root
+#RUN echo \
+#    && export ARCH=$(uname -m | awk '{ if ($1 == "x86_64") print "amd64"; else if ($1 == "aarch64" || $1 == "arm64") print "arm64"; else print "unknown" }') \
+#    && export NAME="gcloud" \
+#    && export TEST="${NAME} version" \
+#    && export PKG="google-cloud-sdk.tar.gz" \
+#    && export URL="https://dl.google.com/dl/cloudsdk/release/${PKG}" \
+#    && export DIR="/usr/local/gcloud" \
+#    && echo "---------------------------------------------------------"\
+#    && echo "INFO[${NAME}] Installed:" \
+#    && echo "INFO[${NAME}]   Command:        ${NAME}" \
+#    && echo "INFO[${NAME}]   Package:        ${PKG}" \
+#    && echo "INFO[${NAME}]   Architecture:   ${ARCH}" \
+#    && echo "INFO[${NAME}]   Source:         ${URL}" \
+#    && echo "---------------------------------------------------------"\
+#    && mkdir -p ${DIR} \
+#    && ${curl} ${URL} | tar xzvf - --directory ${DIR} \
+#    && /usr/local/gcloud/google-cloud-sdk/install.sh -q \
+#    && ${dir_clean} \
+#    && ${TEST} \
+#    && echo
+#USER vscode
diff --git a/.envrc b/.envrc
index a8812a1..f65b84b 100644
--- a/.envrc
+++ b/.envrc
@@ -15,7 +15,7 @@ export BROWSER=echo
 ##################################################################################
 # Pulumi Environment Variables
 # - https://www.pulumi.com/docs/cli/environment-variables
-export PULUMI_HOME=$PWD/.pulumi
+#export PULUMI_HOME=$PWD/.pulumi
 export PULUMI_SKIP_UPDATE_CHECK=true
 export PULUMI_SKIP_CONFIRMATIONS=true
 export PULUMI_AUTOMATION_API_SKIP_VERSION_CHECK=true