diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2c7274a7..2ed9a570 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
 
@@ -39,6 +39,12 @@ run_tools_test:
   image: ${COMMON_IMAGE}
   allow_failure: false
   script:
+  - |
+      echo "
+      machine dev.iopsys.eu
+      login gitlab-ci-token
+      password $CI_JOB_TOKEN
+      " > ~/.netrc
   - "./gitlab-ci/pipeline_setup.sh"
   - "./gitlab-ci/setup.sh ms"
   - "./gitlab-ci/tools-test.sh"
diff --git a/gitlab-ci/setup.sh b/gitlab-ci/setup.sh
index 01eebdbb..8c577781 100755
--- a/gitlab-ci/setup.sh
+++ b/gitlab-ci/setup.sh
@@ -6,9 +6,6 @@ echo "# Preparation script ..."
 ln -sf bash /bin/sh
 
 echo "Installing bbfdm rpcd utilities"
-cp utilities/files/usr/libexec/rpcd/bbf.diag /usr/libexec/rpcd/
-cp utilities/files/usr/libexec/rpcd/bbf.secure /usr/libexec/rpcd/
-
 cp -r ./test/files/etc/* /etc/
 cp -r ./test/files/usr/* /usr/
 cp -r ./test/files/var/* /var/
@@ -16,6 +13,10 @@ cp -r ./test/files/tmp/* /tmp/
 cp -r ./test/files/lib/* /lib/
 
 mkdir -p /tmp/bbfdm/.bbfdm /tmp/bbfdm/.cwmp /tmp/bbfdm/.usp
+mkdir -p /usr/libexec/rpcd/
+
+cp utilities/files/usr/libexec/rpcd/bbf.diag /usr/libexec/rpcd/
+cp utilities/files/usr/libexec/rpcd/bbf.secure /usr/libexec/rpcd/
 
 cp ./gitlab-ci/core_service.conf /etc/supervisor/conf.d/
 cp ./gitlab-ci/reload_service.conf /etc/supervisor/conf.d/
diff --git a/tools/tools_input.json b/tools/tools_input.json
index c6fd45f7..09f37cb4 100644
--- a/tools/tools_input.json
+++ b/tools/tools_input.json
@@ -8,7 +8,7 @@
   "dm_json_files": [
     "tools/datamodel.json"
   ],
-  "vendor_prefix": "X_IOPSYS_EU_",
+  "vendor_prefix": "X_IOWRT_EU_",
   "plugins": [
     {
         "repo": "https://dev.iopsys.eu/system/sysmngr.git",
@@ -492,6 +492,62 @@
         "-I /builds/bbf/bbfdm/libbbfdm-api/legacy",
         "-I libdm/common"
       ]
+    },
+    {
+      "repo": "https://dev.iopsys.eu/feed/gnx.git",
+      "proto": "git",
+      "version": "devel",
+      "dm_files": [
+        "package/gnx-files-ftth/bbf_plugin/link_forwarding.json"
+      ]
+    },
+    {
+      "repo": "https://dev.iopsys.eu/feed/gnx.git",
+      "proto": "git",
+      "version": "devel",
+      "dm_files": [
+        "genexis-packages/gnx-ux-manager/src/bbf_plugin/datamodel.c"
+      ]
+    },
+    {
+      "repo": "https://dev.iopsys.eu/feed/gnx.git",
+      "proto": "git",
+      "version": "devel",
+      "dm_files": [
+        "genexis-packages/gnx-catv/datamodel/datamodel.c"
+      ]
+    },
+    {
+      "repo": "https://dev.iopsys.eu/feed/gnx.git",
+      "proto": "git",
+      "version": "devel",
+      "dm_files": [
+        "genexis-packages/easywifi/files/wifi_extn.json"
+      ]
+    },
+    {
+      "repo": "https://dev.iopsys.eu/feed/gnx.git",
+      "proto": "git",
+      "version": "devel",
+      "dm_files": [
+        "genexis-packages/dhcp-on-boarding/src/datamodel.c"
+      ]
+    },
+    {
+      "repo": "https://dev.iopsys.eu/feed/gnx.git",
+      "proto": "git",
+      "version": "devel",
+      "dm_files": [
+        "genexis-packages/gnx-loop-detector/datamodel/datamodel.c"
+      ]
+    },
+    {
+      "repo": "https://dev.iopsys.eu/feed/gnx.git",
+      "proto": "git",
+      "version": "devel",
+      "dm_files": [
+        "genexis-packages/gnx-sfp/src/bbf_plugin/datamodel.c"
+      ]
     }
   ],
   "output": {