diff --git a/.github/workflows/build_and_publish.yml b/.github/workflows/build_and_publish.yml
index 1262031..f00b24e 100644
--- a/.github/workflows/build_and_publish.yml
+++ b/.github/workflows/build_and_publish.yml
@@ -48,13 +48,8 @@ jobs:
         shell: bash
         run: |
           mkdir -p themes/docsy
-          hugo --minify -b 'https://www.eclipse.org/sw360/'
+          hugo --minify -b .
 
-  archive_publish:
-    name: Archive and Published Tagged Build
-    runs-on: ubuntu-latest
-    needs: [build_website]
-    steps:
       - name: Archive
         uses: actions/upload-artifact@v2
         with:
@@ -62,6 +57,11 @@ jobs:
           path: ./public
         if: startsWith(github.ref, 'refs/tags/')
 
+  create_release:
+    name: Archive and Published Tagged Build
+    runs-on: ubuntu-latest
+    needs: [build_website]
+    steps:
       - name: Create Release
         id: create_release
         uses: actions/create-release@v1
@@ -74,6 +74,11 @@ jobs:
           prerelease: false
         if: startsWith(github.ref, 'refs/tags/')
 
+      - name: Download Artifact
+        uses: actions/download-artifact@v2
+        with:
+          name: website
+
       - name: Upload Release Asset
         id: upload-release-asset
         uses: actions/upload-release-asset@v1
@@ -81,7 +86,7 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.create_release.outputs.upload_url }}
-          asset_path: ./public
+          asset_path: ./website
           asset_name: website.zip
           asset_content_type: application/zip
         if: startsWith(github.ref, 'refs/tags/')
diff --git a/config.toml b/config.toml
index 8de0f56..d18a493 100644
--- a/config.toml
+++ b/config.toml
@@ -1,4 +1,3 @@
-baseurl = "sw360/"
 title = "Eclipse SW360"
 
 theme = ["docsy"]
@@ -34,19 +33,19 @@ anchor = "smart"
 [languages.en]
 title = "Eclipse SW360"
 description = "Eclipse SW360 official website"
-languageName ="English"
+languageName = "English"
 # Weight used for sorting.
 weight = 1
 
 [markup]
-  [markup.goldmark]
-    [markup.goldmark.renderer]
-      unsafe = true
-  [markup.highlight]
-    # See a complete list of available styles at https://xyproto.github.io/splash/docs/all.html
-    style = "manni"
-    # Uncomment if you want your chosen highlight style used for code blocks without a specified language
-    guessSyntax = true
+[markup.goldmark]
+[markup.goldmark.renderer]
+unsafe = true
+[markup.highlight]
+# See a complete list of available styles at https://xyproto.github.io/splash/docs/all.html
+style = "manni"
+# Uncomment if you want your chosen highlight style used for code blocks without a specified language
+guessSyntax = true
 
 [outputs]
 section = ["HTML", "RSS"]
@@ -72,7 +71,7 @@ github_project_repo = "https://github.com/eclipse/sw360"
 
 # Uncomment this if your GitHub repo does not have "main" as the default branch,
 # or specify a new value if you want to reference another branch in your GitHub links
-github_branch= "main"
+github_branch = "main"
 
 # Enable Algolia DocSearch
 algolia_docsearch = false
@@ -112,33 +111,33 @@ enable = false
 # End user relevant links. These will show up on left side of footer and in the community page if you have one.
 
 [[params.links.user]]
-  name = "User mailing list"
-  url = "mailto:sw360-dev@eclipse.org"
-  icon = "fa fa-envelope"
-  desc = "Discussion and help from your fellow users"
+name = "User mailing list"
+url = "mailto:sw360-dev@eclipse.org"
+icon = "fa fa-envelope"
+desc = "Discussion and help from your fellow users"
 # Developer relevant links. These will show up on right side of footer and in the community page if you have one.
 
 [[params.links.developer]]
-  name = "GitHub"
-  url = "https://github.com/eclipse/sw360"
-  icon = "fab fa-github"
-  desc = "Development takes place here!"
+name = "GitHub"
+url = "https://github.com/eclipse/sw360"
+icon = "fab fa-github"
+desc = "Development takes place here!"
 
 [[params.links.developer]]
-  name = "Slack"
-  url = "https://sw360chat.slack.com"
-  icon = "fab fa-slack"
-  desc = "Chat with other project developers"
+name = "Slack"
+url = "https://sw360chat.slack.com"
+icon = "fab fa-slack"
+desc = "Chat with other project developers"
 
 [[params.links.developer]]
-  name = "Developer mailing list"
-  url = "mailto:sw360-dev@eclipse.org"
-  icon = "fa fa-envelope"
-  desc = "Discuss development issues around the project"
+name = "Developer mailing list"
+url = "mailto:sw360-dev@eclipse.org"
+icon = "fa fa-envelope"
+desc = "Discuss development issues around the project"
 
 [params.about]
-    enable = true
-    title = "About"
+enable = true
+title = "About"
 
 [[menu.main]]
 url = "https://github.com/eclipse/sw360"
@@ -149,15 +148,14 @@ weight = 100
 
 # THIS NEED TO BE THE  LAST ENTRY
 [module]
-  # uncomment line below for temporary local development of module
-  # replacements = "github.com/google/docsy -> ../../docsy"
-  [module.hugoVersion]
-    extended = true
-    min = "0.75.0"
-  [[module.imports]]
-    path = "github.com/google/docsy"
-    disable = false
-  [[module.imports]]
-    path = "github.com/google/docsy/dependencies"
-    disable = false  
-
+# uncomment line below for temporary local development of module
+# replacements = "github.com/google/docsy -> ../../docsy"
+[module.hugoVersion]
+extended = true
+min = "0.75.0"
+[[module.imports]]
+path = "github.com/google/docsy"
+disable = false
+[[module.imports]]
+path = "github.com/google/docsy/dependencies"
+disable = false