diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b153479..e349e121 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,9 +6,7 @@ stages:
     - static_code_analysis
     - unit_test
     - functional_test
-    - libbbf_ubus_test
     - memory_test
-    - doxygen
     - uspd
 
 variables:
@@ -58,7 +56,7 @@ run_functional_api_test:
           - functional-api-test-coverage.xml
 
 run_libbbf_ubus_test:
-  stage: libbbf_ubus_test
+  stage: functional_test
   image: iopsys/code-analysis:latest
   allow_failure: false
   script:
@@ -109,14 +107,18 @@ doxygen:
   image: iopsys/code-analysis:latest
   before_script:
       - apt update
-      - apt --assume-yes install doxygen
-      - apt --assume-yes install doxygen graphviz
+      - apt --assume-yes install doxygen graphviz ttf-freefont
+
   script:
-      - doxygen Doxyfile
+    - doxygen Doxyfile
+    - mv doxygen/documentation/html/ public/
+
   artifacts:
-      when: always
-      paths:
-          - docs/doxygen
+    paths:
+      - public
+
+  rules:
+    - if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
 
 run_uspd:
   stage: uspd
diff --git a/Doxyfile b/Doxyfile
index 686669c7..21d1a310 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = docs/doxygen
+OUTPUT_DIRECTORY       = doxygen
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -829,7 +829,7 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = include/libbbf_api.h include/libbbf_ubus.h
+INPUT                  = include/*.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses