diff --git a/scripts/policy/frameworks/notice/community-id.zeek b/scripts/policy/frameworks/notice/community-id.zeek
index 122d3adba5..a1b9a65659 100644
--- a/scripts/policy/frameworks/notice/community-id.zeek
+++ b/scripts/policy/frameworks/notice/community-id.zeek
@@ -1,11 +1,9 @@
-# Source this script in addition to protocols/conn/community-id
-# to add Community ID to notices.
+# Source this script to add Community ID to notices.
+# This script will automatically load the main community-id script.
 
-# Only support loading this if the main script is also loaded.
 @load base/protocols/conn
 @load base/frameworks/notice
-
-@ifdef ( CommunityID::seed )
+@load policy/protocols/conn/community-id-logging
 
 module CommunityID::Notice;
 
@@ -23,6 +21,5 @@ export {
 hook Notice::notice(n: Notice::Info)
 	{
 	if ( CommunityID::Notice::enabled && n?$conn )
-		n$community_id = community_id_v1(n$conn$id);
+		n$community_id = community_id_v1(n$conn$id, CommunityID::seed, CommunityID::do_base64);
 	}
-@endif
diff --git a/testing/external/commit-hash.zeek-testing b/testing/external/commit-hash.zeek-testing
index 8a79b0e32b..9d69d127e5 100644
--- a/testing/external/commit-hash.zeek-testing
+++ b/testing/external/commit-hash.zeek-testing
@@ -1 +1 @@
-d59caff708b41db11fa0cbfe0b1f95b46c3e700e
+be1821ecf246b70ea22f975228c2c3db61b908bb
diff --git a/testing/external/commit-hash.zeek-testing-private b/testing/external/commit-hash.zeek-testing-private
index 72b4b0a144..f5fa990771 100644
--- a/testing/external/commit-hash.zeek-testing-private
+++ b/testing/external/commit-hash.zeek-testing-private
@@ -1 +1 @@
-7162c907aa25e155ea841710ef30b65afb578c3f
+2f22a30cd5f9328e4ce583261d4f22303d89e1e3