diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index a29018e..192a23a 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -5,7 +5,7 @@ about: Create a report to help us improve
 
 ### Troubleshooting
 
-Before sumbitting a bug report please read the [Troubleshooting section](https://github.com/docker/build-push-action#troubleshooting) in the README.
+Before sumbitting a bug report please read the [Troubleshooting doc](https://github.com/docker/build-push-action/blob/master/TROUBLESHOOTING.md).
 
 ### Behaviour
 
diff --git a/README.md b/README.md
index e1aa1c9..85b0f1b 100644
--- a/README.md
+++ b/README.md
@@ -538,31 +538,7 @@ Following outputs are available
 
 ## Troubleshooting
 
-While pushing to a registry, you may encounter these kinds of issues:
-
-* `failed commit on ref "layer-sha256:...": invalid content digest in response: invalid checksum digest format`
-* `failed commit on ref "layer-sha256:...": no response`
-* `failed commit on ref "manifest-sha256:...": unexpected status: 401 Unauthorized`
-* `unexpected response: 401 Unauthorized`
-
-These issues are not directly related to this action but are rather linked to [buildx](https://github.com/docker/buildx),
-[buildkit](https://github.com/moby/buildkit), [containerd](https://github.com/containerd/containerd) or the registry
-on which you're pushing your image. The quality of error message depends on the registry and are usually not very informative.
-
-To help you solve this, you should first enable debugging in the
-[setup-buildx action step](https://github.com/docker/setup-buildx-action):
-
-```yaml
-  -
-    name: Set up Docker Buildx
-    uses: docker/setup-buildx-action@v1
-    with:
-      buildkitd-flags: --debug
-```
-
-Next you can test pushing with containerd using [this workflow](https://github.com/crazy-max/ghaction-setup-containerd#build-and-push-docker-image).
-Do not forget to set `ctr --debug` for the pushing step. If it works then open an issue on
-[buildkit](https://github.com/moby/buildkit) repository.
+See [TROUBLESHOOTING.md](TROUBLESHOOTING.md)
 
 ## Keep up-to-date with GitHub Dependabot
 
diff --git a/TROUBLESHOOTING.md b/TROUBLESHOOTING.md
new file mode 100644
index 0000000..d06623f
--- /dev/null
+++ b/TROUBLESHOOTING.md
@@ -0,0 +1,29 @@
+# Troubleshooting
+
+## Errors on pushing to registry
+
+While pushing to a registry, you may encounter these kinds of issues:
+
+* `failed commit on ref "layer-sha256:...": invalid content digest in response: invalid checksum digest format`
+* `failed commit on ref "layer-sha256:...": no response`
+* `failed commit on ref "manifest-sha256:...": unexpected status: 401 Unauthorized`
+* `unexpected response: 401 Unauthorized`
+
+These issues are not directly related to this action but are rather linked to [buildx](https://github.com/docker/buildx),
+[buildkit](https://github.com/moby/buildkit), [containerd](https://github.com/containerd/containerd) or the registry
+on which you're pushing your image. The quality of error message depends on the registry and are usually not very informative.
+
+To help you solve this, you should first enable debugging in the
+[setup-buildx action step](https://github.com/docker/setup-buildx-action):
+
+```yaml
+  -
+    name: Set up Docker Buildx
+    uses: docker/setup-buildx-action@v1
+    with:
+      buildkitd-flags: --debug
+```
+
+Next you can test pushing with containerd using [this workflow](https://github.com/crazy-max/ghaction-setup-containerd#build-and-push-docker-image).
+Do not forget to set `ctr --debug` for the pushing step. If it works then open an issue on
+[buildkit](https://github.com/moby/buildkit) repository.