diff --git a/Source/common/BUILD b/Source/common/BUILD
index b0b78db0f..d9141fe38 100644
--- a/Source/common/BUILD
+++ b/Source/common/BUILD
@@ -2,7 +2,7 @@ load("//:helper.bzl", "santa_unit_test")
 
 package(default_visibility = ["//:santa_package_group"])
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 cc_library(
     name = "SantaCache",
diff --git a/Source/santa/BUILD b/Source/santa/BUILD
index da9085f95..11c4597d6 100644
--- a/Source/santa/BUILD
+++ b/Source/santa/BUILD
@@ -1,6 +1,6 @@
 load("@build_bazel_rules_apple//apple:macos.bzl", "macos_application")
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 exports_files([
     "Resources/Images.xcassets/AppIcon.appiconset/santa-hat-icon-256.png",
diff --git a/Source/santabundleservice/BUILD b/Source/santabundleservice/BUILD
index 667094c98..a6aa2c864 100644
--- a/Source/santabundleservice/BUILD
+++ b/Source/santabundleservice/BUILD
@@ -1,6 +1,6 @@
 load("@build_bazel_rules_apple//apple:macos.bzl", "macos_command_line_application")
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 objc_library(
     name = "santabs_lib",
diff --git a/Source/santactl/BUILD b/Source/santactl/BUILD
index 936bca1c4..b261200e6 100644
--- a/Source/santactl/BUILD
+++ b/Source/santactl/BUILD
@@ -1,8 +1,8 @@
-licenses(["notice"])  # Apache 2.0
-
 load("@build_bazel_rules_apple//apple:macos.bzl", "macos_command_line_application")
 load("//:helper.bzl", "santa_unit_test")
 
+licenses(["notice"])
+
 objc_library(
     name = "santactl_lib",
     srcs = [
diff --git a/Source/santad/BUILD b/Source/santad/BUILD
index 0d696f11c..87d2250c0 100644
--- a/Source/santad/BUILD
+++ b/Source/santad/BUILD
@@ -1,7 +1,7 @@
 load("@build_bazel_rules_apple//apple:macos.bzl", "macos_bundle")
 load("//:helper.bzl", "santa_unit_test")
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 objc_library(
     name = "santad_lib",
diff --git a/Source/santad/testdata/BUILD b/Source/santad/testdata/BUILD
index 4cfb99741..fd0c08886 100644
--- a/Source/santad/testdata/BUILD
+++ b/Source/santad/testdata/BUILD
@@ -1,4 +1,4 @@
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 filegroup(
     name = "binaryrules_testdata",
diff --git a/Source/santametricservice/BUILD b/Source/santametricservice/BUILD
index 741c247c0..9296d6afc 100644
--- a/Source/santametricservice/BUILD
+++ b/Source/santametricservice/BUILD
@@ -3,7 +3,7 @@ load("//:helper.bzl", "santa_unit_test")
 
 package(default_visibility = ["//:santa_package_group"])
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 objc_library(
     name = "SNTMetricServiceLib",
@@ -46,6 +46,11 @@ test_suite(
 macos_command_line_application(
     name = "santametricservice",
     bundle_id = "com.google.santa.metricservice",
+    codesignopts = [
+        "--timestamp",
+        "--force",
+        "--options library,kill,runtime",
+    ],
     infoplists = ["Info.plist"],
     minimum_os_version = "10.15",
     version = "//:version",
diff --git a/Source/santametricservice/Formats/BUILD b/Source/santametricservice/Formats/BUILD
index 63fe07210..61aae493e 100644
--- a/Source/santametricservice/Formats/BUILD
+++ b/Source/santametricservice/Formats/BUILD
@@ -1,9 +1,8 @@
-load("@build_bazel_rules_apple//apple:macos.bzl", "macos_command_line_application")
 load("//:helper.bzl", "santa_unit_test")
 
 package(default_visibility = ["//:santa_package_group"])
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 objc_library(
     name = "SNTMetricFormat",
diff --git a/Source/santametricservice/Writers/BUILD b/Source/santametricservice/Writers/BUILD
index 869cca408..fd4a710f1 100644
--- a/Source/santametricservice/Writers/BUILD
+++ b/Source/santametricservice/Writers/BUILD
@@ -1,9 +1,8 @@
-load("@build_bazel_rules_apple//apple:macos.bzl", "macos_command_line_application")
 load("//:helper.bzl", "santa_unit_test")
 
 package(default_visibility = ["//:santa_package_group"])
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 objc_library(
     name = "SNTMetricWriter",
diff --git a/Source/santasyncservice/BUILD b/Source/santasyncservice/BUILD
index 5263d71b2..0b4c27a1e 100644
--- a/Source/santasyncservice/BUILD
+++ b/Source/santasyncservice/BUILD
@@ -1,6 +1,6 @@
 load("@build_bazel_rules_apple//apple:macos.bzl", "macos_command_line_application")
 
-licenses(["notice"])  # Apache 2.0
+licenses(["notice"])
 
 objc_library(
     name = "santass_lib",