diff --git a/.github/workflows/doxygen-gh-pages.yml b/.github/workflows/doxygen-gh-pages.yml
index a5115205..b4cc53a8 100644
--- a/.github/workflows/doxygen-gh-pages.yml
+++ b/.github/workflows/doxygen-gh-pages.yml
@@ -1,19 +1,35 @@
-name: Doxygen GitHub Pages Deploy Action
+name: Doxygen Action
 
 on:
   push:
     branches: [ "main" ]
   pull_request:
     branches: [ "main" ]
-  workflow_dispatch:
-
 jobs:
-  deploy:
+  build:
     runs-on: ubuntu-latest
     steps:
-      - uses: DenverCoder1/doxygen-github-pages-action@v1.3.0
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          branch: gh-pages
-          folder: docs/html
-          config_file: docs/Doxyfile
+    - uses: actions/checkout@v2
+    - name: Check Dir
+      run: ls docs/
+    #- name: Doxygen Action
+    #  uses: mattnotmitt/doxygen-action@v1.9.5
+    #  with:
+    #      working-directory: "."
+    #      doxyfile-path: "docs/Doxyfile"
+
+    - name: Configure CMake
+      run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_DIAG_CLIENT:BOOL=OFF -DBUILD_DOXYGEN:BOOL=ON -DCMAKE_TOOLCHAIN_FILE=toolchains/linux_gcc_9.cmake
+
+    - name: Build
+      # Build your program with the given configuration
+      run: |
+        cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
+        ls ${{github.workspace}}/build/
+        ls ${{github.workspace}}/build/docs/ 
+
+    - name: Deploy
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        github_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./generated-docs/html
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index d54de07d..f23cef35 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@ cmake_minimum_required(VERSION 3.5)
 project(diag-client)
 
 # Cmake options
+option(BUILD_DIAG_CLIENT "Option to use Dlt for logging" ON)
 option(BUILD_SHARED_LIBS "Option to build as shared library" OFF)
 option(BUILD_WITH_DLT "Option to use Dlt for logging" OFF)
 option(BUILD_DOXYGEN "Option to generate doxygen file" OFF)
@@ -24,7 +25,9 @@ if (BUILD_WITH_DLT)
 endif (BUILD_WITH_DLT)
 
 # Build diag-client library
+if (BUILD_DIAG_CLIENT)
 add_subdirectory(diag-client-lib)
+endif (BUILD_DIAG_CLIENT)
 
 # Build diag-client doxygen documentation
 if (BUILD_DOXYGEN)