diff --git a/BUILD b/BUILD
index 7c76da0..5b7ea77 100644
--- a/BUILD
+++ b/BUILD
@@ -73,12 +73,12 @@
 
 # Runs ONOS as a single instance from the /tmp directory
 # FIXME: Still work in progress
-genrule(
-    name = "onos-run",
-    outs = ["onos-runner"],
-    srcs = ["onos-run-karaf", "onos-package"],
-    cmd = "sed \"s#ONOS_TAR=#ONOS_TAR=$(location :onos-package)#\" $(location onos-run-karaf) > $(location onos-runner); chmod +x $(location onos-runner)",
-    executable = True,
-    output_to_bindir = True,
-    visibility = ["//visibility:public"],
-)
+#genrule(
+#    name = "onos-run",
+#    outs = ["onos-runner"],
+#    srcs = ["onos-run-karaf", "onos-package"],
+#    cmd = "sed \"s#ONOS_TAR=#ONOS_TAR=$(location :onos-package)#\" $(location onos-run-karaf) > $(location onos-runner); chmod +x $(location onos-runner)",
+#    executable = True,
+#    output_to_bindir = True,
+#    visibility = ["//visibility:public"],
+#)
diff --git a/tools/build/bazel/onos_stage.py b/tools/build/bazel/onos_stage.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tools/build/bazel/onos_stage.py