diff --git a/docs/docs/30-administration/00-setup.md b/docs/docs/30-administration/00-setup.md
index e4cfcc065..3d509a4e0 100644
--- a/docs/docs/30-administration/00-setup.md
+++ b/docs/docs/30-administration/00-setup.md
@@ -78,6 +78,7 @@ services:
 
 volumes:
   woodpecker-server-data:
+  woodpecker-agent-config:
 ```
 
 Woodpecker needs to know its own address. You must therefore provide the public address of it in `<scheme>://<hostname>` format. Please omit trailing slashes:
@@ -94,6 +95,7 @@ services:
 +     - WOODPECKER_HOST=${WOODPECKER_HOST}
 +     - WOODPECKER_HOST=${WOODPECKER_HOST}
 ```
+
 Woodpecker can also have its port's configured. It uses a separate port for gRPC and for HTTP. The agent performs gRPC calls and connects to the gRPC port.
 They can be configured with ADDR variables:
 
@@ -122,6 +124,7 @@ services:
 +     - WOODPECKER_GRPC_SECURE=true # defaults to false
 +     - WOODPECKER_GRPC_VERIFY=true # default
 ```
+
 As agents run pipeline steps as docker containers they require access to the host machine's Docker daemon:
 
 ```diff
@@ -137,6 +140,7 @@ services:
 ```
 
 Agents require the server address for agent-to-server communication. The agent connects to the server's gRPC port:
+
 ```diff
 # docker-compose.yml
 version: '3'
diff --git a/docs/docs/91-migrations.md b/docs/docs/91-migrations.md
index e46d69948..cd07a9344 100644
--- a/docs/docs/91-migrations.md
+++ b/docs/docs/91-migrations.md
@@ -26,6 +26,11 @@ Some versions need some changes to the server configuration or the pipeline conf
   - The existing badge endpoint `/api/badges/{owner}/{repo}` will still work, but whenever possible try to use the new endpoint using the `repo-id`: `/api/badges/{repo-id}`.
   - The UI urls for a repository changed from `/repos/{owner}/{repo}/...` to `/repos/{repo-id}/...`. You will be redirected automatically when using the old url.
   - The woodpecker-go api-client is now using the `repo-id` instead of `owner/repo` for all functions
+- Using `org-id` in favour of `owner` name
+  - :warning: The api endpoints `/api/orgs/{owner}/...` were replaced by new endpoints using the orgs id `/api/repos/{org-id}`
+  - To find the id of orgs use the `/api/orgs/lookup/{org_full_name}` endpoint.
+  - The UI urls for a organization changed from `/org/{owner}/...` to `/orgs/{org-id}/...`. You will be redirected automatically when using the old url.
+  - The woodpecker-go api-client is now using the `org-id` instead of `org name` for all functions
 
 ## 0.15.0
 
diff --git a/go.mod b/go.mod
index b3b3b7ce0..19f1e686f 100644
--- a/go.mod
+++ b/go.mod
@@ -32,7 +32,6 @@ require (
 	github.com/melbahja/goph v1.3.1
 	github.com/moby/moby v20.10.24+incompatible
 	github.com/moby/term v0.5.0
-	github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450
 	github.com/oklog/ulid/v2 v2.1.0
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.15.1
diff --git a/go.sum b/go.sum
index c4ad2aab2..9afa5fa54 100644
--- a/go.sum
+++ b/go.sum
@@ -436,8 +436,6 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
-github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450 h1:j2kD3MT1z4PXCiUllUJF9mWUESr9TWKS7iEKsQ/IipM=
-github.com/mrjones/oauth v0.0.0-20190623134757-126b35219450/go.mod h1:skjdDftzkFALcuGzYSklqYd8gvat6F1gZJ4YPVbkZpM=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=