diff --git a/Dockerfile b/Dockerfile
index 5d0da45..7a32750 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,7 +29,6 @@ RUN apt-get install -y libhwloc15 libopenmpi-dev openmpi-bin openmpi-common
 RUN apt-get install -y bison
 RUN git clone --shallow-since 2022-09-15 --branch develop https://github.com/trilinos/Trilinos.git
 RUN git clone https://github.com/Xyce/Xyce.git --branch Release-7.6.0
-# RUN git clone https://github.com/Xyce/Xyce.git
 
 WORKDIR Trilinos
 RUN git checkout b91cc3dcd9
@@ -111,12 +110,9 @@ RUN pwd
 WORKDIR /toolsrc
 RUN apt-get install -y libedit-dev zlib1g-dev m4 git gcc g++ make
 RUN git clone https://www.github.com/asyncvlsi/act.git
-#RUN git clone https://www.github.com/jpt4/act.git
 WORKDIR act
 ENV ACT_HOME=/opt/cad
 ENV VLSI_TOOLS_SRC=/toolsrc/act
-#ENV C_COMPILER_NAME=mpicc
-#ENV CXX_COMPILER_NAME=mpic++
 RUN ./configure $ACT_HOME CC=mpicc CXX=mpic++
 RUN ./build
 RUN make install
@@ -130,7 +126,6 @@ RUN ./grab_xyce.sh /toolsrc/Xyce/build
 #WORKDIR ext
 RUN ./build.sh
 #WORKDIR ..
-#RUN ./grab_xyce.sh /toolsrc/Xyce/build
 RUN make CXX=mpic++ CC=mpicc install
 
 # install ACT-06
diff --git a/bcli-develop.sh b/bcli-develop.sh
index 94dd064..ca9af64 100644
--- a/bcli-develop.sh
+++ b/bcli-develop.sh
@@ -1,6 +1,6 @@
 bcli() {
     if [ "$1" = "up" ]; then
-	docker run --rm -d -v $HOME:/host --name "bcli-develop" -h "bcli-develop" -e USER=$USER -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -e DISPLAY=$DISPLAY -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" public.ecr.aws/l5h5o6z4/broccoli-cli:latest > /dev/null
+	docker run --rm -d -v $HOME:/host --name "bcli-develop" -h "bcli-develop" -e USER=$USER -e USER_ID=$(id -u) -e GROUP_ID=$(id -g) -e DISPLAY=$DISPLAY -v "/tmp/.X11-unix:/tmp/.X11-unix:rw" ${BCLI_IMAGE:-public.ecr.aws/l5h5o6z4/broccoli-cli:latest} > /dev/null
 	echo "bcli-develop started"
     elif [ "$1" = "down" ]; then
 	docker stop bcli-develop > /dev/null