diff --git a/gitlab-ci/icwmp-base.conf b/gitlab-ci/icwmp-base.conf
index f2385fc..5df6e61 100644
--- a/gitlab-ci/icwmp-base.conf
+++ b/gitlab-ci/icwmp-base.conf
@@ -3,5 +3,5 @@ priority=3
 command=/bin/bash -c "cd /tmp/firmware/ && python3 -m http.server 80"
 
 [program:bbfdmd]
-priority=4
+priority=15
 command=/bin/bash -c "/usr/sbin/bbfdmd"
diff --git a/gitlab-ci/icwmp.conf b/gitlab-ci/icwmp.conf
index e2cfc35..ad6687f 100644
--- a/gitlab-ci/icwmp.conf
+++ b/gitlab-ci/icwmp.conf
@@ -2,6 +2,6 @@
 autorestart=false
 startretries=0
 numprocs_start=10
-priority=11
+priority=20
 command=/bin/bash -c "/usr/bin/valgrind --xml=yes --xml-file=/tmp/memory-report.xml --leak-check=full --show-reachable=yes --show-leak-kinds=all --errors-for-leak-kinds=all --error-exitcode=1 --track-origins=yes /usr/sbin/icwmpd"
 
diff --git a/gitlab-ci/install-dependencies.sh b/gitlab-ci/install-dependencies.sh
index 4f2d35a..ba4376b 100755
--- a/gitlab-ci/install-dependencies.sh
+++ b/gitlab-ci/install-dependencies.sh
@@ -11,11 +11,3 @@ apt install -y jq uuid-dev libmxml-dev >/dev/null 2>&1
 
 echo "Installing bbfdmd"
 install_bbfdmd
-
-#install WiFi Data Model as Plugin
-echo "Installing wifidmd as plugin"
-install_wifidmd_as_plugin
-
-#install Network Data Model as Plugin
-echo "Installing Network Data Model as plugin"
-install_netmngr_as_plugin
\ No newline at end of file
diff --git a/gitlab-ci/shared.sh b/gitlab-ci/shared.sh
index d9cbc49..21dd5cb 100644
--- a/gitlab-ci/shared.sh
+++ b/gitlab-ci/shared.sh
@@ -144,26 +144,6 @@ function install_bbfdmd()
 	exec_cmd ./gitlab-ci/setup.sh install
 }
 
-function install_wifidmd_as_plugin()
-{
-	exec_cmd git clone https://dev.iopsys.eu/bbf/wifidmd.git /opt/dev/wifidmd
-
-	exec_cmd make -C /opt/dev/wifidmd/src/ clean && make -C /opt/dev/wifidmd/src/
-	exec_cmd cp -f /opt/dev/wifidmd/src/libwifi.so /usr/share/bbfdm/plugins/
-	exec_cmd cp -f /opt/dev/wifidmd/src/libdataelements.so /usr/share/bbfdm/plugins/
-}
-
-function install_netmngr_as_plugin()
-{
-	[ -d "/opt/dev/netmngr" ] && return 0
-
-	exec_cmd git clone https://dev.iopsys.eu/network/netmngr.git /opt/dev/netmngr
-
-	exec_cmd make -C /opt/dev/netmngr/src/ clean && make -C /opt/dev/netmngr/src/ CFLAGS+="-DBBF_VENDOR_PREFIX=\\\"X_IOPSYS_EU_\\\""
-	exec_cmd cp -f /opt/dev/netmngr/src/libnetmngr.so /usr/share/bbfdm/plugins/
-	exec_cmd cp -f /opt/dev/netmngr/src/libinterface_stack.so /usr/share/bbfdm/plugins/	
-}
-
 function check_valgrind_xml() {
 	echo "Checking memory leaks..."
 	cp /tmp/memory-report.xml memory-report.xml