diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c34f41cd..cf8c1e79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,8 +15,8 @@ include:
        - if: $CI_COMMIT_BRANCH == "devel"
 
 stages:
-    - static_code_analysis
     - unit_test
+    - static_code_analysis
     - functional_test
     - deploy
 
diff --git a/gitlab-ci/generate_supported_dm.sh b/gitlab-ci/generate_supported_dm.sh
index 421177ac..4d796a0c 100755
--- a/gitlab-ci/generate_supported_dm.sh
+++ b/gitlab-ci/generate_supported_dm.sh
@@ -18,6 +18,7 @@ fi
 install_cmph
 install_libeasy
 install_libethernet
+install_libqos
 
 [ ! -d "${BBFDM_MS_DIR}" ] && mkdir -p "${BBFDM_MS_DIR}"
 rm -rf ${BBFDM_MS_DIR}/*
diff --git a/gitlab-ci/shared.sh b/gitlab-ci/shared.sh
index 5f69ec49..60c2041d 100755
--- a/gitlab-ci/shared.sh
+++ b/gitlab-ci/shared.sh
@@ -119,6 +119,21 @@ function install_libeasy()
 	)
 }
 
+function install_libqos()
+{
+	[ -d "/opt/dev/libqos" ] && return 0
+
+	exec_cmd git clone https://dev.iopsys.eu/hal/libqos.git /opt/dev/libqos
+	(
+
+		cd /opt/dev/libqos
+		exec_cmd make
+		mkdir -p /usr/include/
+		cp -a libqos*.so* /usr/lib/
+		cp -a include/*.h /usr/include/
+	)
+}
+
 function install_libethernet()
 {
 	[ -d "/opt/dev/libethernet" ] && return 0
@@ -139,6 +154,7 @@ function install_ethmngr_as_micro_service()
 
 	install_libeasy
 	install_libethernet
+	install_libqos
 
 	exec_cmd git clone https://dev.iopsys.eu/hal/ethmngr.git /opt/dev/ethmngr
 	exec_cmd make -C /opt/dev/ethmngr
diff --git a/tools/tools_input.json b/tools/tools_input.json
index ad539ff1..34e27ec5 100644
--- a/tools/tools_input.json
+++ b/tools/tools_input.json
@@ -245,7 +245,7 @@
       "proto": "git",
       "version": "devel",
       "dm_files": [
-        "bbf_plugin/qos_bbf.c"
+        "src/qos_bbf.c"
       ]
     },
     {