diff --git a/developer/images_from_charts.sh b/developer/images_from_charts.sh
new file mode 100755
index 0000000..66e7bb2
--- /dev/null
+++ b/developer/images_from_charts.sh
@@ -0,0 +1,45 @@
+#!/usr/bin/env bash
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy
+# of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+# copy-ssh-keys.sh - Adds ssh keys to nodes given as parameters to the script,
+# after removing them from the ~/.ssh/known_hosts file on the local system.
+#
+# This script should be run interactively as it will prompt for input, and only
+# invoked once, so as not to add multiple copies of the SSH key to the remote
+# system.
+
+#############################################################
+#                                                           #
+#    Returns a list of images given a list of helm charts   #
+#                                                           #
+#############################################################
+
+output=""
+for chart in "$@";
+do
+  if [ "${chart}" = "etcd-cluster" ]; then
+    # shellcheck disable=SC1117
+    output+=$(helm template "${chart}" | grep "busyboxImage:\|version:\|repository:" | sed 's/busyboxImage://g' | sed 's/version://g'| sed 's/repository://g' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' | tr -d \" | awk '(NR%2){print$0p}{p=":"$0}')
+    # shellcheck disable=SC1117
+    output+="\n"
+  else
+    output+=$(helm template "${chart}" | grep "image:" | sed 's/image://g' | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' | tr -d \")
+    # shellcheck disable=SC1117
+    output+="\n"
+  fi
+done
+
+echo -e "${output}" | sort | uniq | sed '/^\s*$/d'
diff --git a/developer/pull_images.sh b/developer/pull_images.sh
new file mode 100755
index 0000000..8cb6a61
--- /dev/null
+++ b/developer/pull_images.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+# Copyright 2018-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy
+# of the License at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
+
+# copy-ssh-keys.sh - Adds ssh keys to nodes given as parameters to the script,
+# after removing them from the ~/.ssh/known_hosts file on the local system.
+#
+# This script should be run interactively as it will prompt for input, and only
+# invoked once, so as not to add multiple copies of the SSH key to the remote
+# system.
+
+#############################################################
+#                                                           #
+#    Pull a list of images into the local Docker Registry   #
+#                                                           #
+#############################################################
+
+display_help () {
+  echo "Downloads the images specified to the local Docker Registry."
+  echo " "
+  echo "Usage: $0 [-s|--source image-list-file] [-h|--help]"
+  echo " "
+  echo "   image-list-file               A file where to read images from (if not read by default from stdin)"
+  echo " "
+  echo "Example usages:"
+  echo "   echo alpine:3.6 | bash $0" # read the list of images from stdin
+  echo "   cat images | bash $0" # read the list of images from stdin
+  echo "   bash $0 -f images" # read images from a file images
+}
+
+while :; do
+  case $1 in
+    -s|--source)
+      shift
+      if [[ -z $1 ]] || [[ $1 = -h ]]
+      then
+        display_help
+        exit 1
+      fi
+      custom_file="$1"
+      ;;
+    -h|--help)
+      display_help
+      exit 0
+      ;;
+    *) break
+  esac
+  shift
+done
+
+while IFS= read -r image;
+do
+  docker pull "${image}" > /dev/null
+  echo "${image}"
+done < "${custom_file:-/dev/stdin}"
diff --git a/developer/tag_and_push.sh b/developer/tag_and_push.sh
old mode 100644
new mode 100755
index 3251e4f..db11968
--- a/developer/tag_and_push.sh
+++ b/developer/tag_and_push.sh
@@ -1,69 +1,135 @@
 #!/usr/bin/env bash
+
+# Copyright 2018-present Open Networking Foundation
 #
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed under the Apache License, Version 2.0 (the "License"); you may not
+# use this file except in compliance with the License.  You may obtain a copy
+# of the License at:
 #
 # http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  See the
+# License for the specific language governing permissions and limitations under
+# the License.
 
-###########################################################
-#                                                         #
-# Tags and push all the local images to a docker-registry #
-#                                                         #
-###########################################################
+# copy-ssh-keys.sh - Adds ssh keys to nodes given as parameters to the script,
+# after removing them from the ~/.ssh/known_hosts file on the local system.
+#
+# This script should be run interactively as it will prompt for input, and only
+# invoked once, so as not to add multiple copies of the SSH key to the remote
+# system.
+
+#############################################################
+#                                                           #
+# Tags and push a list of local images to a target registry #
+#                                                           #
+#############################################################
 
 #
 # Displays the help menu.
 #
 display_help () {
-  echo "Tags and pushes to a remote registry all the images present in the local docker registry."
-  echo "Note that this script won't change the tag on the container"
+  echo "Tags and pushes to a target Docker registry a list of images on the system or given in stdin."
   echo " "
-  echo "Usage: $0 [filter] [docker-registry] "
+  echo "Usage: $0 [-f|--filter filter] [-r|--registry docker-registry] [-s|--source image-file] [-t|--tag custom-tag] [-h --help]"
   echo " "
-  echo "   filter                  A string used to filter the images (used as 'grep -E \"^$FILTER\"')"
-  echo "   docker-registry         The address of the registry"
+  echo "   filter                  A string used to filter the image names (used as 'grep -E \"^$filter\"')"
+  echo "   docker-registry         The address of the target registry. DockerHub will be instead used by default"
+  echo "   custom-tag              An optional, custom tag to be used to tag images. The same tag of the original images will be used otherwise"
   echo " "
   echo "Example usages:"
-  echo "   ./tag_and_push.sh xosproject 192.168.10.100:30500" # tag all the xosproject images and push them to the registry
-  echo "   ./tag_and_push.sh . 192.168.10.100:30500" # tag all the images and push them to the registry
-  echo "   ./tag_and_push.sh xosproject" # push the xosproject images to dockerhub
+  echo "   echo onosproject/onos:1.13.5 | ./tag_and_push.sh" # push the local onosproject/onos:1.13.5 image given in input and pushes it to DockerHub
+  echo "   cat images | ./tag_and_push.sh -t my_tag" # tag with "my_tag" the images in the file images given in input and push them to DockerHub
+  echo "   ./tag_and_push.sh -s images.txt -t my_tag" # tag with "my_tag" the images in the file images.txt and push them to DockerHub
+  echo "   ./tag_and_push.sh -f xosproject 192.168.10.100:30500" # tag all the xosproject images and push them to the registry 192.168.10.100:30500
+  echo "   ./tag_and_push.sh -r 192.168.10.100:30500" # tag all local images and push them to the registry 192.168.10.100:30500
+  echo "   ./tag_and_push.sh --f xosproject" # push all local images containing xosproject in the name and pushes them to dockerhub
 }
 
-#
-# Tag and push all the locally available docker images
-#
-FILTER=$1
-REGISTRY=$2
+# Parse params
+while :; do
+  case $1 in
+    -s|--source)
+      shift
+      if [[ -z $1 ]] || [[ $1 = -f ]] || [[ $1 = -t ]] || [[ $1 = -r ]] || [[ $1 = -h ]]
+      then
+        display_help
+        exit 1
+      fi
+      custom_file="$1"
+      ;;
+    -r|--registry)
+      shift
+      if [[ -z $1 ]] || [[ $1 = -f ]] || [[ $1 = -t ]] || [[ $1 = -s ]] || [[ $1 = -h ]]
+      then
+        display_help
+        exit 1
+      fi
+      registry="$1"
+      ;;
+    -f|--filter)
+      shift
+      if [[ -z $1 ]] || [[ $1 = -r ]] || [[ $1 = -t ]] || [[ $1 = -s ]] || [[ $1 = -h ]]
+      then
+        display_help
+        exit 1
+      fi
+      filter="$1"
+      ;;
+    -t|--tag)
+      shift
+      if [[ -z $1 ]] || [[ $1 = -r ]] || [[ $1 = -f ]] || [[ $1 = -s ]] || [[ $1 = -h ]]
+      then
+        display_help
+        exit 1
+      fi
+      custom_tag="$1"
+      ;;
+    -h|--help)
+      display_help
+      exit 0
+      ;;
+    *) break
+  esac
+  shift
+done
 
-if [ "$FILTER" == "-h" ]; then
-  display_help
+# Source images list
+if [ -t 0 ]; then
+  images=$(docker images | awk '{if (NR!=1) {print}}' | awk '{ a=$1":"$2; print a }')
 else
-  echo "REGISTRY: $REGISTRY"
-  echo "FILTER:   $FILTER"
-  if [ "$FILTER" != "" ]; then
-    images=$(docker images | grep -E "$FILTER" | grep -v "$REGISTRY" | awk '{if (NR!=1) {print}}' | awk '{ a=$1":"$2; print a }')
-  else
-    # NOTE I don't this is ever used
-    images=$(docker images | awk '{if (NR!=1) {print}}' | awk '{ a=$1":"$2; print a }')
-  fi
-  echo "Tagging Images:"
-  echo "$images"
-  echo " "
-  for i in $images; do
-    if [ "$REGISTRY" != "" ]; then
-      docker tag "$i" "$REGISTRY/$i"
-      docker push "$REGISTRY/$i"
-    else
-      docker push "$i"
-    fi
-  done
+  images=""
+  while IFS= read -r line; do
+    # shellcheck disable=SC1117
+    images+="$line\n"
+  done < "${custom_file:-/dev/stdin}"
 fi
+
+# Filter images
+if [[ ! -z "$filter" ]]
+then
+  images=$(echo -e "${images}" | grep -E "${filter}" | grep -v "${registry}")
+fi
+
+for image in $(echo -e "${images}"); do
+  new_image=""
+
+  # Set registry
+  new_image+="${registry}"
+
+  IFS=':' read -r -a image_tag_splitted <<< "$image"
+
+  # Set image name
+  new_image+="/${image_tag_splitted[0]}:"
+
+  # Set tag
+  splitted_tag="${image_tag_splitted[1]}"
+  new_image+="${custom_tag:-$splitted_tag}"
+
+  docker tag "${image}" "${new_image}" > /dev/null
+  docker push "${new_image}" > /dev/null
+
+  echo "${new_image}"
+done
diff --git a/seba-in-a-box/Makefile b/seba-in-a-box/Makefile
index bfe5fa9..444d8da 100644
--- a/seba-in-a-box/Makefile
+++ b/seba-in-a-box/Makefile
@@ -17,7 +17,13 @@
 
 KAFKA_CHART_VERSION  ?= 0.8.8
 
-all: $(M)/siab
+# Targets
+ponsim: $(M)/siab
+
+bbsim: $(M)/bbsim-tosca
+
+both: BBSIM_DHCP_TOSCA =
+both: $(M)/siab $(M)/bbsim-tosca
 
 # https://ftp.gnu.org/old-gnu/Manuals/make-3.79.1/html_chapter/make_6.html#SEC69
 latest: SEBAVALUES := configs/seba-ponsim-latest.yaml
@@ -148,18 +154,20 @@
 	cd $(WORKSPACE)/cord/helm-charts; helm upgrade --install mininet mininet
 	touch $@
 
-$(M)/nem: $(M)/kafka-running $(INFRA_PREREQS)
+$(M)/nem: | $(M)/kafka-running $(INFRA_PREREQS)
 	cd $(WORKSPACE)/cord/helm-charts; helm dep update xos-core
 	cd $(WORKSPACE)/cord/helm-charts; helm upgrade --install xos-core xos-core -f $(SEBAVALUES)
 	cd $(WORKSPACE)/cord/helm-charts; helm dep update xos-profiles/att-workflow
 	cd $(WORKSPACE)/cord/helm-charts; helm upgrade --install att-workflow xos-profiles/att-workflow -f $(SEBAVALUES)
+	cd $(WORKSPACE)/cord/helm-charts; helm dep update xos-profiles/base-kubernetes
+	cd $(WORKSPACE)/cord/helm-charts; helm upgrade --install base-kubernetes xos-profiles/base-kubernetes -f $(SEBAVALUES)
 	touch $@
 
-$(M)/nem-running: $(M)/nem
+$(M)/nem-running: | $(M)/nem
 	$(WORKSPACE)/cord/helm-charts/scripts/wait_for_pods.sh
 	touch $@
 
-$(M)/ponsim-tosca: $(M)/nem-running
+$(M)/ponsim-tosca: | $(M)/nem-running
 	timeout 60s bash -c "until ! http -a admin@opencord.org:letmein GET http://127.0.0.1:30001/xosapi/v1/core/serviceinstanceattributes|jq '.items[].backend_status'|grep -v OK; do echo 'waiting for ONOS config to sync'; sleep 5; done"
 	timeout 60s bash -c "until ! http -a admin@opencord.org:letmein GET http://127.0.0.1:30001/xosapi/v1/onos/onosapps|jq '.items[].backend_status'|grep -v OK; do echo 'waiting for ONOS apps to sync'; sleep 5; done"
 	timeout 60s bash -c "until http -a karaf:karaf GET http://127.0.0.1:30120/onos/v1/applications/org.opencord.kafka|jq '.state'|grep -q ACTIVE; do echo 'Waiting for Kafka app to become ACTIVE'; sleep 5; done"
@@ -184,7 +192,25 @@
 	touch $@
 	echo "SEBA-in-a-Box installation finished!"
 
-run-tests: $(M)/qatests
+# BBSim support
+BBSIM_OLT_TOSCA ?= examples/bbsim-16.yaml
+BBSIM_DHCP_TOSCA ?= examples/bbsim-dhcp.yaml
+
+$(M)/bbsim: | $(M)/onos $(M)/voltha-running $(M)/nem-running
+	cd $(WORKSPACE)/cord/helm-charts && \
+	helm upgrade --install bbsim bbsim -f $(SEBAVALUES) && \
+	scripts/wait_for_pods.sh voltha && \
+	touch $@
+
+$(M)/bbsim-tosca: | $(M)/bbsim
+	cd $(WORKSPACE)/cord/helm-charts && \
+	echo "Loading BBSim TOSCA: $(BBSIM_DHCP_TOSCA) $(BBSIM_OLT_TOSCA)" && \
+	for tosca in $(BBSIM_DHCP_TOSCA) $(BBSIM_OLT_TOSCA) ; do \
+		curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @$$tosca http://127.0.0.1:30007/run ; \
+	done && \
+	touch $@
+
+run-tests: | $(M)/qatests
 
 $(M)/qatests-prereqs:
 	sudo apt install -y python-pip virtualenv
@@ -194,28 +220,30 @@
 	mkdir -p $(WORKSPACE)/cord/test
 	cd $(WORKSPACE)/cord/test && git clone https://gerrit.opencord.org/cord-tester
 
-$(M)/qatests: $(M)/siab $(M)/qatests-prereqs $(WORKSPACE)/cord/test/cord-tester
+PYBOT_ARGS ?=
+$(M)/qatests: | $(M)/siab $(M)/qatests-prereqs $(WORKSPACE)/cord/test/cord-tester
 	cd $(WORKSPACE)/cord/test/cord-tester/src/test/cord-api/ && \
 		WORKSPACE=$(VIRTUALENV) bash ./setup_venv.sh && \
 		source $(VIRTUALENV)/venv-cord-tester/bin/activate && \
 		cd Tests/WorkflowValidations/ && \
-		pybot -e notready -i $(TESTTAGS) SIAB.robot
+		robot $(PYBOT_ARGS) --removekeywords wuks -e notready -i $(TESTTAGS) SIAB.robot
 	touch $@
 
 remove-chart-milestones:
 	cd $(M); rm -f kafka kafka-running onos voltha etcd-operator-ready etcd-cluster \
-		voltha-running ponsim mininet nem nem-running ponsim-tosca siab
+		voltha-running ponsim mininet nem nem-running ponsim-tosca siab bbsim bbsim-tosca \
+		logging nem-monitoring
 
 remove-kube-milestones:
 	cd $(M); rm -f kubeadm helm-init
 
 remove-test-milestones:
-	cd $(M); rm -f qatests
+	cd $(M); rm -f qatests qatests-prereqs
 
 teardown-charts: remove-chart-milestones
 	helm delete --purge $(shell helm ls -q)
 
-reset-kubeadm: remove-chart-milestones remove-kube-milestones
+reset-kubeadm: remove-chart-milestones remove-kube-milestones remove-test-milestones
 	sudo kubeadm reset -f
 	sudo iptables -F && sudo iptables -t nat -F && sudo iptables -t mangle -F && sudo iptables -X