diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6aee85e..26b2543 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ variables:
   # Major - Shouldn't change often, Big changes to the site
   # Minor - starts from 0 when Major is incremented +1 for each version that goes public
   # Release - For each time a development milestone is reached
-  VERSION: 1.2.83
+  VERSION: 1.3
   BUILD: 1 # If set to 0 gitlab will not build the image
   IMAGE_TAG: $CI_REGISTRY_IMAGE:$VERSION
 
diff --git a/Dockerfile b/Dockerfile
index 74c1011..abc0880 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,19 @@
 # use the classic alpine image
-FROM alpine as Builder
+#FROM alpine as Builder
+FROM golang:1.22.5-alpine as Builder
 ARG GITLAB_TOKEN
 
 # install curl and git
-RUN apk add --update curl git
+# RUN apk add --update curl git
+RUN apk add git
 
 # download and unnzip the hugo binary then place it in /usr/local/bin
-RUN curl -L https://github.com/gohugoio/hugo/releases/download/v0.121.1/hugo_0.121.1_linux-arm64.tar.gz > hugo.tar.gz && tar -zxf hugo.tar.gz && mv hugo /usr/local/bin
+#RUN curl -L https://github.com/gohugoio/hugo/releases/download/v0.121.1/hugo_0.121.1_linux-arm64.tar.gz > hugo.tar.gz && tar -zxf hugo.tar.gz && mv hugo /usr/local/bin
+RUN CGO_ENABLED=1 go install -tags extended github.com/gohugoio/hugo@v0.128.2
 
 # clone the blog repository as well as the theme submodule
-RUN git clone --recurse-submodules https://oauth2:$GITLAB_TOKEN@gitlab.com/AHMZA/blog.git
+# RUN git clone --recurse-submodules https://oauth2:$GITLAB_TOKEN@gitlab.com/AHMZA/blog.git
+RUN git clone https://oauth2:$GITLAB_TOKEN@gitlab.com/AHMZA/blog.git
 
 # set blog (the folder we just cloned) as the current DIR
 WORKDIR blog
diff --git a/config/_default/hugo.toml b/config/_default/hugo.toml
index bcfb706..5086e78 100644
--- a/config/_default/hugo.toml
+++ b/config/_default/hugo.toml
@@ -2,7 +2,7 @@
 # Refer to the theme docs for more details about each of these parameters.
 # https://blowfish.page/docs/getting-started/
 
-theme = "blowfish" # UNCOMMENT THIS LINE
+#theme = "blowfish" # UNCOMMENT THIS LINE
 baseURL = "https://blog.ahmza.com/"
 defaultContentLanguage = "en"
 
diff --git a/config/_default/module.toml b/config/_default/module.toml
index e90665b..279e7c3 100644
--- a/config/_default/module.toml
+++ b/config/_default/module.toml
@@ -1,3 +1,6 @@
 [hugoVersion]
   extended = true
   min = "0.87.0"
+[[imports]]
+path = "github.com/nunocoracao/blowfish/v2"
+
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..61b8b35
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,5 @@
+module gitlab.com/ahmza/blog
+
+go 1.22.5
+
+require github.com/nunocoracao/blowfish/v2 v2.73.0 // indirect
diff --git a/themes/blowfish b/themes/blowfish
deleted file mode 160000
index 1f08dcb..0000000
--- a/themes/blowfish
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1f08dcb9d27a4b3460a38b4d772c2e06935891e6