diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e3e05fc..e5be8ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,10 @@ stages:
   - build
   - deploy
 
+variables:
+  - HUGO_IMAGE_TAG=arm
+  - AWS_IMAGE_TAG=0.2
+
 build:
   stage: build
   script:
diff --git a/Makefile b/Makefile
index b8890ea..9275bd8 100644
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,11 @@ WEBSITE=bdebyl.net
 STATIC_DIR=static
 
 HUGO_IMAGE_NAME=bdebyl/hugo
-HUGO_IMAGE_TAG=0.4.1
+HUGO_IMAGE_TAG?=latest
 HUGO_IMAGE=$(HUGO_IMAGE_NAME):$(HUGO_IMAGE_TAG)
 
 AWS_IMAGE_NAME=bdebyl/awscli
-AWS_IMAGE_TAG=0.2
+AWS_IMAGE_TAG?=latest
 AWS_IMAGE=$(AWS_IMAGE_NAME):$(AWS_IMAGE_TAG)
 
 # Container Variables