diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000000000000000000000000000000000000..859742889e29c8a754bb1b09ab93d71c5d27111f
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,18 @@
+---
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
+
+build:
+  tags: ["host01.shore.co.il"]
+  script:
+    - cid="$(basename $(cat /proc/1/cpuset))"
+    - docker pull adarnimrod/ci-images:python3
+    - >-
+      docker run
+      --rm
+      --env "LANG=C.UTF-8"
+      --volumes-from "$cid"
+      --volume "/var/www/www.shore.co.il/blog:/builds/nimrod/blog/output"
+      --workdir "/builds/nimrod/blog"
+      adarnimrod/ci-images:python3
+      /bin/sh -xc "pipenv --python=python3 install && pipenv run clean && pipenv run build"
diff --git a/.gitmodules b/.gitmodules
index 038aad3bbe756393ea1fb9556c473162de620416..c806d0ba2152eb33772ba6947afa11212110b4b6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "pelican-mockingbird"]
 	path = pelican-mockingbird
-	url = https://git.shore.co.il/nimrod/pelican-mockingbird.git
+	url = https://git.shore.co.il/nimrod/pelican-mockingbird.git/
diff --git a/Pipfile b/Pipfile
index 71448a61cf1001765390beb23815432c67aee553..60c51b6020fa978d51409ffcfdcceae930248f50 100644
--- a/Pipfile
+++ b/Pipfile
@@ -10,7 +10,7 @@ pelican-minification = "*"
 [dev-packages]
 
 [requires]
-python_version = "3.6"
+python_version = "3"
 
 [scripts]
 build = "pelican --settings publishconf.py"
diff --git a/pelicanconf.py b/pelicanconf.py
index df5f2456b610e408dfcfca2cad2f421d04f3ac63..650939480bd17639a0678c6a367faf6d08fe56a1 100644
--- a/pelicanconf.py
+++ b/pelicanconf.py
@@ -39,4 +39,4 @@ DELETE_OUTPUT_DIRECTORY = True
 SLUGIFY_SOURCE = 'basename'
 ARTICLE_SAVE_AS = '{slug}/index.html'
 
-LOCALE = ('en_US.utf8')
+LOCALE = ('C.UTF-8')