diff --git a/attachments/nginx/ngx_module/nginx_version_extractor.sh b/attachments/nginx/ngx_module/nginx_version_extractor.sh
index 9f19850..92919e0 100755
--- a/attachments/nginx/ngx_module/nginx_version_extractor.sh
+++ b/attachments/nginx/ngx_module/nginx_version_extractor.sh
@@ -300,6 +300,7 @@ addRequiredFlags()
     BUILD_FLAG_PREFIX="--build="
     OPENSSL_VERSION_PREFIX="--with-openssl="
     OPENSSL_OPT_PREFIX="--with-openssl-opt="
+    PCRE_FOLDER_PREFIX="--with-pcre="
     HPACK_ENC_PREFIX="--with-http_v2_hpack_enc"
     AUTH_JWT_PREFIX="--with-http_auth_jwt_module"
     F4F_PREFIX="--with-http_f4f_module"
@@ -315,6 +316,7 @@ addRequiredFlags()
         [[ ! ("${argv[i]}" =~ ${ADDITIONAL_MODULE_FLAG_PREFIX}) ]] && \
         [[ ! ("${argv[i]}" =~ ${OPENSSL_VERSION_PREFIX}) ]] && \
         [[ ! ("${argv[i]}" =~ ${OPENSSL_OPT_PREFIX}) ]] && \
+        [[ ! ("${argv[i]}" =~ ${PCRE_FOLDER_PREFIX}) ]] && \
         [[ ! ("${argv[i]}" =~ ${DYNAMIC_MODULE_FLAG_PREFIX}) ]] && \
         [[ ! ("${argv[i]}" =~ ${BUILD_FLAG_PREFIX}) ]] && \
         [[ ! ("${argv[i]}" =~ ${AUTH_JWT_PREFIX}) ]] && \
diff --git a/docker/CMakeLists.txt b/docker/CMakeLists.txt
index 97e72b1..f43d0e2 100644
--- a/docker/CMakeLists.txt
+++ b/docker/CMakeLists.txt
@@ -4,7 +4,6 @@ add_custom_command(
     OUTPUT ${CMAKE_INSTALL_PREFIX}/nginx-docker.img
     COMMAND docker build -t nginx-docker ${CMAKE_INSTALL_PREFIX}
     COMMAND docker tag nginx-docker ${OUTPUT_DOCKER_IMAGE}
-    COMMAND docker push ${OUTPUT_DOCKER_IMAGE}
     COMMAND docker image save nginx-docker -o ${CMAKE_INSTALL_PREFIX}/nginx-docker.img
 )
 
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2dcd7d5..6144724 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -6,17 +6,25 @@ RUN apk update
 RUN apk add --no-cache -u busybox
 RUN apk add --no-cache -u zlib
 RUN apk add --no-cache libstdc++
+RUN mkdir -p /usr/lib/nginx/modules/
+RUN mkdir -p /usr/lib64/nginx/modules/
 
 USER <DOCKER USER>
 
 COPY lib/libosrc_compression_utils.so /usr/lib/libosrc_compression_utils.so
+COPY lib/libosrc_compression_utils.so /usr/lib64/libosrc_compression_utils.so
 COPY lib/libosrc_nginx_attachment_util.so /usr/lib/libosrc_nginx_attachment_util.so
+COPY lib/libosrc_nginx_attachment_util.so /usr/lib64/libosrc_nginx_attachment_util.so
 COPY lib/libosrc_shmem_ipc.so /usr/lib/libosrc_shmem_ipc.so
-RUN mkdir -p /usr/lib/nginx/modules/
+COPY lib/libosrc_shmem_ipc.so /usr/lib64/libosrc_shmem_ipc.so
 COPY lib/libngx_module.so /usr/lib/nginx/modules/ngx_cp_attachment_module.so
+COPY lib/libngx_module.so /usr/lib64/nginx/modules/ngx_cp_attachment_module.so
 
-RUN echo "load_module /usr/lib/nginx/modules/ngx_cp_attachment_module.so;"|cat - /etc/nginx/nginx.conf> /tmp/out && mv /tmp/out /etc/nginx/nginx.conf
-RUN [ -f /etc/nginx/template/nginx.tmpl ] && echo "load_module /usr/lib/nginx/modules/ngx_cp_attachment_module.so;"|cat - /etc/nginx/template/nginx.tmpl> /tmp/out.tmpl && mv /tmp/out.tmpl /etc/nginx/template/nginx.tmpl || echo ""
-RUN [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && /bin/sh -c sed -i "s|return \[\[|return \[\[\nload_module /usr/lib64/nginx/modules/ngx_cp_attachment_module.so;|g" /usr/local/share/lua/5.1/kong/templates/nginx.lua
-RUN [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && /bin/sh -c sed -i "s|http {|http {\ncp_worker_processes \$\{\{nginx_worker_processes\}\};|g" /usr/local/share/lua/5.1/kong/templates/nginx.lua
+USER root
 
+RUN [ -f /etc/nginx/nginx.conf ] && sed -i 1i"load_module /usr/lib/nginx/modules/ngx_cp_attachment_module.so;" /etc/nginx/nginx.conf || echo ""
+RUN [ -f /etc/nginx/template/nginx.tmpl ] && sed -i 1i"load_module /usr/lib/nginx/modules/ngx_cp_attachment_module.so;" /etc/nginx/template/nginx.tmpl || echo ""
+RUN [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && sed -i "s|return \[\[|return \[\[\nload_module /usr/lib64/nginx/modules/ngx_cp_attachment_module.so;|g" /usr/local/share/lua/5.1/kong/templates/nginx.lua || echo ""
+RUN [ -f /usr/local/share/lua/5.1/kong/templates/nginx.lua ] && sed -i "s|http {|http {\ncp_worker_processes \$\{\{nginx_worker_processes\}\};|g" /usr/local/share/lua/5.1/kong/templates/nginx.lua || echo ""
+
+USER <DOCKER USER>