diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index 147f1772..ed7a858d 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -5,8 +5,6 @@ name: Generate docs and Create PR on docs repo
 
 on:
   push:
-    tags:
-      - v*
 
 jobs:
   make_docs:
@@ -24,6 +22,8 @@ jobs:
         cd docs
         python -m pip install -r requirements.txt
         make markdown
+        python3 generateGitbookMD.py
+        echo "# Python Client Reference" > build/markdown/gitbook-md/README.md
     - name: Set destination BRANCH_NAME for docs repo
       run: echo "BRANCH_NAME=Python-Reference-Updates-$(date +%s)" >> $GITHUB_ENV
     - name: Create pull request in terminusdb/terminusdb-docs
@@ -31,7 +31,7 @@ jobs:
       env:
         API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
       with:
-        source_folder: 'docs/build/markdown/.'
+        source_folder: 'docs/build/markdown/gitbook-md/.'
         destination_repo: 'terminusdb/terminusdb-docs'
         destination_folder: 'index/terminusx-db/reference-guides/python-client-reference'
         destination_base_branch: 'main'
diff --git a/docs/generateGitbookMD.py b/docs/generateGitbookMD.py
index da251632..cfa7f5fc 100644
--- a/docs/generateGitbookMD.py
+++ b/docs/generateGitbookMD.py
@@ -20,15 +20,6 @@
 
 f_dir = "./build/markdown/"
 
-f_input = ['Errors_and_Exceptions', 
-    'modules', 
-    'Scaffolding_CLI_Tool', 
-    'woqlClient', 
-    'woqlDataframe', 
-    'woqlQuery', 
-    'woqlSchema',
-]
-
 aPyFile = []
 f_md = None
 
@@ -148,12 +139,13 @@ def _md(line, nL = 0):
         print(error)
 
 # Loop through each file for conversion
-for f in glob.glob('./build/markdown/*.md'):
-    print(f)
-    file = open(f, "r")
+for f in glob.glob(f"{f_dir}*.md"):
+    file = open(f,"r")
     file_data = file.read()
 
-    f_md = open(f, "w")
+    f_md = open(path+"/"+f.split("/")[3], "w")
+
+    f = f_dir+f
 
     process_data = ""
     if re.search("Scaffolding", f): 
diff --git a/docs/source/Scaffolding_CLI_Tool.rst b/docs/source/Scaffolding_CLI_Tool.rst
new file mode 100644
index 00000000..c71f55cb
--- /dev/null
+++ b/docs/source/Scaffolding_CLI_Tool.rst
@@ -0,0 +1,7 @@
+Scaffolding CLI Tool
+====================
+
+
+.. click:: terminusdb_client.scripts.scripts:terminusdb
+   :prog: terminusdb
+   :nested: full