diff --git a/.github/workflows/dockerimageintelsubmission.yml b/.github/workflows/dockerimageintelsubmission.yml
index 02714339..ea3114fd 100644
--- a/.github/workflows/dockerimageintelsubmission.yml
+++ b/.github/workflows/dockerimageintelsubmission.yml
@@ -16,6 +16,8 @@ jobs:
       - uses: actions/checkout@v2
       - name: submodule update
         run: git submodule update --init --recursive
+      - name: build and deploy test image
+        run: python3 scripts/docker_build.py DockerfileIntelSubmission sgxwallet_intelsubmission ${GITHUB_SHA}
       - name: build and deploy docker image
         if: |    
           contains(github.ref, 'develop') || contains(github.ref, 'beta') ||
diff --git a/Dockerfile b/Dockerfile
index 620fc485..c0eb92a3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN pip3 install requests torpy
 
 RUN touch /var/hwmode
 RUN ./autoconf.bash
-RUN ./configure --enable-sgx
+RUN ./configure
 RUN bash -c "make -j$(nproc)"
 RUN ccache -sz
 RUN mkdir -p /usr/src/sdk/sgx_data
diff --git a/DockerfileIntelSubmission b/DockerfileIntelSubmission
index 33c73051..45eafddb 100644
--- a/DockerfileIntelSubmission
+++ b/DockerfileIntelSubmission
@@ -12,11 +12,12 @@ RUN pip3 install requests torpy
 RUN cd scripts && ./generate_signing_key.bash
 RUN touch /var/hwmode
 RUN ./autoconf.bash
-RUN ./configure --with-sgx-build=release
+RUN ./configure --with-sgx-build=prerelease
 RUN bash -c "make -j$(nproc)"
 RUN ccache -sz
 RUN mkdir -p /usr/src/sdk/sgx_data
 COPY docker/start.sh ./
+COPY docker/check_firewall.py ./
 RUN rm -rf /usr/src/sdk/sgx-sdk-build/
-RUN rm  /opt/intel/sgxsdk/lib64/*_sim.so
+RUN rm /opt/intel/sgxsdk/lib64/*_sim.so
 ENTRYPOINT ["/usr/src/sdk/start.sh"]
diff --git a/DockerfileRelease b/DockerfileRelease
index 4b498435..5ad52395 100644
--- a/DockerfileRelease
+++ b/DockerfileRelease
@@ -11,9 +11,10 @@ RUN pip3 install requests torpy
 RUN touch /var/hwmode
 RUN ./autoconf.bash
 RUN ./configure --with-sgx-build=release
+RUN cd secure_enclave && bash -c "make secure_enclave.so -j$(nproc)"
+RUN cd scripts && ./sign_enclave.bash
 RUN bash -c "make -j$(nproc)"
 RUN ccache -sz
-RUN cd scripts && ./sign_enclave.bash
 RUN mkdir -p /usr/src/sdk/sgx_data
 COPY docker/start.sh ./
 COPY docker/check_firewall.py ./