diff --git a/shim/third-party/boost/BUCK b/shim/third-party/boost/BUCK
index f9ab497e..a0d3bbf4 100644
--- a/shim/third-party/boost/BUCK
+++ b/shim/third-party/boost/BUCK
@@ -16,6 +16,7 @@ boost_libs(
         "lexical_cast",
         "multi_index",
         "preprocessor",
+        "program_options",
         "range",
         "sort",
         "variant",
@@ -24,7 +25,6 @@ boost_libs(
         "container",
         "context",
         "filesystem",
-        "program_options",
         "random",
         "regex",
         "thread",
diff --git a/shim/third-party/boost/boost.bzl b/shim/third-party/boost/boost.bzl
index 5fb6f3b6..7b283631 100644
--- a/shim/third-party/boost/boost.bzl
+++ b/shim/third-party/boost/boost.bzl
@@ -32,7 +32,9 @@ def boost_library(library: str, header_only: bool):
         name = "boost_{}".format(library),
         packages = {
             "//os:linux-fedora": ["boost-devel"],
-            "//os:linux-ubuntu": ["libboost-{}-dev".format(library)],
+            "//os:linux-ubuntu": [
+                "libboost-dev" if header_only else "libboost-{}-dev".format(library),
+            ],
             "//os:macos-homebrew": ["boost"],
         },
         exported_linker_flags = exported_linker_flags,
diff --git a/shim/third-party/libsodium/BUCK b/shim/third-party/libsodium/BUCK
index 915fb8bc..b2d8fe4f 100644
--- a/shim/third-party/libsodium/BUCK
+++ b/shim/third-party/libsodium/BUCK
@@ -13,8 +13,8 @@ pkgconfig_system_library(
     name = "sodium",
     packages = {
         "//os:linux-fedora": ["libsodium-devel"],
-        "//os:linux-ubuntu": ["libsodium"],
-        "//os:macos-homebrew": ["libsodium-dev"],
+        "//os:linux-ubuntu": ["libsodium-dev"],
+        "//os:macos-homebrew": ["libsodium"],
     },
     pkgconfig_name = "libsodium",
 )