diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7d0805837cbce582c1c7043672fc9826080d092..be83197e456cc71ce73680aff3c5f6ab03db5ebb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,6 +8,7 @@ variables:
 include:
   - project: 'iopsys/gitlab-ci-pipeline'
     file: '/static-code-analysis.yml'
+    ref: '0.31'
 
 stages:
     - static_code_analysis
diff --git a/files/ddns-script/usr/libexec/rpcd/ddnsmngr b/files/ddns-script/usr/libexec/rpcd/ddnsmngr
index 6d6444983a6c5f2bb6c0799055b44c908030f2dc..4cd383ebdadc3bf26a27a7d25da1d6db5d49209d 100644
--- a/files/ddns-script/usr/libexec/rpcd/ddnsmngr
+++ b/files/ddns-script/usr/libexec/rpcd/ddnsmngr
@@ -242,7 +242,7 @@ case "$1" in
 					json_init
 					json_add_string "last_update" "${last_update}"
 					json_dump
-					return
+					exit 0
 				fi
 
 				run_dir=$(uci -q get ddnsmngr.global.ddns_rundir)
@@ -257,7 +257,7 @@ case "$1" in
 					json_init
 					json_add_string "last_update" "${last_update}"
 					json_dump
-					return
+					exit 0
 				else
 					# strip next line from end
 					last_time=$(echo -e $last_time | tr -d '\n')
@@ -284,7 +284,7 @@ case "$1" in
 					json_init
 					json_add_string "status" "Error"
 					json_dump
-					return
+					exit 0
 				fi
 
 				state=$(get_hostname_status "${host_section}")
@@ -303,7 +303,7 @@ case "$1" in
 					json_init
 					json_add_string "status" "Error"
 					json_dump
-					return
+					exit 0
 				fi
 
 				state=$(get_client_status "${client_section}")
@@ -322,7 +322,7 @@ case "$1" in
 					json_init
 					json_add_string "last_error" "CONNECTION_ERROR"
 					json_dump
-					return
+					exit 0
 				fi
 
 				error=$(get_last_error "${client_section}")
diff --git a/files/inadyn/usr/libexec/rpcd/ddnsmngr b/files/inadyn/usr/libexec/rpcd/ddnsmngr
index c72dc68c9e5f63b3e8f77902619e231efa8a6b85..fe8310f680f71a7323028a16142da42bdbda5e2d 100644
--- a/files/inadyn/usr/libexec/rpcd/ddnsmngr
+++ b/files/inadyn/usr/libexec/rpcd/ddnsmngr
@@ -225,7 +225,7 @@ case "$1" in
 					json_init
 					json_add_string "last_update" "${last_update}"
 					json_dump
-					return
+					exit 0
 				fi
 
 				hostname=$(uci -q get ddnsmngr.${host_section}.lookup_host)
@@ -255,7 +255,7 @@ case "$1" in
 					json_init
 					json_add_string "status" "Error"
 					json_dump
-					return
+					exit 0
 				fi
 
 				state=$(get_hostname_status "${host_section}")
@@ -277,7 +277,7 @@ case "$1" in
 					json_init
 					json_add_string "status" "Error"
 					json_dump
-					return
+					exit 0
 				fi
 
 				state=$(get_client_status "${client_section}")
@@ -296,7 +296,7 @@ case "$1" in
 					json_init
 					json_add_string "last_error" "CONNECTION_ERROR"
 					json_dump
-					return
+					exit 0
 				fi
 
 				error=$(get_last_error "${client_section}")