diff --git a/modules.bzl b/modules.bzl
index cb0e291..21275a5 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -85,33 +85,33 @@
     # Drivers
     "//drivers/default:onos-drivers-default",
     "//drivers/arista:onos-drivers-arista-oar",
-    #"//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/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/cisco/netconf:onos-drivers-cisco-netconf-oar",
-    #"//drivers/cisco/rest:onos-drivers-cisco-rest-oar",
-    #"//drivers/corsa:onos-drivers-corsa-oar",
-    #"//drivers/fujitsu:onos-drivers-fujitsu-oar",
-    #"//drivers/lumentum:onos-drivers-lumentum-oar",
-    #"//drivers/netconf:onos-drivers-netconf-oar",
-    #"//drivers/server:onos-drivers-server-oar",
-    #"//drivers/optical:onos-drivers-optical-oar",
-    #"//drivers/ovsdb:onos-drivers-ovsdb-oar",
-    #"//drivers/juniper:onos-drivers-juniper-oar",
-    #"//drivers/lisp:onos-drivers-lisp-oar",
-    #"//drivers/flowspec:onos-drivers-flowspec-oar",
+    "//drivers/cisco/netconf:onos-drivers-cisco-netconf-oar",
+    "//drivers/cisco/rest:onos-drivers-cisco-rest-oar",
+    "//drivers/corsa:onos-drivers-corsa-oar",
+    "//drivers/fujitsu:onos-drivers-fujitsu-oar",
+    "//drivers/lumentum:onos-drivers-lumentum-oar",
+    "//drivers/netconf:onos-drivers-netconf-oar",
+    "//drivers/server:onos-drivers-server-oar",
+    "//drivers/optical:onos-drivers-optical-oar",
+    "//drivers/ovsdb:onos-drivers-ovsdb-oar",
+    "//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/oplink:onos-drivers-oplink-oar",
+    "//drivers/oplink:onos-drivers-oplink-oar",
     #"//drivers/bmv2:onos-drivers-bmv2-oar",
     #"//drivers/barefoot:onos-drivers-barefoot-oar",
     #"//drivers/mellanox:onos-drivers-mellanox-oar",
-    #"//drivers/hp:onos-drivers-hp-oar",
+    "//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/openflow:onos-drivers-polatis-openflow-oar",
+    "//drivers/polatis/openflow:onos-drivers-polatis-openflow-oar",
     #"//drivers/odtn-driver:onos-drivers-odtn-driver-oar",
 ]
 
@@ -214,7 +214,7 @@
     #    '//apps/tenbi:onos-apps-tenbi-oar',
     #"//protocols/restconf/server:onos-protocols-restconf-server-oar",
     #"//apps/restconf:onos-apps-restconf-oar",
-    #"//apps/flowspec-api:onos-apps-flowspec-api-oar",
+    "//apps/flowspec-api:onos-apps-flowspec-api-oar",
     #"//apps/yang:onos-apps-yang-oar",
     #"//apps/yang-gui:onos-apps-yang-gui-oar",
     #"//apps/cord-support:onos-apps-cord-support-oar",