building upon the great work done at #4898 closes #4898 --------- Signed-off-by: Carlos Alexandro Becker <caarlos0@users.noreply.github.com> Co-authored-by: Dylan Myers <dylan.myers@bluemedora.com>