diff --git a/hugo-extended/Dockerfile b/hugo-extended/Dockerfile
new file mode 100644
index 0000000..e493df9
--- /dev/null
+++ b/hugo-extended/Dockerfile
@@ -0,0 +1,17 @@
+ARG NODE_VERSION
+
+FROM node:$NODE_VERSION
+
+ARG HUGO_VERSION=0.98.0
+
+RUN apt-get update && apt-get install -y wget
+
+RUN wget https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_${HUGO_VERSION}_Linux-64bit.tar.gz && \
+    tar -xf hugo_${HUGO_VERSION}_Linux-64bit.tar.gz -C /usr/local/bin && \
+    hugo version && rm hugo_${HUGO_VERSION}_Linux-64bit.tar.gz
+
+RUN wget https://github.com/gohugoio/hugo/releases/download/v${HUGO_VERSION}/hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz && \
+    tar -xf hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz -C /usr/local/bin && \
+    hugo version && rm hugo_extended_${HUGO_VERSION}_Linux-64bit.tar.gz
+    
+RUN wget -q -O - https://raw.githubusercontent.com/canha/golang-tools-install-script/master/goinstall.sh | bash
diff --git a/hugo-extended/hooks/build b/hugo-extended/hooks/build
new file mode 100755
index 0000000..a4e9ffe
--- /dev/null
+++ b/hugo-extended/hooks/build
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+NODE_VERSION=$(echo $DOCKER_TAG | cut -d "-" -f2)
+
+# If running on M1 add --platform linux/x86_64 on docker build
+if [ $DOCKER_TAG == "latest" ]
+then
+  docker build . --build-arg NODE_VERSION=${DOCKER_TAG} -t ${IMAGE_NAME}
+else
+  docker build . --build-arg NODE_VERSION=${NODE_VERSION} -t ${IMAGE_NAME}
+fi
+
+