diff --git a/.gitmodules b/.gitmodules
index f93547e..d810b69 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -5,4 +5,4 @@
 
 [submodule "api/asn1_codec"]
 	path = api/asn1_codec
-	url = https://github.com/iyourshaw/asn1_codec.git
+	url = https://github.com/usdot-jpo-ode/asn1_codec.git
diff --git a/api/asn1_codec b/api/asn1_codec
index 3b40766..6ce8588 160000
--- a/api/asn1_codec
+++ b/api/asn1_codec
@@ -1 +1 @@
-Subproject commit 3b407666b09e2e7c3886bf6953d5821b43748e03
+Subproject commit 6ce8588e77cde969fa419f1cc960c4eb05829ff1
diff --git a/api/jpo-conflictmonitor b/api/jpo-conflictmonitor
index 9d44194..5e53f4f 160000
--- a/api/jpo-conflictmonitor
+++ b/api/jpo-conflictmonitor
@@ -1 +1 @@
-Subproject commit 9d441945166612808c40bd830b56fd51555a0b8b
+Subproject commit 5e53f4f8e76d8bfd9317ea90851e9d8d47b55ba4