diff --git a/.drone.yml b/.drone.yml
index 8462661f2..37ad9db85 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -45,7 +45,7 @@ pipeline:
   build:
     image: golang:1.16
     commands:
-      - go get github.com/laszlocph/togo
+      - go get github.com/woodpecker-ci/togo
       - (cd web/; go generate ./...)
       - ./.drone.sh
     when:
@@ -53,7 +53,7 @@ pipeline:
 
   # publish-server-alpine:
   #   image: plugins/docker
-  #   repo: laszlocloud/woodpecker-server
+  #   repo: woodpeckerci/woodpecker-server
   #   dockerfile: Dockerfile.alpine
   #   secrets: [ docker_username, docker_password ]
   #   tag: [ alpine ]
@@ -67,7 +67,7 @@ pipeline:
 
   publish-server:
     image: plugins/docker
-    repo: laszlocloud/woodpecker-server
+    repo: woodpeckerci/woodpecker-server
     secrets: [ docker_username, docker_password ]
     tag: [ latest ]
     when:
@@ -76,7 +76,7 @@ pipeline:
 
   publish-agent:
     image: plugins/docker
-    repo: laszlocloud/woodpecker-agent
+    repo: woodpeckerci/woodpecker-agent
     dockerfile: Dockerfile.agent
     secrets: [ docker_username, docker_password ]
     tag: [ latest ]
@@ -86,7 +86,7 @@ pipeline:
 
   # publish-agent-alpine:
   #   image: plugins/docker
-  #   repo: laszlocloud/woodpecker-agent
+  #   repo: woodpeckerci/woodpecker-agent
   #   dockerfile: Dockerfile.agent.alpine
   #   secrets: [ docker_username, docker_password ]
   #   tag: [ alpine ]
@@ -96,7 +96,7 @@ pipeline:
 
 #  release-server-alpine:
 #    image: plugins/docker
-#    repo: laszlocloud/woodpecker-server
+#    repo: woodpeckerci/woodpecker-server
 #    dockerfile: Dockerfile.alpine
 #    secrets: [ docker_username, docker_password ]
 #    tag: "${DRONE_TAG}-alpine"
@@ -105,7 +105,7 @@ pipeline:
 #
 #  release-agent-alpine:
 #    image: plugins/docker
-#    repo: laszlocloud/woodpecker-agent
+#    repo: woodpeckerci/woodpecker-agent
 #    dockerfile: Dockerfile.agent.alpine
 #    secrets: [ docker_username, docker_password ]
 #    tag: "${DRONE_TAG}-alpine"
@@ -114,7 +114,7 @@ pipeline:
 
   release-server:
     image: plugins/docker
-    repo: laszlocloud/woodpecker-server
+    repo: woodpeckerci/woodpecker-server
     secrets: [ docker_username, docker_password ]
     tag: ${DRONE_TAG}
     when:
@@ -122,7 +122,7 @@ pipeline:
 
   release-agent:
     image: plugins/docker
-    repo: laszlocloud/woodpecker-agent
+    repo: woodpeckerci/woodpecker-agent
     dockerfile: Dockerfile.agent
     secrets: [ docker_username, docker_password ]
     tag: ${DRONE_TAG}
diff --git a/BUILDING b/BUILDING
index a6077b4ab..23adc4dcd 100644
--- a/BUILDING
+++ b/BUILDING
@@ -14,7 +14,7 @@ curl -o swagger -L'#' "$download_url"
 chmod +x swagger
 sudo mv swagger /usr/local/bin
 
-go get github.com/laszlocph/togo
+go get github.com/woodpecker-ci/togo
 
 go generate
 
diff --git a/go.mod b/go.mod
index 649553963..0c4768cd1 100644
--- a/go.mod
+++ b/go.mod
@@ -56,7 +56,7 @@ require (
 	github.com/tevino/abool v0.0.0-20170917061928-9b9efcf221b5
 	github.com/urfave/cli v1.22.4
 	golang.org/x/crypto v0.0.0-20200510223506-06a226fb4e37
-	golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6
+	golang.org/x/net v0.0.0-20210525063256-abc453219eb5
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a
 	google.golang.org/appengine v1.6.6 // indirect
diff --git a/go.sum b/go.sum
index c37f1f1ea..340a016e7 100644
--- a/go.sum
+++ b/go.sum
@@ -248,6 +248,8 @@ golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6 h1:0PC75Fz/kyMGhL0e1QnypqK2kQMqKt9csD1GnMJR+Zk=
 golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5 h1:wjuX4b5yYQnEQHzd+CBcrcC6OVR2J1CN6mUy0oSxIPo=
+golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=