diff --git a/Website/.gitignore b/Website/.gitignore
index d32cc78..d38a02d 100644
--- a/Website/.gitignore
+++ b/Website/.gitignore
@@ -38,3 +38,6 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+
+# attachments
+/public/.attachments
diff --git a/Website/components/homeview/HomeView.tsx b/Website/components/homeview/HomeView.tsx
index 19e4385..6d9468c 100644
--- a/Website/components/homeview/HomeView.tsx
+++ b/Website/components/homeview/HomeView.tsx
@@ -41,6 +41,7 @@ export const HomeView = ({ }: IHomeViewProps) => {
                             a: ({ ...props }) => <a className="text-blue-600 hover:underline" {...props} />,
                             li: ({ ...props }) => <li className="ml-6 list-disc" {...props} />,
                             span: ({ ...props }) => <span className="font-semibold" {...props} />,
+                            img: ({ ...props }) => <img className="max-w-full h-auto my-4" {...props} />,
                         }}>{wikipage}</Markdown>
                     ) : (   
                         <div>Loading wiki...</div>
diff --git a/Website/scripts/downloadWikiContent.ts b/Website/scripts/downloadWikiContent.ts
new file mode 100644
index 0000000..0226efe
--- /dev/null
+++ b/Website/scripts/downloadWikiContent.ts
@@ -0,0 +1,285 @@
+#!/usr/bin/env npx tsx
+
+import * as fs from 'fs/promises';
+import * as path from 'path';
+
+interface WikiPageResponse {
+  id: number;
+  name: string;
+  url: string;
+  content: string;
+  path: string;
+}
+
+interface AttachmentReference {
+  altText: string;
+  filename: string;
+  fullPath: string;
+}
+
+interface WikiDownloadConfig {
+  orgUrl: string;
+  project: string;
+  wikiName: string;
+  wikiPagePath: string;
+  accessToken: string;
+  apiVersion: string;
+  outputFile: string;
+  attachmentsDir: string;
+}
+
+class WikiContentDownloader {
+  private config: WikiDownloadConfig;
+  private authHeader: string;
+
+  constructor(config: WikiDownloadConfig) {
+    this.config = config;
+    // Create Basic auth header (empty username, token as password)
+    const credentials = Buffer.from(`:${config.accessToken}`).toString('base64');
+    this.authHeader = `Basic ${credentials}`;
+  }
+
+  async downloadWikiContent(): Promise<void> {
+    try {
+      console.log('Starting wiki content download...');
+      
+      // Encode wiki name and path
+      const wikiNameEncoded = encodeURIComponent(this.config.wikiName);
+      const pathEncoded = encodeURIComponent(this.config.wikiPagePath);
+      
+      // Construct URL
+      const url = `${this.config.orgUrl}${this.config.project}/_apis/wiki/wikis/${wikiNameEncoded}/pages?path=${pathEncoded}&includeContent=true&api-version=${this.config.apiVersion}`;
+      
+      console.log('Constructed URL:', url);
+      console.log('Encoded Path:', pathEncoded);
+      console.log('Wiki Name:', this.config.wikiName);
+      console.log('Encoded Wiki Name:', wikiNameEncoded);
+
+      // Create output directory
+      await fs.mkdir(path.dirname(this.config.outputFile), { recursive: true });
+
+      // Fetch wiki content
+      const response = await fetch(url, {
+        method: 'GET',
+        headers: {
+          'Authorization': this.authHeader,
+          'Accept': 'application/json'
+        }
+      });
+
+      if (!response.ok) {
+        throw new Error(`HTTP error! status: ${response.status} ${response.statusText}`);
+      }
+
+      const data: WikiPageResponse = await response.json();
+      
+      console.log('Response is valid JSON');
+      
+      if (!data.content) {
+        console.log('Response does not have content field');
+        console.log('Available fields:', Object.keys(data));
+        return;
+      }
+
+      console.log('Response has content field');
+      
+      // Save wiki content to file
+      await fs.writeFile(this.config.outputFile, data.content, 'utf-8');
+      console.log(`Saved wiki page to ${this.config.outputFile}`);
+
+      // Process attachments
+      await this.processAttachments(data.content, wikiNameEncoded);
+      
+    } catch (error) {
+      console.error('Error downloading wiki content:', error);
+      throw error;
+    }
+  }
+
+  private async processAttachments(content: string, wikiNameEncoded: string): Promise<void> {
+    console.log('Searching for .attachments references in wiki content...');
+    
+    // Create attachments directory
+    await fs.mkdir(this.config.attachmentsDir, { recursive: true });
+    
+    // Find attachment references using regex
+    const attachmentRefs = this.findAttachmentReferences(content);
+    
+    if (attachmentRefs.length === 0) {
+      console.log('No .attachments references found in wiki content');
+      return;
+    }
+
+    console.log('Found attachment references:');
+    attachmentRefs.forEach(ref => {
+      console.log(`- ${ref.altText}: ${ref.fullPath}`);
+    });
+
+    // Download each attachment
+    for (const ref of attachmentRefs) {
+      await this.downloadAttachment(ref, wikiNameEncoded);
+    }
+  }
+
+  private findAttachmentReferences(content: string): AttachmentReference[] {
+    // Regex to match: ![alt text](/.attachments/filename) or ![alt text](.attachments/filename)
+    const attachmentRegex = /!\[([^\]]*)\]\(([./]*attachments\/[^)]+)\)/g;
+    const references: AttachmentReference[] = [];
+    
+    let match;
+    while ((match = attachmentRegex.exec(content)) !== null) {
+      const [, altText, fullPath] = match;
+      const filename = fullPath.replace(/.*attachments\//, '');
+      
+      references.push({
+        altText: altText || 'image',
+        filename,
+        fullPath
+      });
+    }
+    
+    return references;
+  }
+
+  private async downloadAttachment(ref: AttachmentReference, wikiNameEncoded: string): Promise<void> {
+    try {
+      console.log(`Downloading attachment: ${ref.filename}`);
+      
+      // Azure DevOps wikis are stored as Git repositories, so we use the Git API to get attachments
+      // First, we need to get the repository ID for the wiki
+      const repoInfo = await this.getWikiRepository(wikiNameEncoded);
+      
+      if (!repoInfo) {
+        console.log(`Could not find repository information for wiki: ${this.config.wikiName}`);
+        return;
+      }
+      
+      // Construct Git API URL to get the attachment file
+      // Path in git repo is typically: .attachments/{filename}
+      const gitFilePath = `${repoInfo.mappedPath}/.attachments/${ref.filename}`;
+      const gitApiUrl = `${this.config.orgUrl}${this.config.project}/_apis/git/repositories/${repoInfo.id}/items?path=${encodeURIComponent(gitFilePath)}&api-version=${this.config.apiVersion}`;
+      
+      console.log(`Git API URL: ${gitApiUrl}`);
+      
+      const response = await fetch(gitApiUrl, {
+        method: 'GET',
+        headers: {
+          'Authorization': this.authHeader
+        }
+      });
+      
+      if (response.ok) {
+        const buffer = await response.arrayBuffer();
+        const filePath = path.join(this.config.attachmentsDir, ref.filename);
+        await fs.writeFile(filePath, Buffer.from(buffer));
+        console.log(`Successfully saved: ${filePath}`);
+      } else {
+        console.log(`Failed to download ${ref.filename} via Git API (HTTP ${response.status})`);
+        console.log(`Response status text: ${response.statusText}`);
+        
+        // Log error details
+        try {
+          const contentType = response.headers.get('content-type');
+          if (contentType?.includes('application/json')) {
+            const errorResponse = await response.json();
+            console.log(`Error response:`, JSON.stringify(errorResponse, null, 2));
+          }
+        } catch (e) {
+          console.log('Could not parse error response');
+        }
+      }
+      
+    } catch (error) {
+      console.error(`Error downloading attachment ${ref.filename}:`, error);
+    }
+  }
+
+  private async getWikiRepository(wikiNameEncoded: string): Promise<{ id: string; name: string, mappedPath: string } | null> {
+    try {
+      console.log(`Getting repository information for wiki: ${this.config.wikiName}`);
+      
+      // Get wiki information which includes the repository ID
+      const wikiInfoUrl = `${this.config.orgUrl}${this.config.project}/_apis/wiki/wikis/${wikiNameEncoded}?api-version=${this.config.apiVersion}`;
+      
+      const response = await fetch(wikiInfoUrl, {
+        method: 'GET',
+        headers: {
+          'Authorization': this.authHeader,
+          'Accept': 'application/json'
+        }
+      });
+      
+      if (response.ok) {
+        const wikiInfo = await response.json();
+        console.log(`Wiki info:`, JSON.stringify(wikiInfo, null, 2));
+        
+        // The wiki info should contain repository information
+        if (wikiInfo.repository) {
+          return {
+            id: wikiInfo.repository.id,
+            name: wikiInfo.repository.name,
+            mappedPath: wikiInfo.repository.mappedPath || ''
+          };
+        } else if (wikiInfo.repositoryId) {
+          // Sometimes the repo ID is at the root level
+          return {
+            id: wikiInfo.repositoryId,
+            name: wikiInfo.name || this.config.wikiName,
+            mappedPath: wikiInfo.mappedPath || ''
+          };
+        } else {
+          console.log('No repository information found in wiki response');
+          return null;
+        }
+      } else {
+        console.log(`Failed to get wiki repository info (HTTP ${response.status})`);
+        return null;
+      }
+      
+    } catch (error) {
+      console.error('Error getting wiki repository information:', error);
+      return null;
+    }
+  }
+}
+
+// Main execution
+async function main(): Promise<void> {
+  const config: WikiDownloadConfig = {
+    orgUrl: process.env.ORG_URL || '',
+    project: process.env.PROJECT || '',
+    wikiName: process.env.WIKI_NAME || '',
+    wikiPagePath: process.env.WIKI_PAGE_PATH || '',
+    accessToken: process.env.SYSTEM_ACCESSTOKEN || '',
+    apiVersion: '7.1',
+    outputFile: 'generated/Introduction.md',
+    attachmentsDir: 'public/.attachments'
+  };
+
+  // Validate required environment variables
+  const requiredVars = ['ORG_URL', 'PROJECT', 'WIKI_NAME', 'WIKI_PAGE_PATH', 'SYSTEM_ACCESSTOKEN'];
+  const missingVars = requiredVars.filter(varName => !process.env[varName]);
+  
+  if (missingVars.length > 0) {
+    console.error('Missing required environment variables:', missingVars.join(', '));
+    process.exit(1);
+  }
+
+  const downloader = new WikiContentDownloader(config);
+  
+  try {
+    await downloader.downloadWikiContent();
+    console.log('Wiki content download completed successfully');
+  } catch (error) {
+    console.error('Wiki content download failed:', error);
+    process.exit(1);
+  }
+}
+
+// Run if this file is executed directly
+if (require.main === module) {
+  main().catch(console.error);
+}
+
+export { WikiContentDownloader };
+export type { WikiDownloadConfig };
diff --git a/Website/stubs/Introduction.md b/Website/stubs/Introduction.md
index a104365..5ecdb2d 100644
--- a/Website/stubs/Introduction.md
+++ b/Website/stubs/Introduction.md
@@ -2,7 +2,7 @@
 _No ADO WiKi page connected..._
 
 ### Setup
-1. Update ADO Pipelines to version 1.4.0 or newer
+1. Update ADO Pipelines to version >=1.4.0 (images supported in 1.4.1)
 2. Open YAML files and ensure variable group and ADO repo looks correct.
 3. Update Library Variables for pipeline (new ones are: AdoWikiPagePath & AdoWikiName)
 4. Ensure Read Access from the pipeline to the WiKi Repo (Project Settings > Repositories > 'wiki-repo' > Security)
diff --git a/azure-pipelines-build-jobs.yml b/azure-pipelines-build-jobs.yml
index ce13833..fa3fca2 100644
--- a/azure-pipelines-build-jobs.yml
+++ b/azure-pipelines-build-jobs.yml
@@ -46,63 +46,9 @@ steps:
       AZURE_CLIENT_SECRET: ${{ parameters.azureClientSecret }}
       DataverseUrl: ${{ parameters.dataverseUrl }}
 
-  - script: |
-      set -uo pipefail
-      API_VER="7.1"
-
-      # Generated folder location in DMV
-      OUT_FILE="generated/Introduction.md"
-
-      # The encoding removes all spaces, weird charachters etc. with encoded values like %20 for space.
-      WIKI_NAME_ENCODED=$(python3 -c "import urllib.parse, os; print(urllib.parse.quote(os.environ['WIKI_NAME']))")
-      ENCODED_PATH=$(python3 -c "import urllib.parse, os; print(urllib.parse.quote(os.environ['WIKI_PAGE_PATH']))")
-    
-      URL="${ORG_URL}${PROJECT}/_apis/wiki/wikis/${WIKI_NAME_ENCODED}/pages?path=${ENCODED_PATH}&includeContent=true&api-version=${API_VER}"
-  
-      # Debug: Print the constructed URL
-      echo "Constructed URL: $URL"
-      echo "ENCODED_PATH: $ENCODED_PATH"
-      echo "ORG_URL: $ORG_URL"
-      echo "PROJECT: $PROJECT"
-      echo "WIKI_NAME: $WIKI_NAME"
-      echo "ENCODED_WIKI_NAME: $WIKI_NAME_ENCODED"
-
-      mkdir -p "$(dirname "$OUT_FILE")"
-      # -w (wrap) 0 ensures the token is one line
-      BASE64=$(printf ":%s" "$SYSTEM_ACCESSTOKEN" | base64 --wrap 0)
-
-      # Headers are important https://learn.microsoft.com/en-us/rest/api/azure/devops/?view=azure-devops-rest-7.2
-      # HTTP 2.0 (default) does not work hence the older (1.1) version used
-      RESPONSE=$(curl \
-        --silent \
-        --show-error \
-        --http1.1 \
-        --header "Authorization: Basic ${BASE64}" \
-        --header "Accept: application/json" \
-        "$URL")
-
-      # Check if it's valid JSON
-      if echo "$RESPONSE" | jq . > /dev/null 2>&1; then
-        echo "Response is valid JSON"
-        
-        # Check if it has content field
-        if echo "$RESPONSE" | jq -e '.content' > /dev/null 2>&1; then
-          echo "Response has .content field"
-          echo "$RESPONSE" | jq -r '.content' > "$OUT_FILE"
-          echo "Saved wiki page to $OUT_FILE"
-        else
-          echo "Response does not have .content field"
-          echo "Available fields:"
-          echo "$RESPONSE" | jq 'keys'
-        fi
-      else
-        echo "Response is NOT valid JSON"
-        echo "This might be an error message or HTML response"
-      fi
-
-      echo "Saved wiki page to $OUT_FILE"
+  - script: npx tsx scripts/downloadWikiContent.ts
     workingDirectory: $(Build.SourcesDirectory)/Website
-    displayName: Download Introduction WiKi Page into TS project
+    displayName: Download Introduction Wiki Page and Attachments
     continueOnError: true
     env:
       ORG_URL: $(System.CollectionUri)