diff --git a/salt/grains/core.py b/salt/grains/core.py
index 992532689a35..020ec1fd2a20 100644
--- a/salt/grains/core.py
+++ b/salt/grains/core.py
@@ -2823,7 +2823,7 @@ def os_data():
         grains["osfullname"] = "{} {}".format(grains["kernel"], grains["osrelease"])
         grains.update(_bsd_cpudata(grains))
     elif grains["kernel"] in ("OpenBSD", "NetBSD"):
-        grains["os_family"] = grains["os"] = grains["kernel"]
+        grains["os_family"] = grains["osfullname"] = grains["os"] = grains["kernel"]
         grains.update(_bsd_cpudata(grains))
         grains["osrelease"] = grains["kernelrelease"].split("-")[0]
         grains["osfullname"] = "{} {}".format(grains["kernel"], grains["osrelease"])
diff --git a/salt/utils/network.py b/salt/utils/network.py
index 69384819d3bf..e05255869eda 100644
--- a/salt/utils/network.py
+++ b/salt/utils/network.py
@@ -1099,7 +1099,7 @@ def netbsd_interfaces():
     address)
     """
     # NetBSD versions prior to 8.0 can still use linux_interfaces()
-    if Version(os.uname()[2]) < Version("8.0"):
+    if Version(os.uname()[2].split("_")[0]) < Version("8.0"):
         return linux_interfaces()
 
     ifconfig_path = salt.utils.path.which("ifconfig")