diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e775255..28a5591 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,17 +4,31 @@ image: docker:latest
 # improved performance.
 variables:
   DOCKER_DRIVER: overlay
-  IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+  IMAGE_NAME: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME
+  IMAGE_LATEST: $CI_REGISTRY_IMAGE:latest
 
 services:
-- docker:dind
+  - docker:dind
+
+stages:
+  - test
+  - deploy
 
 before_script:
   - docker info
   - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
 
-build:
-  stage: build
+test:
+  stage: test
   script:
-    - docker build -t $IMAGE_TAG .
-    - docker push $IMAGE_TAG
+    - docker build -t $IMAGE_NAME .
+    - docker run -v `pwd`:/git $IMAGE_NAME /bin/sh -c "wget -qO- https://fedoraproject.org/static/hotspot.txt | grep OK && cd /git && hugo"
+
+deploy:
+  stage: deploy
+  script:
+    - docker build -t $IMAGE_NAME -t $IMAGE_LATEST .
+    - docker push $IMAGE_NAME
+    - docker push $IMAGE_LATEST
+  only:
+    - tags
diff --git a/Dockerfile b/Dockerfile
index 5caa76f..ebd34c9 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,21 @@
 FROM alpine:latest
 
-ENV HUGO_VERSION 0.26
-ENV HUGO_SHA 67e4ba5ec2a02c8164b6846e30a17cc765b0165a5b183d5e480149baf54e1a50
+ENV HUGO_VERSION 0.27.1
+ENV HUGO_SHA 0e6cb63e6aca10277b96023c4fed97ac3a3e922d12f073b8a80630946fe289e7
 
 # Install HUGO
 RUN set -eux && \
-    apk add --update --no-cache --virtual .fetch-deps \
+    apk add --update --no-cache \
       ca-certificates \
-      openssl && \
+      openssl \
+      git && \
   wget -O ${HUGO_VERSION}.tar.gz https://github.com/spf13/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz && \
   echo "${HUGO_SHA}  ${HUGO_VERSION}.tar.gz" | sha256sum -c && \
   tar xf ${HUGO_VERSION}.tar.gz && mv hugo* /usr/bin/hugo && \
   rm -r ${HUGO_VERSION}.tar.gz && \
-  apk del .fetch-deps && \
   rm /var/cache/apk/* && \
   hugo version
 
 EXPOSE 1313
 
-CMD ["/usr/local/bin/hugo"]
\ No newline at end of file
+CMD ["/usr/local/bin/hugo"]