diff --git a/Dockerfile b/Dockerfile
index e354b07..d78be01 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -22,17 +22,17 @@ ARG log_level_e2sim=2
 # log_level_e2sim = 3 -> LOG_LEVEL_DEBUG     3
 
 # Install E2sim
-RUN mkdir -p /workspace/e2sim
+RUN mkdir -p /workspace
 RUN apt-get update && apt-get install -y build-essential git cmake libsctp-dev autoconf automake libtool bison flex libboost-all-dev
 
-WORKDIR /workspace/e2sim
+WORKDIR /workspace
 
-COPY ./e2sim/e2sim /workspace/e2sim
-
-RUN mkdir /workspace/e2sim/build
-WORKDIR /workspace/e2sim/build
+RUN git clone -b develop https://github.com/wineslab/ns-o-ran-e2-sim /workspace/e2sim
 
+RUN mkdir /workspace/e2sim/e2sim/build
+WORKDIR /workspace/e2sim/e2sim/build
 RUN cmake .. -DDEV_PKG=1 -DLOG_LEVEL=${log_level_e2sim}
+
 RUN make package
 RUN echo "Going to install e2sim-dev"
 RUN dpkg --install ./e2sim-dev_1.0.0_amd64.deb
@@ -43,13 +43,13 @@ WORKDIR /workspace
 # Install ns-3
 RUN apt-get install -y g++ python3 qtbase5-dev qtchooser qt5-qmake qtbase5-dev-tools
 
-COPY ./ns3-mmwave-oran /workspace/ns3-mmwave-oran
-COPY ./ns-o-ran /workspace/ns3-mmwave-oran/contrib/oran-interface
+RUN git clone -b release https://github.com/wineslab/ns-o-ran-ns3-mmwave /workspace/ns3-mmwave-oran
+RUN git clone -b master https://github.com/o-ran-sc/sim-ns3-o-ran-e2 /workspace/ns3-mmwave-oran/contrib/oran-interface
 
 WORKDIR /workspace/ns3-mmwave-oran
 
 RUN ./waf configure --enable-tests --enable-examples
-# RUN ./waf build
+RUN ./waf build
 
 WORKDIR /workspace
 
diff --git a/setup/e2/RIC-E2-TERMINATION/Dockerfile b/setup/e2/RIC-E2-TERMINATION/Dockerfile
index 082e9cc..309551a 100644
--- a/setup/e2/RIC-E2-TERMINATION/Dockerfile
+++ b/setup/e2/RIC-E2-TERMINATION/Dockerfile
@@ -20,7 +20,7 @@
 #   This source code is part of the near-RT RIC (RAN Intelligent Controller)
 #   platform project (RICP).
 #
-FROM nexus3.o-ran-sc.org:10004/o-ran-sc/bldr-ubuntu18-c-go:9-u18.04 as ubuntu
+FROM wineslab/o-ran-sc-bldr-ubuntu18-c-go:9-u18.04 as ubuntu
 
 WORKDIR /opt/e2/