diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c5931839b0b48a83197cd1128ccbb659da901868..01e86963d65dddb18788e7e3d67830701089f448 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,7 +8,8 @@ variables:
   DOCKER_DRIVER: overlay2
 
   HELM_VERSION: 3.2.4
-  KUBERNETES_VERSION: 1.13.12
+  KUBERNETES_VERSION: 1.15.12
+  ALPINE_VERSION: '3.12'
   GLIBC_VERSION: 2.31-r0
 
   BUILD_IMAGE_NAME: "$CI_REGISTRY_IMAGE/$CI_COMMIT_REF_SLUG:$CI_COMMIT_SHA"
diff --git a/.gitlab/ci/build.gitlab-ci.yml b/.gitlab/ci/build.gitlab-ci.yml
index d81a08ed1b0d4343bff4b964cf51c134b714aea7..4e8402d76823e7078d4706665a701e0d6ea43154 100644
--- a/.gitlab/ci/build.gitlab-ci.yml
+++ b/.gitlab/ci/build.gitlab-ci.yml
@@ -10,6 +10,7 @@ build:
        docker build
        --build-arg "HELM_VERSION=$HELM_VERSION"
        --build-arg "KUBERNETES_VERSION=$KUBERNETES_VERSION"
+       --build-arg "ALPINE_VERSION=$ALPINE_VERSION"
        --build-arg "GLIBC_VERSION=$GLIBC_VERSION"
        --tag "$BUILD_IMAGE_NAME" .
     - docker push "$BUILD_IMAGE_NAME"
diff --git a/.gitlab/ci/release.gitlab-ci.yml b/.gitlab/ci/release.gitlab-ci.yml
index 2b126f8ae1c6174f24691fb211f4481566de69b8..bdca3c03ee129d81e758afbe8b4aa161483a54ba 100644
--- a/.gitlab/ci/release.gitlab-ci.yml
+++ b/.gitlab/ci/release.gitlab-ci.yml
@@ -53,8 +53,8 @@ publish-dryrun:
   script:
     - semantic-release -d |tee output.log
     # Check if the bundled chart version matches the next auto-deploy-image version.
-    - git diff @..@^ --name-only | grep 'assets/auto-deploy-app'
-    - if [[ "$?" != "0" ]]; then echo 'This change does not contain changes for the chart. Skip the validation' && exit 0; fi
+    - has_chart_changes=$(git diff @..@^ --name-only | grep 'assets/auto-deploy-app' && exit 0 || echo -n)
+    - if [ -z "$has_chart_changes" ]; then echo 'This change does not contain changes for the chart. Skip the validation'; exit 0; fi
     - next_release_version=$(cat output.log | grep -oP "The next release version is \K.*$") || true
     - bundled_chart_version=$(cat assets/auto-deploy-app/Chart.yaml | grep -oP "version:\s*\K.*$")
     - echo "next_release_version is $next_release_version"
@@ -64,7 +64,7 @@ publish-dryrun:
         cat <<- EOS
       [WARN] auto-deploy-app chart version outdated!
       This merge request changes auto-deploy-app chart, however, the chart version is not updated yet.
-      Please set ${next_release_version} to the version column in assets/auto-deploy-app/Chart.yaml to resovle this error.
+      Please set ${next_release_version} to the version column in assets/auto-deploy-app/Chart.yaml to resolve this error.
       EOS
       exit 1
       fi
diff --git a/Dockerfile b/Dockerfile
index b89144f866cc37801e42a7dd205514f84dd66191..6c724e2232dd60d9861c6e13116758d9a8b0d066 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,8 @@
 ARG HELM_VERSION
 ARG KUBERNETES_VERSION
+ARG ALPINE_VERSION
 
-FROM "registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/${HELM_VERSION}-kube-${KUBERNETES_VERSION}"
+FROM "registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/${HELM_VERSION}-kube-${KUBERNETES_VERSION}-alpine-${ALPINE_VERSION}"
 
 # https://github.com/sgerrand/alpine-pkg-glibc
 ARG GLIBC_VERSION