diff --git a/docs/config.toml b/docs/config.toml
index 4e06578ca..11ec81f77 100644
--- a/docs/config.toml
+++ b/docs/config.toml
@@ -1,5 +1,5 @@
 theme = "docdock"
-baseurl = "https://cli.codefresh.io"
+baseurl = "https://codefresh-io.github.io/cli"
 title = "Codefresh CLI Documentation"
 publishDir = "../public"
 languageCode = "en-us"
diff --git a/package.json b/package.json
index 2e4fd8c4e..501b550e2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codefresh",
-  "version": "0.8.35",
+  "version": "0.8.36",
   "description": "Codefresh command line utility",
   "main": "index.js",
   "preferGlobal": true,