diff --git a/.circleci/config.yml b/.circleci/config.yml
index 94af0a31..9c449b75 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,7 +41,7 @@ orbs:
           no_output_timeout:
             description: Number of seconds to let job run without output before timeout
             type: integer
-            default: 600
+            default: 1800
           is_test_suite:
             description: Should the job collect test results and coverage?
             type: boolean
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 859cf2c9..543f502d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,11 +1,11 @@
 # Contributing
 
-Please refer to Cloudsmith's standard guide on [Open-Source Contributing](https://help.cloudsmith.io/docs/contributing).
+Please refer to Cloudsmith's standard guide on [Open-Source Contributing](https://docs.cloudsmith.com/contributing).
 
 
 ## Contributor License Agreement
 
-By making any contributions to Cloudsmith Ltd projects you agree to be bound by the terms of the Cloudsmith Ltd [Contributor License Agreement](https://help.cloudsmith.io/docs/contributor-license-agreement).
+By making any contributions to Cloudsmith Ltd projects you agree to be bound by the terms of the Cloudsmith Ltd [Contributor License Agreement](https://docs.cloudsmith.com/contributor-license-agreement).
 
 
 ## Development Environment
@@ -43,4 +43,4 @@ Please ensure that [CHANGELOG.md](./CHANGELOG.md) is updated appropriately with
 
 ## Need Help?
 
-See the section for raising a question in the [Contributing Guide](https://help.cloudsmith.io/docs/contributing).
+See the section for raising a question in the [Contributing Guide](https://docs.cloudsmith.com/contributing).
diff --git a/cloudsmith_cli/cli/commands/upstream.py b/cloudsmith_cli/cli/commands/upstream.py
index 9baabbb6..009861dc 100644
--- a/cloudsmith_cli/cli/commands/upstream.py
+++ b/cloudsmith_cli/cli/commands/upstream.py
@@ -266,7 +266,7 @@ def func(ctx, opts, owner_repo, upstream_config_file):
 
           For a full list of supported config properties, please refer to the "body params" section of the api reference for the relevant endpoint at:
 
-          https://help.cloudsmith.io/reference/repos_upstream_{upstream_fmt}_create
+          https://docs.cloudsmith.com/api/repos/upstream/{upstream_fmt}/create
 
           \b
           Example:
@@ -345,7 +345,7 @@ def func(ctx, opts, owner_repo_slug_perm, upstream_config_file):
 
           For a full list of supported config properties, please refer to the "body params" section of the api reference for the relevant endpoint at:
 
-          https://help.cloudsmith.io/reference/repos_upstream_{upstream_fmt}_partial_update
+          https://docs.cloudsmith.com/api/repos/upstream/{upstream_fmt}/partial-update
 
           \b
           Example:
diff --git a/cloudsmith_cli/core/utils.py b/cloudsmith_cli/core/utils.py
index 5a1a78f5..da85764d 100644
--- a/cloudsmith_cli/core/utils.py
+++ b/cloudsmith_cli/core/utils.py
@@ -8,7 +8,7 @@
 
 def get_help_website():
     """Get the URL for the help website."""
-    return "https://help.cloudsmith.io/docs/cli/"
+    return "https://docs.cloudsmith.com/getting-started/cli"
 
 
 def get_github_website():