diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 16ba8185..ba41d349 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,8 @@ env:
 
 jobs:
   test:
-    runs-on: [self-hosted, Linux, X64]
+    runs-on:
+      - codebuild-defguard-gateway-runner-${{ github.run_id }}-${{ github.run_attempt }}
     container: rust:1
 
     steps:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
deleted file mode 100644
index 6c8f9745..00000000
--- a/.github/workflows/docs.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: rustdoc Github Pages
-on:
-  push:
-    branches:
-      - main
-
-env:
-  CARGO_INCREMENTAL: 0
-  CARGO_NET_RETRY: 10
-  RUSTFLAGS: "-D warnings -W unreachable-pub"
-  RUSTUP_MAX_RETRIES: 10
-
-jobs:
-  rustdoc:
-    runs-on: [self-hosted, Linux]
-    container:
-      image: rust:1
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Install Rust toolchain
-        run: rustup update --no-self-update stable
-
-      - name: Install dependencies
-        run: apt-get update && apt-get -y install protobuf-compiler libnftnl-dev libmnl-dev
-
-      - name: Build Docs
-        run: cargo doc --all --no-deps
-
-      - name: Deploy Docs
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_branch: gh-pages
-          publish_dir: ./target/doc
-          force_orphan: true
diff --git a/README.md b/README.md
index d1e0e17f..dfca4e14 100644
--- a/README.md
+++ b/README.md
@@ -12,7 +12,7 @@ If you already have your defguard instance running you can set up a gateway by f
 
 ## Documentation
 
-See the [documentation](https://defguard.gitbook.io) for more information.
+See the [documentation](https://docs.defguard.net) for more information.
 
 ## Community and Support