diff --git a/robot-systest/lib/openstack_lib.resource b/robot-systest/lib/openstack_lib.resource
index 3ad237b98c7624e6daf534574c39031032c0e26f..add717a443d7d41fca6af2d3308ef3b2acfb9a6f 100644
--- a/robot-systest/lib/openstack_lib.resource
+++ b/robot-systest/lib/openstack_lib.resource
@@ -31,7 +31,7 @@ Get Server Flavor ID
     [Documentation]   Get from Openstack the flavor id of a server/VM passed as argument.
     [Arguments]   ${server_id}
     Should Not Be Empty   ${server_id}
-    ${rc}   ${stdout}=   Run And Return Rc And Output   openstack server show ${server_id} | grep flavor | awk 'NR>1{print $1}' RS='(' FS=')'
+    ${rc}   ${stdout}=   Run And Return Rc And Output   openstack server show ${server_id} -c flavor -f value |yq -r '.id'
     Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${SUCCESS_RETURN_CODE}
     RETURN   ${stdout}