diff --git a/config.toml b/config.toml
index 7013df0..3b8f635 100644
--- a/config.toml
+++ b/config.toml
@@ -1,4 +1,6 @@
+baseURL = "https://4n1d.github.io/aws-workshop/"
 defaultContentLanguage = "en"
+canonifyURLs = false
 [languages]
   [languages.en]
     weight = 1
diff --git a/content/1-Proposal/_index.md b/content/1-Proposal/_index.md
index f0f3c75..eb1d3dd 100644
--- a/content/1-Proposal/_index.md
+++ b/content/1-Proposal/_index.md
@@ -46,7 +46,7 @@ MapVibe employs **AWS Bedrock LLMs** to parse natural-language prompts in Vietna
 ### Overview
 
 User Prompt + Context → **Bedrock LLM Intent Parsing** → **Structured Query** → **DynamoDB Search** → **Rank & Cache** → **Web UI Display** → **User Feedback Loop**.  
-![Solution Architecture](/images/architecture.png)
+![Solution Architecture](https://4n1d.github.io/aws-workshop/images/architecture.png)
 
 ### AWS Services Used
 
diff --git a/content/1-Proposal/_index.vi.md b/content/1-Proposal/_index.vi.md
index 0e5eb11..8c66853 100644
--- a/content/1-Proposal/_index.vi.md
+++ b/content/1-Proposal/_index.vi.md
@@ -46,7 +46,7 @@ MapVibe employs **AWS Bedrock LLMs** to parse natural-language prompts in Vietna
 ### Overview
 
 User Prompt + Context → **Bedrock LLM Intent Parsing** → **Structured Query** → **DynamoDB Search** → **Rank & Cache** → **Web UI Display** → **User Feedback Loop**.  
-![Solution Architecture](/images/architecture.png)
+![Solution Architecture](https://4n1d.github.io/aws-workshop/images/architecture.png)
 
 ### AWS Services Used
 
diff --git a/content/debug-baseurl.md b/content/debug-baseurl.md
new file mode 100644
index 0000000..ab5fa3b
--- /dev/null
+++ b/content/debug-baseurl.md
@@ -0,0 +1,5 @@
+---
+title: "debug baseURL"
+---
+
+BaseURL from shortcode: {{< showbase >}}
diff --git a/layouts/shortcodes/absimg.html b/layouts/shortcodes/absimg.html
new file mode 100644
index 0000000..8a7b54a
--- /dev/null
+++ b/layouts/shortcodes/absimg.html
@@ -0,0 +1,2 @@
+{{ $imagePath := .Get 0 | absURL }}
+<img src="{{ $imagePath }}" alt="{{ with .Get 1 }}{{ . }}{{ end }}" title="{{ with .Get 2 }}{{ . }}{{ end }}" loading="lazy" />
diff --git a/layouts/shortcodes/showbase.html b/layouts/shortcodes/showbase.html
new file mode 100644
index 0000000..3c4888d
--- /dev/null
+++ b/layouts/shortcodes/showbase.html
@@ -0,0 +1 @@
+{{ $.Site.BaseURL }}