diff --git a/oci/base/alpine-chart-builder/Dockerfile b/oci/base/alpine-chart-builder/Dockerfile
index 0598334..7e88c16 100644
--- a/oci/base/alpine-chart-builder/Dockerfile
+++ b/oci/base/alpine-chart-builder/Dockerfile
@@ -7,25 +7,19 @@ ENV BASE_URL="https://get.helm.sh"
 ENV KUBECTL_VERSION="v1.21.0"
 ENV HELMFILE_VERSION="v0.139.9"
 
+RUN apk add --update --no-cache openssh bash wget make curl jq unzip zip git ca-certificates
 RUN case `uname -m` in \
-        x86_64) ARCH=amd64; ;; \
         aarch64) ARCH=arm64; ;; \
-        *) echo "un-supported arch, exit ..."; exit 1; ;; \
+        *) ARCH=amd64;       ;; \
     esac && \
-    apk add --update --no-cache openssh bash wget make curl jq unzip zip git ca-certificates && \
-    wget ${BASE_URL}/helm-v${VERSION}-linux-${ARCH}.tar.gz -O - | tar -xz && \
-    mv linux-${ARCH}/helm /usr/bin/helm && \
-    chmod +x /usr/bin/helm &&  \
-    rm -rf linux-${ARCH} &&    \
-    chmod 755 /usr//bin/helm && \
-    helm plugin install https://github.com/chartmuseum/helm-push.git && \
-    helm plugin install https://github.com/belitre/helm-push-artifactory-plugin.git --version v1.0.2 && \
-    helm plugin install https://github.com/databus23/helm-diff && \
-    wget -qO /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${ARCH}/kubectl && \
-    chmod +x /usr/bin/kubectl && \
-    wget -qO /usr/bin/helmfile https://github.com/roboll/helmfile/releases/download/${HELMFILE_VERSION}/helmfile_linux_${ARCH} && \
-    chmod +x /usr/bin/helmfile && \
-    helmfile init --force
+    wget -qO /usr/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${KUBECTL_VERSION}/bin/linux/${ARCH}/kubectl && chmod +x /usr/bin/kubectl ; \
+    wget ${BASE_URL}/helm-v${VERSION}-linux-${ARCH}.tar.gz -O - | tar -xz && mv linux-${ARCH}/helm /usr/bin/helm && chmod +x /usr/bin/helm                        ; \
+    helm plugin install https://github.com/databus23/helm-diff                                                                 ; \
+    helm plugin install https://github.com/chartmuseum/helm-push.git                                                           ; \
+    helm plugin install https://github.com/belitre/helm-push-artifactory-plugin.git --version v1.0.2                           ; \
+    wget -qO /usr/bin/helmfile https://github.com/roboll/helmfile/releases/download/${HELMFILE_VERSION}/helmfile_linux_${ARCH} && chmod +x /usr/bin/helmfile; \
+    helmfile init --force ; \
+    rm -rf *.tar.gz || true
 
 #ADD ca.crt /usr/share/ca-certificates/mozilla/Lets_Encrypt_ca.crt
 #RUN echo "mozilla/Lets_Encrypt_ca.crt" >> /etc/ca-certificates.conf && update-ca-certificates