diff --git a/modules.bzl b/modules.bzl
index bee196c..b829045 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -149,82 +149,82 @@
     "//apps/dhcp:onos-apps-dhcp-oar",
     "//apps/dhcprelay:onos-apps-dhcprelay-oar",
     "//apps/fwd:onos-apps-fwd-oar",
-    #"//apps/packet-stats:onos-apps-packet-stats-oar",
+    "//apps/packet-stats:onos-apps-packet-stats-oar",
     "//apps/acl:onos-apps-acl-oar",
-    #"//apps/bgprouter:onos-apps-bgprouter-oar",
+    "//apps/bgprouter:onos-apps-bgprouter-oar",
     "//apps/cip:onos-apps-cip-oar",
-    #"//apps/drivermatrix:onos-apps-drivermatrix-oar",
-    #"//apps/events:onos-apps-events-oar",
+    "//apps/drivermatrix:onos-apps-drivermatrix-oar",
+    "//apps/events:onos-apps-events-oar",
     "//apps/proxyarp:onos-apps-proxyarp-oar",
     "//apps/segmentrouting:onos-apps-segmentrouting-oar",
-    #"//apps/gangliametrics:onos-apps-gangliametrics-oar",
-    #"//apps/graphitemetrics:onos-apps-graphitemetrics-oar",
-    #"//apps/flowanalyzer:onos-apps-flowanalyzer-oar",
-    #"//apps/intentsync:onos-apps-intentsync-oar",
-    #"//apps/influxdbmetrics:onos-apps-influxdbmetrics-oar",
-    #"//apps/metrics:onos-apps-metrics-oar",
-    #"//apps/mfwd:onos-apps-mfwd-oar",
-    #"//apps/mlb:onos-apps-mlb-oar",
+    "//apps/gangliametrics:onos-apps-gangliametrics-oar",
+    "//apps/graphitemetrics:onos-apps-graphitemetrics-oar",
+    "//apps/flowanalyzer:onos-apps-flowanalyzer-oar",
+    "//apps/intentsync:onos-apps-intentsync-oar",
+    "//apps/influxdbmetrics:onos-apps-influxdbmetrics-oar",
+    "//apps/metrics:onos-apps-metrics-oar",
+    "//apps/mfwd:onos-apps-mfwd-oar",
+    "//apps/mlb:onos-apps-mlb-oar",
     #"//apps/openstacknetworking:onos-apps-openstacknetworking-oar",
     "//apps/mobility:onos-apps-mobility-oar",
-    #"//apps/newoptical:onos-apps-newoptical-oar",
+    "//apps/newoptical:onos-apps-newoptical-oar",
     "//apps/optical-model:onos-apps-optical-model-oar",
-    #"//apps/optical-rest:onos-apps-optical-rest-oar",
+    "//apps/optical-rest:onos-apps-optical-rest-oar",
     "//apps/pathpainter:onos-apps-pathpainter-oar",
     "//apps/pcep-api:onos-apps-pcep-api-oar",
-    #"//apps/pim:onos-apps-pim-oar",
-    #"//apps/linkprops:onos-apps-linkprops-oar",
-    #"//apps/reactive-routing:onos-apps-reactive-routing-oar",
-    #"//apps/roadm:onos-apps-roadm-oar",
-    #"//apps/sdnip:onos-apps-sdnip-oar",
-    #"//apps/test/cluster-ha:onos-apps-test-cluster-ha-oar",
-    #"//apps/test/demo:onos-apps-test-demo-oar",
+    "//apps/pim:onos-apps-pim-oar",
+    "//apps/linkprops:onos-apps-linkprops-oar",
+    "//apps/reactive-routing:onos-apps-reactive-routing-oar",
+    "//apps/roadm:onos-apps-roadm-oar",
+    "//apps/sdnip:onos-apps-sdnip-oar",
+    "//apps/test/cluster-ha:onos-apps-test-cluster-ha-oar",
+    "//apps/test/demo:onos-apps-test-demo-oar",
     "//apps/test/distributed-primitives:onos-apps-test-distributed-primitives-oar",
-    #"//apps/test/election:onos-apps-test-election-oar",
-    #"//apps/test/flow-perf:onos-apps-test-flow-perf-oar",
-    #"//apps/test/intent-perf:onos-apps-test-intent-perf-oar",
-    #"//apps/test/route-scale:onos-apps-test-route-scale-oar",
-    #"//apps/test/loadtest:onos-apps-test-loadtest-oar",
-    #"//apps/test/netcfg-monitor:onos-apps-test-netcfg-monitor-oar",
-    #"//apps/test/messaging-perf:onos-apps-test-messaging-perf-oar",
-    #"//apps/test/primitive-perf:onos-apps-test-primitive-perf-oar",
-    #"//apps/test/transaction-perf:onos-apps-test-transaction-perf-oar",
-    #"//apps/virtualbng:onos-apps-virtualbng-oar",
-    #"//apps/vpls:onos-apps-vpls-oar",
-    #"//apps/vrouter:onos-apps-vrouter-oar",
-    #"//apps/routing/fibinstaller:onos-apps-routing-fibinstaller-oar",
-    #"//apps/routing/cpr:onos-apps-routing-cpr-oar",
+    "//apps/test/election:onos-apps-test-election-oar",
+    "//apps/test/flow-perf:onos-apps-test-flow-perf-oar",
+    "//apps/test/intent-perf:onos-apps-test-intent-perf-oar",
+    "//apps/test/route-scale:onos-apps-test-route-scale-oar",
+    "//apps/test/loadtest:onos-apps-test-loadtest-oar",
+    "//apps/test/netcfg-monitor:onos-apps-test-netcfg-monitor-oar",
+    "//apps/test/messaging-perf:onos-apps-test-messaging-perf-oar",
+    "//apps/test/primitive-perf:onos-apps-test-primitive-perf-oar",
+    "//apps/test/transaction-perf:onos-apps-test-transaction-perf-oar",
+    "//apps/virtualbng:onos-apps-virtualbng-oar",
+    "//apps/vpls:onos-apps-vpls-oar",
+    "//apps/vrouter:onos-apps-vrouter-oar",
+    "//apps/routing/fibinstaller:onos-apps-routing-fibinstaller-oar",
+    "//apps/routing/cpr:onos-apps-routing-cpr-oar",
     "//apps/routing/fpm:onos-apps-routing-fpm-oar",
-    #"//apps/vtn:onos-apps-vtn-oar",
+    "//apps/vtn:onos-apps-vtn-oar",
     "//apps/faultmanagement:onos-apps-faultmanagement-oar",
     #"//apps/openstacknode:onos-apps-openstacknode-oar",
-    #"//apps/cpman/app:onos-apps-cpman-app-oar",
-    #"//apps/scalablegateway:onos-apps-scalablegateway-oar",
-    #"//apps/castor:onos-apps-castor-oar",
+    "//apps/cpman/app:onos-apps-cpman-app-oar",
+    "//apps/scalablegateway:onos-apps-scalablegateway-oar",
+    "//apps/castor:onos-apps-castor-oar",
     #    '//apps/yms:onos-apps-yms-oar',
-    #"//apps/ofagent:onos-apps-ofagent-oar",
+    "//apps/ofagent:onos-apps-ofagent-oar",
     "//apps/mappingmanagement:onos-apps-mappingmanagement-oar",
     "//apps/config:onos-apps-config-oar",
-    #"//apps/configsync:onos-apps-configsync-oar",
-    #"//apps/configsync-netconf:onos-apps-configsync-netconf-oar",
+    "//apps/configsync:onos-apps-configsync-oar",
+    "//apps/configsync-netconf:onos-apps-configsync-netconf-oar",
     "//apps/netconf/client:onos-apps-netconf-client-oar",
-    #"//apps/tetopology:onos-apps-tetopology-oar",
-    #"//apps/tetunnel:onos-apps-tetunnel-oar",
+    "//apps/tetopology:onos-apps-tetopology-oar",
+    "//apps/tetunnel:onos-apps-tetunnel-oar",
     #    '//apps/tenbi/yangmodel:onos-apps-tenbi-yangmodel-feature',
     #    '//apps/tenbi:onos-apps-tenbi-oar',
-    #"//protocols/restconf/server:onos-protocols-restconf-server-oar",
-    #"//apps/restconf:onos-apps-restconf-oar",
+    "//protocols/restconf/server:onos-protocols-restconf-server-oar",
+    "//apps/restconf:onos-apps-restconf-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",
-    #"//apps/network-troubleshoot:onos-apps-network-troubleshoot-oar",
+    "//apps/cord-support:onos-apps-cord-support-oar",
+    "//apps/network-troubleshoot:onos-apps-network-troubleshoot-oar",
     "//apps/l3vpn:onos-apps-l3vpn-oar",
-    #"//apps/openroadm:onos-apps-openroadm-oar",
+    "//apps/openroadm:onos-apps-openroadm-oar",
     #"//apps/artemis:onos-apps-artemis-oar",
-    #"//apps/pi-demo/ecmp:onos-apps-pi-demo-ecmp-oar",
-    #"//apps/gluon:onos-apps-gluon-oar",
-    #"//apps/evpnopenflow:onos-apps-evpnopenflow-oar",
+    "//apps/pi-demo/ecmp:onos-apps-pi-demo-ecmp-oar",
+    "//apps/gluon:onos-apps-gluon-oar",
+    "//apps/evpnopenflow:onos-apps-evpnopenflow-oar",
     "//apps/route-service:onos-apps-route-service-oar",
     "//apps/evpn-route-service:onos-apps-evpn-route-service-oar",
     #"//incubator/protobuf/registry:onos-incubator-protobuf-registry-oar",
@@ -235,17 +235,17 @@
     #"//apps/p4-tutorial/mytunnel:onos-apps-p4-tutorial-mytunnel-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",
-    #"//apps/simplefabric:onos-apps-simplefabric-oar",
+    "//apps/powermanagement:onos-apps-powermanagement-oar",
+    "//apps/t3:onos-apps-t3-oar",
+    "//apps/simplefabric:onos-apps-simplefabric-oar",
     #"//apps/kafka-integration:onos-apps-kafka-integration-oar",
-    #"//apps/rabbitmq:onos-apps-rabbitmq-oar",
-    #"//apps/odtn/api:onos-apps-odtn-api-oar",
-    #"//apps/odtn/service:onos-apps-odtn-service-oar",
+    "//apps/rabbitmq:onos-apps-rabbitmq-oar",
+    "//apps/odtn/api:onos-apps-odtn-api-oar",
+    "//apps/odtn/service:onos-apps-odtn-service-oar",
     "//apps/mcast:onos-apps-mcast-oar",
-    #"//apps/layout:onos-apps-layout-oar",
-    #"//apps/imr:onos-apps-imr-oar",
-    #"//apps/nodemetrics:onos-apps-nodemetrics-oar",
+    "//apps/layout:onos-apps-layout-oar",
+    "//apps/imr:onos-apps-imr-oar",
+    "//apps/nodemetrics:onos-apps-nodemetrics-oar",
     #"//web/gui2:onos-web-gui2-oar",
 ]
 
@@ -272,25 +272,25 @@
 ]
 
 PIPELINES = [
-    #"//pipelines/basic:onos-pipelines-basic-oar",
-    #"//pipelines/fabric:onos-pipelines-fabric-oar",
+    "//pipelines/basic:onos-pipelines-basic-oar",
+    "//pipelines/fabric:onos-pipelines-fabric-oar",
 ]
 
 APP_JARS = [
-    #"//apps/cpman/api:onos-apps-cpman-api",
+    "//apps/cpman/api:onos-apps-cpman-api",
     "//apps/routing-api:onos-apps-routing-api",
     "//apps/dhcp/api:onos-apps-dhcp-api",
     "//apps/dhcp/app:onos-apps-dhcp-app",
-    #"//apps/imr/api:onos-apps-imr-api",
-    #"//apps/imr/app:onos-apps-imr-app",
+    "//apps/imr/api:onos-apps-imr-api",
+    "//apps/imr/app:onos-apps-imr-app",
     "//apps/dhcprelay:onos-apps-dhcprelay",
     "//apps/fwd:onos-apps-fwd",
-    #"//apps/iptopology-api:onos-apps-iptopology-api",
+    "//apps/iptopology-api:onos-apps-iptopology-api",
     "//apps/routing/common:onos-apps-routing-common",
-    #"//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc",
-    #"//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr",
-    #"//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr",
-    #"//apps/vtn/vtnweb:onos-apps-vtn-vtnweb",
+    "//apps/vtn/vtnrsc:onos-apps-vtn-vtnrsc",
+    "//apps/vtn/sfcmgr:onos-apps-vtn-sfcmgr",
+    "//apps/vtn/vtnmgr:onos-apps-vtn-vtnmgr",
+    "//apps/vtn/vtnweb:onos-apps-vtn-vtnweb",
     #   '//apps/p4runtime-test:onos-apps-p4runtime-test',
     #"//apps/kafka-integration/api:onos-apps-kafka-integration-api",
     #"//apps/kafka-integration/app:onos-apps-kafka-integration-app",