diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index 00d33e6..2c00e63 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -24,22 +24,3 @@ steps:
     agents:
       queue: "juliagpu"
     command: "buildkite-agent pipeline upload .buildkite/testing.yml"
-
-  - label: "Documentation"
-    plugins:
-      - JuliaCI/julia#v1:
-          version: "1"
-    command: |
-      julia --project=docs -e '
-        println("--- :julia: Instantiating project")
-        using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()
-        println("+++ :julia: Building documentation")
-        include("docs/make.jl")'
-    agents:
-      queue: "juliagpu"
-      cuda: "*"
-    if: build.message !~ /\[skip docs\]/ && !build.pull_request.draft
-    timeout_in_minutes: 120
-
-env:
-  # SECRET_DOCUMENTER_KEY: 
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 037da9c..0f5894d 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -12,6 +12,8 @@ on:
   push:
     branches:
       - main
+    paths:
+      - "docs/**"
 
 concurrency:
   # Skip intermediate builds: always.
@@ -111,6 +113,24 @@ jobs:
         if: steps.invs_pr.outputs.total > steps.invs_default.outputs.total
         run: exit 1
 
+  docs:
+    if: github.ref == 'refs/heads/main'
+    name: Documentation
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: julia-actions/julia-buildpkg@v1
+
+      - name: Build and deploy docs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          julia --project=docs -e '
+          println("--- :julia: Instantiating project")
+          using Pkg; Pkg.develop(PackageSpec(path=pwd())); Pkg.instantiate()
+          println("+++ :julia: Building documentation")
+          include("docs/make.jl")'
+   
 env:
   BACKEND_GROUP: "CPU"
   RETESTITEMS_NWORKERS: 4