diff --git a/Dockerfile b/Dockerfile
index f422e93..98a4540 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,9 +1,7 @@
-ARG GITPOD_VERSION="main.1988"
-
-FROM eu.gcr.io/gitpod-core-dev/build/installer:$GITPOD_VERSION as installer
-
 FROM alpine:edge
 
+ARG GITPOD_VERSION="2022.01"
+
 RUN apk add --no-cache \
     bash \
     curl \
@@ -31,7 +29,8 @@ RUN curl -fsSL "https://storage.googleapis.com/kubernetes-release/release/$(curl
 RUN curl -fsSL https://github.com/kubernetes-sigs/aws-iam-authenticator/releases/download/v0.5.3/aws-iam-authenticator_0.5.3_linux_amd64 -o /usr/local/bin/aws-iam-authenticator \
   && chmod +x /usr/local/bin/aws-iam-authenticator
 
-COPY --from=installer /app/installer /usr/local/bin/gitpod-installer
+RUN curl -fsSL https://github.com/gitpod-io/gitpod/releases/download/${GITPOD_VERSION}/gitpod-installer-linux-amd64 -o /usr/local/bin/gitpod-installer \
+  && chmod +x /usr/local/bin/gitpod-installer
 
 WORKDIR /gitpod
 
diff --git a/Makefile b/Makefile
index 028f04f..4591012 100644
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,10 @@ else
 endif
 
 build: ## Build docker image containing the required tools for the installation
-	@docker build --squash --quiet . -t ${IMG}
+	@docker build --quiet . -t ${IMG}
 	@mkdir -p ${PWD}/logs
 
 DOCKER_RUN_CMD = docker run -it \
-	--pull always \
 	--env-file ${PWD}/.env \
 	--env NODE_ENV=production \
 	--volume ${PWD}/.kubeconfig:/gitpod/.kubeconfig \