diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml
index 1aa712f..d32e028 100644
--- a/.github/workflows/docker-build.yaml
+++ b/.github/workflows/docker-build.yaml
@@ -20,12 +20,13 @@ jobs:
           - alpine
           - fedora
         terraform:
-          - v1.0
-          - v1.1
-          - v1.2
+          - v1.6
+          - v1.7
+          - v1.8
+          - v1.9
 
     env:
-      TERRAFORM_LATEST: "v1.2"
+      TERRAFORM_LATEST: "v1.9"
 
     steps:
       - name: Checkout
@@ -86,25 +87,25 @@ jobs:
           fi
           
           echo "Short terraform: ${SHORT_TERRAFORM}"
-          echo "::set-output name=terraform::$SHORT_TERRAFORM"
+          echo "terraform=$SHORT_TERRAFORM" >> $GITHUB_OUTPUT
           
           echo "Short tag enabled: $SHORT_TAG_ENABLED"
-          echo "::set-output name=short-enabled::$SHORT_TAG_ENABLED"
+          echo "short-enabled=$SHORT_TAG_ENABLED" >> $GITHUB_OUTPUT
           
           echo "Release tag: ${RELEASE_TAG}"
-          echo "::set-output name=release-tag::$RELEASE_TAG"
+          echo "release-tag=$RELEASE_TAG" >> $GITHUB_OUTPUT
           
           echo "Release tag enabled: $RELEASE_TAG_ENABLED"
-          echo "::set-output name=release-tag-enabled::$RELEASE_TAG_ENABLED"
+          echo "release-tag-enabled=$RELEASE_TAG_ENABLED" >> $GITHUB_OUTPUT
           
           echo "Release tag short enabled: $RELEASE_TAG_SHORT_ENABLED"
-          echo "::set-output name=release-tag-short-enabled::$RELEASE_TAG_SHORT_ENABLED"
+          echo "release-tag-short-enabled=$RELEASE_TAG_SHORT_ENABLED" >> $GITHUB_OUTPUT
           
           echo "Base enabled: $BASE_ENABLED"
-          echo "::set-output name=base-enabled::$BASE_ENABLED"
+          echo "base-enabled=$BASE_ENABLED" >> $GITHUB_OUTPUT
           
           echo "Latest enabled: $LATEST_ENABLED"
-          echo "::set-output name=latest-enabled::$LATEST_ENABLED"
+          echo "latest-enabled=$LATEST_ENABLED" >> $GITHUB_OUTPUT
 
       - name: Docker CNTK meta ${{ matrix.base }}:${{ matrix.terraform }}
         id: cntk-meta
diff --git a/Containerfile-alpine b/Containerfile-alpine
index a5388c7..e58191c 100644
--- a/Containerfile-alpine
+++ b/Containerfile-alpine
@@ -1,37 +1,40 @@
-ARG TERRAFORM_VERSION=v1.2
-FROM quay.io/cloudnativetoolkit/cli-tools-core:${TERRAFORM_VERSION}-v1.6.1-alpine
+ARG TERRAFORM_VERSION=v1.9
+FROM quay.io/cloudnativetoolkit/cli-tools-core:${TERRAFORM_VERSION}-v2.0.0-alpine
 
 ARG TARGETPLATFORM
 
 ENV TF_CLI_ARGS_apply="-parallelism=6"
 
+USER root
+
 ## AWS cli
-RUN sudo apk add --no-cache \
+RUN apk add --no-cache --force-broken-world \
+        aws-cli && \
+    rm -rf /var/cache/apk/*
+
+## Azure cli
+RUN apk add --no-cache --force-broken-world \
         python3 \
         py3-pip \
-    && sudo pip3 install --upgrade pip \
-    && sudo pip3 install awscli \
-    && sudo rm -rf /var/cache/apk/* \
-    && aws --version
+        gcc \
+        musl-dev \
+        python3-dev \
+        libffi-dev \
+        openssl-dev \
+        cargo \
+        make && \
+    rm -rf /var/cache/apk/* && \
+    pip3 install --upgrade --break-system-packages pip
 
-## Azure cli
-RUN sudo apk add gcc musl-dev python3-dev libffi-dev openssl-dev cargo make python3 py3-pip \
-    && sudo pip3 install --upgrade pip \
-    && sudo pip3 install azure-cli \
-    && sudo rm -rf /var/cache/apk/* \
-    && az --version
+USER devops
+
+RUN pip3 install --break-system-packages azure-cli
 
 # Install the ibmcloud cli
 RUN curl -fsSL https://clis.cloud.ibm.com/install/linux | sh && \
     ibmcloud plugin install container-service -f && \
     ibmcloud plugin install container-registry -f && \
     ibmcloud plugin install observe-service -f && \
-    if [[ "$TARGETPLATFORM" != "linux/arm64" ]]; then ibmcloud plugin install vpc-infrastructure -f; fi && \
+    ibmcloud plugin install vpc-infrastructure -f && \
     ibmcloud config --check-version=false && \
     chmod -R g=u ${HOME}
-
-WORKDIR ${HOME}
-
-VOLUME /workspaces
-
-ENTRYPOINT ["/bin/sh"]
diff --git a/Containerfile-fedora b/Containerfile-fedora
index dabe8ce..c2e8857 100644
--- a/Containerfile-fedora
+++ b/Containerfile-fedora
@@ -1,31 +1,47 @@
-ARG TERRAFORM_VERSION=v1.2
-FROM quay.io/cloudnativetoolkit/cli-tools-core:${TERRAFORM_VERSION}-v1.6.1-fedora
+ARG TERRAFORM_VERSION=v1.9
+FROM quay.io/cloudnativetoolkit/cli-tools-core:${TERRAFORM_VERSION}-v2.0.0-fedora
 
 ARG TARGETPLATFORM
 
 ENV TF_CLI_ARGS_apply="-parallelism=6"
 
+USER root
+
 ## AWS cli
-RUN sudo dnf install -y \
-        python3 \
-        python3-pip \
-    && sudo pip3 install --upgrade pip \
-    && sudo pip3 install awscli \
-    && sudo dnf clean all \
-    && aws --version
+RUN dnf install -y \
+        awscli && \
+    dnf clean all
 
 ## Azure cli
-RUN sudo rpm --import https://packages.microsoft.com/keys/microsoft.asc && \
-    sudo dnf install -y https://packages.microsoft.com/config/rhel/8/packages-microsoft-prod.rpm && \
-    sudo dnf install -y azure-cli && \
-    sudo dnf clean all && \
-    az --version
+RUN dnf install -y \
+        python3 \
+        pip3 \
+        gcc \
+        musl-devel \
+        python3-devel \
+        libffi-devel \
+        openssl-devel \
+        cargo \
+        make && \
+    dnf clean all && \
+    pip3 install --upgrade --break-system-packages pip
+
+USER devops
+
+# Azure cli
+RUN pip3 install --break-system-packages azure-cli
 
 # Install the ibmcloud cli
+
+USER root
+
 RUN curl -fsSL https://clis.cloud.ibm.com/install/linux | sh && \
     ibmcloud plugin install container-service -f && \
     ibmcloud plugin install container-registry -f && \
     ibmcloud plugin install observe-service -f && \
-    if [[ "$TARGETPLATFORM" != "linux/arm64" ]]; then ibmcloud plugin install vpc-infrastructure -f; fi && \
+    ibmcloud plugin install vpc-infrastructure -f && \
     ibmcloud config --check-version=false && \
-    chmod -R g=u ${HOME}
+    chown -R devops ${HOME}/.bluemix && \
+    chmod -R g=u ${HOME}/.bluemix
+
+USER devops