diff --git a/dev-doc.md b/dev-doc.md
index 04def2f..bc40a72 100644
--- a/dev-doc.md
+++ b/dev-doc.md
@@ -5,14 +5,14 @@ The web app uses
 - [VueJs](https://vuejs.org/) - For templating and reactive updates in the DOM
 - [Firebase Hosting](https://firebase.google.com/docs/hosting/) - For hosting the static web app
 - CLI Tools
-  - [pug](https://github.com/pugjs/pug-cli) - To convert pug templates to html and merge partials into single [`index.html`](public/index.html) file.
+  - [pug](https://github.com/Anduh/pug-cli) - To convert pug templates to html and merge partials into single [`index.html`](public/index.html) file.
   - [sass](https://sass-lang.com/documentation/cli) - To convert sass templates to css and merge partials into single [`style.css`](public/css/style.css) file.
   - [js-yaml](https://github.com/nodeca/js-yaml#cli-executable) - To convert yaml templates to json and generate the [`thirdpartyservices.js`](public/js/thirdpartyservices.js) file.
   - [firebase-tools](https://github.com/firebase/firebase-tools) - To interact with Firebase as a service from command line.
   ---
   > Install the CLI tools using
   >
-  > ```npm install -g pug-cli sass js-yaml firebase-tools```
+  > ```npm install -g @anduh/pug-cli sass js-yaml firebase-tools```
 
 
 If you wish to modify the code for the webapp, then look into [`src`](src) directory.
diff --git a/package.json b/package.json
index 898c979..aba11e9 100644
--- a/package.json
+++ b/package.json
@@ -1,5 +1,5 @@
 {
   "dependencies": {
-    "pug-cli": "^1.0.0-alpha6"
+    "@anduh/pug-cli": "^1.0.0-alpha8"
   }
 }
diff --git a/render.sh b/render.sh
index 89909ab..79a3a39 100755
--- a/render.sh
+++ b/render.sh
@@ -21,8 +21,13 @@
 echo "⚙️ STEP 1: RENDER PUG > HTML"
 
 # Using pug-cli to render from pug to html
-# Install pug-cli: npm install -g pug-cli
-pug src/index.pug --pretty --out public
+# Specifically a fork
+# - NPM: https://www.npmjs.com/package/@anduh/pug-cli
+# - Github: https://github.com/Anduh/pug-cli
+# because the original is not maintained anymore!
+# Install pug-cli: npm install -g @anduh/pug-cli
+
+pug3 src/index.pug --pretty --out public
 
 echo "⚙️ STEP 2: RENDER SASS > CSS"
 # Using sass-cli to render from sass to css