diff --git a/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/github-pages.yml b/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/github-pages.yml
index b782fed47..9fa2a42a6 100644
--- a/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/github-pages.yml
+++ b/packages/cli/templates/react/igr-ts/projects/_base/files/__dot__github/workflows/github-pages.yml
@@ -3,8 +3,7 @@ name: Deploy GitHub Pages
 on:
   push:
     branches: [ $(yamlDefaultBranch) ]
-  pull_request:
-    branches: [ $(yamlDefaultBranch) ]
+  workflow_dispatch: {}
 
 jobs:
   build-and-deploy:
@@ -38,6 +37,8 @@ jobs:
       run: find ./dist/assets -name "*.js" -exec sed -i 's|src/assets|${{ github.event.repository.name }}/assets|g' {} +
     - name: Copy Resources to dist
       run: mkdir -p ./dist/assets && cp -R ./src/assets/* ./dist/assets/
+    - name: SPA routing handling
+      run: cp .dist/index.html .dist/404.html
     - name: Upload build artifact to GitHub Pages
       uses: actions/upload-pages-artifact@v1
       with:
diff --git a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml
index 6cbcf8c0f..1db479bac 100644
--- a/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml
+++ b/packages/cli/templates/webcomponents/igc-ts/projects/_base/files/__dot__github/workflows/github-pages.yml
@@ -3,8 +3,7 @@ name: Deploy GitHub Pages
 on:
   push:
     branches: [ $(yamlDefaultBranch) ]
-  pull_request:
-    branches: [ $(yamlDefaultBranch) ]
+  workflow_dispatch: {}
 
 jobs:
   build-and-deploy:
@@ -40,6 +39,8 @@ jobs:
       run: cp ./ig-theme.css ./dist/
     - name: Update href Paths for ig-theme.css
       run: find ./dist -type f -exec sed -i "s|href=\"../../ig-theme.css\"|href=\"../../${{ github.event.repository.name }}/ig-theme.css\"|g" {} +
+    - name: SPA routing handling
+      run: cp .dist/index.html .dist/404.html
     - name: Upload build artifact to GitHub Pages
       uses: actions/upload-pages-artifact@v1
       with:
diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github-pages.yml b/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github-pages.yml
index 529b6a052..6bd130e0b 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github-pages.yml
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base/files/__dot__github/workflows/github-pages.yml
@@ -3,8 +3,7 @@ name: Deploy GitHub Pages
 on:
   push:
     branches: [ <%=yamlDefaultBranch%> ]
-  pull_request:
-    branches: [ <%=yamlDefaultBranch%> ]
+  workflow_dispatch: {}
 
 jobs:
   build-and-deploy:
@@ -44,6 +43,8 @@ jobs:
       run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
     - name: Update Resource Paths
       run: find ${{ env.BUILD_PATH }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
+    - name: SPA routing handling
+      run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
     - name: Upload build artifact to GitHub Pages
       uses: actions/upload-pages-artifact@v1
       with:
diff --git a/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml b/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml
index 18d7a0e53..65cc06fef 100644
--- a/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml
+++ b/packages/igx-templates/igx-ts-legacy/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml
@@ -3,8 +3,7 @@ name: Deploy GitHub Pages
 on:
   push:
     branches: [ main ]
-  pull_request:
-    branches: [ main ]
+  workflow_dispatch: {}
 
 jobs:
   build-and-deploy:
@@ -44,6 +43,8 @@ jobs:
       run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
     - name: Update Resource Paths
       run: find ${{ env.BUILD_PATH }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
+    - name: SPA routing handling
+      run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
     - name: Upload build artifact to GitHub Pages
       uses: actions/upload-pages-artifact@v1
       with:
diff --git a/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/github-pages.yml b/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/github-pages.yml
index 529b6a052..6bd130e0b 100644
--- a/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/github-pages.yml
+++ b/packages/igx-templates/igx-ts/projects/_base/files/__dot__github/workflows/github-pages.yml
@@ -3,8 +3,7 @@ name: Deploy GitHub Pages
 on:
   push:
     branches: [ <%=yamlDefaultBranch%> ]
-  pull_request:
-    branches: [ <%=yamlDefaultBranch%> ]
+  workflow_dispatch: {}
 
 jobs:
   build-and-deploy:
@@ -44,6 +43,8 @@ jobs:
       run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
     - name: Update Resource Paths
       run: find ${{ env.BUILD_PATH }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
+    - name: SPA routing handling
+      run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
     - name: Upload build artifact to GitHub Pages
       uses: actions/upload-pages-artifact@v1
       with:
diff --git a/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml b/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml
index 529b6a052..6bd130e0b 100644
--- a/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml
+++ b/packages/igx-templates/igx-ts/projects/_base_with_home/files/__dot__github/workflows/github-pages.yml
@@ -3,8 +3,7 @@ name: Deploy GitHub Pages
 on:
   push:
     branches: [ <%=yamlDefaultBranch%> ]
-  pull_request:
-    branches: [ <%=yamlDefaultBranch%> ]
+  workflow_dispatch: {}
 
 jobs:
   build-and-deploy:
@@ -44,6 +43,8 @@ jobs:
       run: npm run build -- --base-href "/${{ github.event.repository.name }}/"
     - name: Update Resource Paths
       run: find ${{ env.BUILD_PATH }} -type f -name '*main*.js' -exec sed -i -e "s|/assets|/${{ github.event.repository.name }}/assets|g" -e "s|url('/assets|url('/${{ github.event.repository.name }}/assets|g" {} +
+    - name: SPA routing handling
+      run: cp ${{ env.BUILD_PATH }}/index.html ${{ env.BUILD_PATH }}/404.html
     - name: Upload build artifact to GitHub Pages
       uses: actions/upload-pages-artifact@v1
       with: