diff --git a/modules.bzl b/modules.bzl
index 1d74543..bee196c 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -88,7 +88,7 @@
     "//drivers/ciena/waveserver:onos-drivers-ciena-waveserver-oar",
     "//drivers/ciena/c5162:onos-drivers-ciena-c5162-oar",
     "//drivers/ciena/c5170:onos-drivers-ciena-c5170-oar",
-    #"//drivers/ciena/waveserverai:onos-drivers-ciena-waveserverai-oar",
+    "//drivers/ciena/waveserverai:onos-drivers-ciena-waveserverai-oar",
     "//drivers/cisco/netconf:onos-drivers-cisco-netconf-oar",
     "//drivers/cisco/rest:onos-drivers-cisco-rest-oar",
     "//drivers/corsa:onos-drivers-corsa-oar",
@@ -101,8 +101,8 @@
     "//drivers/juniper:onos-drivers-juniper-oar",
     "//drivers/lisp:onos-drivers-lisp-oar",
     "//drivers/flowspec:onos-drivers-flowspec-oar",
-    #"//drivers/huawei:onos-drivers-huawei-oar",
-    #"//drivers/microsemi/ea1000:onos-drivers-microsemi-ea1000-oar",
+    "//drivers/huawei:onos-drivers-huawei-oar",
+    "//drivers/microsemi/ea1000:onos-drivers-microsemi-ea1000-oar",
     "//drivers/oplink:onos-drivers-oplink-oar",
     #"//drivers/bmv2:onos-drivers-bmv2-oar",
     #"//drivers/barefoot:onos-drivers-barefoot-oar",
@@ -110,9 +110,9 @@
     "//drivers/hp:onos-drivers-hp-oar",
     #"//drivers/p4runtime:onos-drivers-p4runtime-oar",
     #"//drivers/gnmi:onos-drivers-gnmi-oar",
-    #"//drivers/polatis/netconf:onos-drivers-polatis-netconf-oar",
+    "//drivers/polatis/netconf:onos-drivers-polatis-netconf-oar",
     "//drivers/polatis/openflow:onos-drivers-polatis-openflow-oar",
-    #"//drivers/odtn-driver:onos-drivers-odtn-driver-oar",
+    "//drivers/odtn-driver:onos-drivers-odtn-driver-oar",
 ]
 
 ONOS_PROVIDERS = [
@@ -219,7 +219,7 @@
     "//apps/yang-gui:onos-apps-yang-gui-oar",
     #"//apps/cord-support:onos-apps-cord-support-oar",
     #"//apps/network-troubleshoot:onos-apps-network-troubleshoot-oar",
-    #"//apps/l3vpn:onos-apps-l3vpn-oar",
+    "//apps/l3vpn:onos-apps-l3vpn-oar",
     #"//apps/openroadm:onos-apps-openroadm-oar",
     #"//apps/artemis:onos-apps-artemis-oar",
     #"//apps/pi-demo/ecmp:onos-apps-pi-demo-ecmp-oar",
@@ -233,7 +233,7 @@
     #"//apps/openstacktelemetry:onos-apps-openstacktelemetry-oar",
     #"//apps/p4-tutorial/pipeconf:onos-apps-p4-tutorial-pipeconf-oar",
     #"//apps/p4-tutorial/mytunnel:onos-apps-p4-tutorial-mytunnel-oar",
-    #"//apps/cfm:onos-apps-cfm-oar",
+    "//apps/cfm:onos-apps-cfm-oar",
     "//apps/routeradvertisement:onos-apps-routeradvertisement-oar",
     #"//apps/powermanagement:onos-apps-powermanagement-oar",
     #"//apps/t3:onos-apps-t3-oar",