diff --git a/tools/test/bin/onos-activate-all-scenario-default-app-list b/tools/test/bin/onos-activate-all-scenario-default-app-list
index 771a5df..6a5aa9f 100644
--- a/tools/test/bin/onos-activate-all-scenario-default-app-list
+++ b/tools/test/bin/onos-activate-all-scenario-default-app-list
@@ -1,163 +1,188 @@
-cpr
-mappingmanagement
-yang
-yang-gui
-config
-restconf
-protocols.restconfserver
-faultmanagement
-netconf
-netconfsb
-models.common
-models.l3vpn
-tunnel
+# Generated with onos-generate-app-list
+acl
+artemis
+bgp
 bgpcep
-l3vpn
-models.huawei
-drivers.huawei
-models.microsemi
-drivers.netconf
-netcfglinksprovider
-openflow-message
-cpman
-protocols.grpc
-protocols.p4runtime
-hostprovider
-ovsdb-base
-drivers.ovsdb
-openstacknode
-openstacknetworking
-models.ietf
-kafka-integration
-inbandtelemetry
+bgprouter
+castor
+cfm
+cip
+cluster-ha
+config
 configsync
-models.tapi
+configsync-netconf
+cord-support
+cpman
+cpr
+demo
+dhcp
+dhcprelay
+distributedprimitives
+drivermatrix
+# Cannot be deactivated
+# drivers
+drivers.arista
+drivers.barefoot
+drivers.bmv2
+drivers.ciena.c5162
+drivers.ciena.c5170
+drivers.ciena.waveserver
+drivers.ciena.waveserverai
+drivers.cisco.netconf
+drivers.cisco.rest
+drivers.corsa
+drivers.flowspec
+drivers.fujitsu
+drivers.gnmi
+drivers.gnoi
+drivers.hp
+drivers.huawei
+drivers.juniper
+drivers.lisp
+drivers.lumentum
+drivers.mellanox
+drivers.microsemi.ea1000
+drivers.netconf
+drivers.odtn-driver
+drivers.oplink
+drivers.optical
+drivers.ovsdb
+drivers.p4runtime
+drivers.polatis.netconf
+drivers.polatis.openflow
+drivers.server
+drivers.stratum
+election
+events
+evpn-route-service
+evpnopenflow
+faultmanagement
+fibinstaller
+flow-perf
+flowanalyzer
+flowspec-api
+fpm
+fwd
+gangliametrics
+generaldeviceprovider
+gluon
+graphitemetrics
+gui
+gui2
+hostprobingprovider
+hostprovider
+imr
+inbandtelemetry
+influxdbmetrics
+intentperf
+intentsynchronizer
+isis
+k8s-networking
+k8s-node
+kafka-integration
+l3vpn
+layout
+linkdiscovery
+linkprops
+lisp
+lldpprovider
+loadtest
+mappingmanagement
+mcast
+messaging-perf
+metrics
+mfwd
+mlb
+mobility
+models.ciena.waveserverai
+models.common
+models.huawei
+models.ietf
+models.l3vpn
+models.microsemi
 models.openconfig
 models.openconfig-infinera
 models.openconfig-odtn
+models.openroadm
+models.polatis
+models.tapi
+netcfg-monitor
+netcfghostprovider
+netcfglinksprovider
+netconf
+netconfsb
+network-troubleshoot
+newoptical
+nodemetrics
+null
 odtn-api
-restsb
+# Atomix crash
+# odtn-service
+ofagent
+onlp-demo
+openflow
+openflow-base
+openflow-message
+openroadm
+openstacknetworking
+openstacknetworkingui
+openstacknode
+openstacktelemetry
+openstacktroubleshoot
+openstackvtap
 optical-model
-configsync-netconf
-# crashes in Atomix
-#odtn-service
-vtn
-loadtest
-protocols.gnmi
-generaldeviceprovider
+optical-rest
+ovsdb
+ovsdb-base
+ovsdbhostprovider
 p4runtime
-drivers.p4runtime
+p4tutorial.mytunnel
+p4tutorial.pipeconf
+packet-stats
+packetthrottle
+pathpainter
+pcep
+pcep-api
+pim
 pipelines.basic
 pipelines.fabric
-events
-intentsynchronizer
-route-service
-fpm
-dhcprelay
-metrics
-fwd
+portloadbalancer
+powermanagement
+primitiveperf
+protocols.gnmi
+protocols.gnoi
+protocols.grpc
+protocols.p4runtime
+protocols.restconfserver
+protocols.xmpp
+protocols.xmpp.pubsub
 proxyarp
-models.polatis
-drivers.polatis.netconf
-lldpprovider
-openflow-base
-openflow
-network-troubleshoot
-drivers.mellanox
-drivermatrix
-messaging-perf
-hostprobingprovider
-pcep-api
-distributedprimitives
-openstackvtap
-virtual
-models.openroadm
-openroadm
+rabbitmq
+reactive-routing
+restconf
+restsb
+roadm
+route-service
+routeradvertisement
+routescale
+scalablegateway
+sdnip
+segmentrouting
+simplefabric
+snmp
+t3
 tetopology
 tetunnel
-ovsdbhostprovider
-ovsdb
-drivers.barefoot
-influxdbmetrics
-evpn-route-service
-gluon
-evpnopenflow
-drivers.juniper
-pathpainter
-simplefabric
-flowanalyzer
-null
-# Application cannot be shut down
-#transaction-perf
-drivers.gnmi
-drivers.stratum
-workflow
-fibinstaller
-vrouter
-sdnip
-artemis
-flow-perf
-lisp
-drivers.lisp
-rabbitmq
-snmp
-newoptical
-linkdiscovery
-drivers.arista
-pim
-routescale
-mcast
-segmentrouting
-bgprouter
-protocols.xmpp
-openstacktelemetry
-castor
-drivers.ciena.c5162
-netcfg-monitor
-xmpp.device
-flowspec-api
-routeradvertisement
-packet-stats
-mlb
-pcep
-ofagent
-demo
-t3
-virtualbng
-gangliametrics
-drivers.ciena.c5170
-drivers.oplink
-isis
-drivers.cisco.rest
-roadm
-drivers.bmv2
-vpls
-p4tutorial.pipeconf
-p4tutorial.mytunnel
-openstacktroubleshoot
-models.ciena.waveserverai
-layout
-graphitemetrics
-powermanagement
-optical-rest
 tl1
-acl
-cord-support
-intentperf
-mfwd
-imr
-dhcp
-openstacknetworkingui
-cfm
-scalablegateway
-cluster-ha
-reactive-routing
-nodemetrics
-mobility
-bgp
-linkprops
-cip
-election
-primitiveperf
-protocols.xmpp.pubsub
-netcfghostprovider
\ No newline at end of file
+transaction-perf
+tunnel
+virtual
+virtualbng
+vpls
+vrouter
+vtn
+workflow
+workflow.ofoverlay
+xmpp.device
+yang
+yang-gui
diff --git a/tools/test/bin/onos-generate-activate-all-scenario b/tools/test/bin/onos-generate-activate-all-scenario
index 52cf382..e55758f 100755
--- a/tools/test/bin/onos-generate-activate-all-scenario
+++ b/tools/test/bin/onos-generate-activate-all-scenario
@@ -1,6 +1,6 @@
-#!/usr/bin/env python
+#!/usr/bin/env python2.7
 
-import sys, os
+import sys
 
 SCENARIO_HEADER = '''
 <!--
diff --git a/tools/test/bin/onos-generate-app-list b/tools/test/bin/onos-generate-app-list
new file mode 100755
index 0000000..977256a
--- /dev/null
+++ b/tools/test/bin/onos-generate-app-list
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+[[ ! -d "$ONOS_ROOT" ]] && echo "ONOS_ROOT is not defined" >&2 && exit 1
+. $ONOS_ROOT/tools/build/envDefaults
+
+cd $ONOS_ROOT
+
+echo "# Generated with onos-generate-app-list"
+bazel query "kind('onos_app', deps(//:onos-package))" --output build --keep_going \
+    | grep app_name | cut -d'"' -f2 | sed 's/org.onosproject.//g' | sort
\ No newline at end of file