diff --git a/.github/workflows/woo-page-deploy.yml b/.github/workflows/woo-page-deploy.yml
index 62da6c9f..3d5f16e4 100644
--- a/.github/workflows/woo-page-deploy.yml
+++ b/.github/workflows/woo-page-deploy.yml
@@ -2,6 +2,10 @@ name: Deploy the Product Page to GitHub Pages
 
 env: # Change these to your preferences any image url can also be a base encoded image
   GITHUB_PAGES_BRANCH: gh-pages
+
+  # options: "true" | "false"
+  USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX: "true"
+
   GITHUB_REPOSITORY_NAME: ${{ github.event.repository.name }}
   API_BASE_URL: "https://api.gateway.commonground.nu/api"
   NL_DESIGN_THEME_CLASSNAME: "conduction-theme"
@@ -34,6 +38,7 @@ jobs:
         uses: SpicyPizza/create-envfile@v2.0
         with:
           envkey_GITHUB_REPOSITORY_NAME: ${{ env.GITHUB_REPOSITORY_NAME }}
+          envkey_USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX: ${{ env.USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX }}
           envkey_GATSBY_API_BASE_URL: ${{ env.API_BASE_URL }}
           envkey_GATSBY_NL_DESIGN_THEME_CLASSNAME: ${{ env.NL_DESIGN_THEME_CLASSNAME }}
           envkey_GATSBY_FAVICON_URL: ${{ env.FAVICON_URL }}
diff --git a/pwa/gatsby-config.js b/pwa/gatsby-config.js
index 1ab649f8..c3ccec87 100644
--- a/pwa/gatsby-config.js
+++ b/pwa/gatsby-config.js
@@ -3,7 +3,9 @@ require("dotenv").config({
 });
 
 module.exports = {
-  pathPrefix: `/${process.env.GITHUB_REPOSITORY_NAME}`,
+  pathPrefix:
+    process.env.USE_GITHUB_REPOSITORY_NAME_AS_PATH_PREFIX === "true" ??
+    `$/${process.env.GITHUB_REPOSITORY_NAME}`, // we do NOT want to set the prefix if we're using an DNS
   plugins: [
     {
       resolve: `gatsby-plugin-layout`,