diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml
index b08b4e2..54d5853 100644
--- a/.github/workflows/pages.yml
+++ b/.github/workflows/pages.yml
@@ -30,6 +30,9 @@ jobs:
   # Build job
   build:
     runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: docs
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -39,6 +42,7 @@ jobs:
           ruby-version: '3.3' # Not needed with a .ruby-version file
           bundler-cache: true # runs 'bundle install' and caches installed gems automatically
           cache-version: 0 # Increment this number if you need to re-download cached gems
+          working-directory: '${{ github.workspace }}/docs'
       - name: Setup Pages
         id: pages
         uses: actions/configure-pages@v3
@@ -50,6 +54,8 @@ jobs:
       - name: Upload artifact
         # Automatically uploads an artifact from the './_site' directory by default
         uses: actions/upload-pages-artifact@v1
+        with:
+          path: "docs/_site/"
 
   # Deployment job
   deploy:
diff --git a/Gemfile b/docs/Gemfile
similarity index 100%
rename from Gemfile
rename to docs/Gemfile
diff --git a/Gemfile.lock b/docs/Gemfile.lock
similarity index 100%
rename from Gemfile.lock
rename to docs/Gemfile.lock
diff --git a/docs/_config.yml b/docs/_config.yml
index 12984d0..68c3644 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,4 @@
 title: OFDS Consolidation tool
 description: A QGIS plugin for consolidating Open Fibre data
 theme: just-the-docs
-baseurl: "/docs"
 url: https://open-telecoms-data.github.io/ofds_consolidation_tool