diff --git a/docker/Dockerfile.gNB.aw2s.rhel8.2 b/docker/Dockerfile.gNB.aw2s.rhel8.2
index bc86223130..e79bd6c09b 100644
--- a/docker/Dockerfile.gNB.aw2s.rhel8.2
+++ b/docker/Dockerfile.gNB.aw2s.rhel8.2
@@ -37,9 +37,6 @@ RUN /bin/sh oaienv && \
     cd cmake_targets/ran_build/build && \
     ninja aw2sori_transpro
 
-RUN python3 ./docker/scripts/generateTemplate.py ./docker/scripts/gnb_parameters.yaml && \
-    cp /oai-ran/docker/scripts/gnb_entrypoint.sh /oai-ran/docker/scripts/entrypoint.sh
-
 #start from scratch for target executable
 FROM registry.access.redhat.com/ubi8/ubi:latest as oai-gnb-aw2s
 ENV TZ=Europe/Paris
@@ -54,18 +51,15 @@ RUN yum repolist --disablerepo=* && \
         lksctp-tools \
         tzdata \
         net-tools \
-        iputils \
-        python3-pip && \
-    pip3 install six && \
-    pip3 install requests && \
+        iputils && \
     echo "/usr/local/lib" > /etc/ld.so.conf.d/local-lib.conf && \
     echo "/usr/local/lib64" >> /etc/ld.so.conf.d/local-lib.conf
 
+COPY ./libori.so /usr/local/lib
+
 WORKDIR /opt/oai-gnb-aw2s/bin
-COPY --from=gnb-build \
-    /oai-ran/cmake_targets/ran_build/build/nr-softmodem \
-    /oai-ran/docker/scripts/entrypoint.sh \
-    ./
+COPY --from=gnb-build /oai-ran/cmake_targets/ran_build/build/nr-softmodem ./
+COPY ./docker/scripts/gnb-aw2s_entrypoint.sh /opt/oai-gnb-aw2s/bin/entrypoint.sh
 
 COPY --from=gnb-build \
     /oai-ran/cmake_targets/ran_build/build/liboai_eth_transpro.so \
@@ -92,17 +86,7 @@ COPY --from=gnb-base \
 RUN ln -s /usr/local/lib/libaw2sori_transpro.so /usr/local/lib/libthirdparty_transpro.so && \
     ldconfig
 
-# Copy the relevant configuration files for gNB
-WORKDIR /opt/oai-gnb-aw2s/etc
-COPY --from=gnb-build /oai-ran/docker/etc .
-
 WORKDIR /opt/oai-gnb-aw2s
-#EXPOSE 2152/udp  # S1U, GTP/UDP
-#EXPOSE 22100/tcp # ?
-#EXPOSE 36412/udp # S1C, SCTP/UDP
-#EXPOSE 36422/udp # X2C, SCTP/UDP
-#EXPOSE 50000/udp # IF5 / ORI (control)
-#EXPOSE 50001/udp # IF5 / ECPRI (data)
 
 ENTRYPOINT ["/opt/oai-gnb-aw2s/bin/entrypoint.sh"]
 CMD ["/opt/oai-gnb-aw2s/bin/nr-softmodem", "-O", "/opt/oai-gnb-aw2s/etc/gnb.conf"]