add timeout for loops and update to new image names
diff --git a/full-values.yaml b/full-values.yaml
index 0688676..e9402c1 100644
--- a/full-values.yaml
+++ b/full-values.yaml
@@ -36,9 +36,6 @@
 # information below (search for START_OFAGENT_GO).
 use_ofagent_go: true
 
-replicas:
-  cli: ~
-
 images:
   onos:
     repository: voltha/voltha-onos
@@ -73,12 +70,12 @@
 #    tag: master
 # START_OFAGENT_GO - Comment the following block to use the Python implementation
 # of the ofagent
-  ofagent:
-    repository: voltha/ofagent-go
-    tag: master
+#  ofagent:
+#    repository: voltha/voltha-ofagent-go
+#    tag: master
 # END_OFAGENT_GO
 #  ofagent:
-#    repository: voltha/voltha-ofagent
+#    repository: voltha/voltha-ofagent-py
 #    tag: 2.1.1
 #  rw_core:
 #    repository: voltha/voltha-rw-core