diff --git a/.gitignore b/.gitignore
index f94ce2fb1800e2a93c19fd5277dcd57e67881d09..e6de34d17e7d00363432eb5d027bb20c96434030 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 src/sysmngr
 src/*.o
 src/*.so
+*.swp
+*.swo
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9180c1e19b375a4a24578b43f91f47e156bbb639..85da5f8916a2d44f0af84ef6aee8a7c1945f207b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,15 @@
 variables:
   SOURCE_FOLDER: "src"
   CFLAGS: "-DBBF_VENDOR_PREFIX=\\\"X_IOPSYS_EU_\\\""
+  SYSMNGR_VENDOR_CONFIG_FILE: 'y'
+  SYSMNGR_MEMORY_STATUS: 'y'
+  SYSMNGR_PROCESS_STATUS: 'y'
+  SYSMNGR_SUPPORTED_DATA_MODEL: 'y'
+  SYSMNGR_FIRMWARE_IMAGE: 'y'
+  SYSMNGR_REBOOTS: 'y'
+  SYSMNGR_NETWORK_PROPERTIES: 'y'
+  SYSMNGR_VENDOR_EXTENSIONS: 'y'
+  SYSMNGR_FWBANK_UBUS_SUPPORT: 'y'
 
 include:
   - project: 'iopsys/gitlab-ci-pipeline'
diff --git a/src/fw_images.c b/src/fw_images.c
index 6fd8daa52ae3e8e0d938fab053dcbe5088bf8b40..aa80411fb7da0b59099a3de2f7bed322029ad251 100644
--- a/src/fw_images.c
+++ b/src/fw_images.c
@@ -50,8 +50,6 @@ static char *get_blobmsg_option_value(struct blob_attr *entry, const char *optio
 		option_value = dmstrdup(blobmsg_get_string(tb[7]));
 	else if (DM_STRCMP(sysmngr_bank_policy[8].name, option_name) == 0 && tb[8]) // Status
 		option_value = dmstrdup(blobmsg_get_string(tb[8]));
-	else // Otherwise
-		option_value = "";
 
 	return option_value ? option_value : "";
 }
@@ -652,6 +650,7 @@ static int operate_DeviceInfoFirmwareImage_Activate(char *refparam, struct dmctx
 		return USP_FAULT_COMMAND_FAILURE;
 
 	if (DM_STRLEN(start_time[0])) {
+		// cppcheck-suppress cert-MSC24-C
 		FILE *file = fopen(CRONTABS_ROOT, "a");
 		if (!file)
 			return USP_FAULT_COMMAND_FAILURE;
diff --git a/src/fwbank.c b/src/fwbank.c
index 1741be12afe9e6b916876018b02be4ab98d0747a..7e85c21e6444b8e58ea882930a2982bf9ab3afd9 100644
--- a/src/fwbank.c
+++ b/src/fwbank.c
@@ -13,10 +13,10 @@
 #include "fwbank.h"
 
 #ifdef SYSMNGR_FWBANK_UBUS_SUPPORT
-char fw_image_dependency[] = "file:/etc/sysmngr/fwbank";
+const char fw_image_dependency[] = "file:/etc/sysmngr/fwbank";
 #define FWBANK_FILE_PATH "/etc/sysmngr/fwbank"
 #else
-char fw_image_dependency[] = "file:/usr/libexec/rpcd/fwbank";
+const char fw_image_dependency[] = "file:/usr/libexec/rpcd/fwbank";
 #define FWBANK_FILE_PATH "/usr/libexec/rpcd/fwbank"
 #endif
 
@@ -54,8 +54,8 @@ typedef struct sysmngr_task_data {
 	struct uloop_timeout timeoutcb; // Timeout for the task
 	sysmngr_task_callback_t finishcb; // Finish callback for parent process
 	const char *command; // Command to execute
-	int pipe_fds[2];
 	uint32_t bank_id;
+	int pipe_fds[2];
 } sysmngr_task_data_t;
 
 struct blobmsg_policy sysmngr_dump_policy[] = {
diff --git a/src/memory.c b/src/memory.c
index 40cfd1317b28a2ca5b507880f44b96263b686044..54e5ecd5a2768d6b47b84722d28d2906189c9893 100644
--- a/src/memory.c
+++ b/src/memory.c
@@ -47,6 +47,7 @@ int sysmngr_meminfo(mem_info *info)
 	char *key = NULL, *val = NULL;
 	char line[256];
 
+	// cppcheck-suppress cert-MSC24-C
 	if ((f = fopen("/proc/meminfo", "r")) == NULL) {
 		BBF_ERR("Failed to open '/proc/meminfo' for reading memory info.");
 		return -1;
@@ -60,15 +61,15 @@ int sysmngr_meminfo(mem_info *info)
 			continue;
 
 		if (!strcasecmp(key, "MemTotal"))
-			info->mem_total = atol(val);
+			info->mem_total = strtol(val, NULL, 10);
 		else if (!strcasecmp(key, "MemFree"))
-			info->mem_free = atol(val);
+			info->mem_free = strtol(val, NULL, 10);
 		else if (!strcasecmp(key, "Buffers"))
-			info->buffers = atol(val);
+			info->buffers = strtol(val, NULL, 10);
 		else if (!strcasecmp(key, "Cached"))
-			info->cached = atol(val);
+			info->cached = strtol(val, NULL, 10);
 		else if (!strcasecmp(key, "SReclaimable"))
-			info->sreclaimable = atol(val);
+			info->sreclaimable = strtol(val, NULL, 10);
 	}
 
 	fclose(f);
diff --git a/src/processes.c b/src/processes.c
index d2d14bcf53826d3be24738c1ccc7e403ee7fb737..09a789355e58aa5ecda70c0c322f35b7d45505d5 100644
--- a/src/processes.c
+++ b/src/processes.c
@@ -79,6 +79,7 @@ static void get_jif_val(jiffy_counts_t *p_jif)
 	char line[128];
 	int ret;
 
+	// cppcheck-suppress cert-MSC24-C
 	if ((file = fopen("/proc/stat", "r"))) {
 		while(fgets(line, sizeof(line), file) != NULL)
 		{
diff --git a/src/reboots.c b/src/reboots.c
index a152c43fb1ba1c3deadf8d9af9d220f6d86a4d66..414281ecd8c5a48648d6b95548d7bd20f163252b 100644
--- a/src/reboots.c
+++ b/src/reboots.c
@@ -53,6 +53,7 @@ static void get_boot_option_value(const char *option_name, char *buffer, size_t
 
 	buffer[0] = '\0';
 
+	// cppcheck-suppress cert-MSC24-C
 	FILE *file = fopen(RESET_REASON_PATH, "r");
 	if (!file)
 		return;