diff --git a/.env b/.env
index 64d9a291b22b62d99ace637638ef75eefb0706cd..8b0e8c13bb0c1bd4436671fa8ae8daa9fe9deec7 100644
--- a/.env
+++ b/.env
@@ -1,3 +1,3 @@
-DOCKER_IMAGE=storm2/vanilla-nginx-voms
+DOCKER_IMAGE=storm2/nginx-httpg-voms
 DOCKER_VERBOSE=y
 DOCKER_GIT_TAG_ENABLED=y
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3dc698efa662d4e0a82e5e25750ef9012f81f68c..d7a18d075a87e3c0e35a3cc722e1670610f45089 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -45,5 +45,9 @@ build-ngx-httpg-container:
     - apk add git bash
     - git clone https://baltig.infn.it/mw-devel/helper-scripts.git helper-scripts
     - cp helper-scripts/scripts/* /usr/local/bin
-    - cp ${CI_PROJECT_DIR}/ngx-artifacts/* ${CI_PROJECT_DIR}/docker/
-    - cp ${CI_PROJECT_DIR}/voms-artifacts/* ${CI_PROJECT_DIR}/docker/
+    - cp ${CI_PROJECT_DIR}/ngx-artifacts/nginx-1.22.1-1.el7.ngx.x86_64.rpm ${CI_PROJECT_DIR}/docker/
+    - cp ${CI_PROJECT_DIR}/voms-artifacts/nginx-module-http-voms-1.22.1-1.el7.x86_64.rpm ${CI_PROJECT_DIR}/docker/
+    - docker login -u gitlab-ci-token -p ${CI_JOB_TOKEN} ${CI_REGISTRY}
+    - export DOCKER_REGISTRY_HOST=${CI_REGISTRY}
+    - export DOCKER_REGISTRY_NAMESPACE=${CI_PROJECT_PATH}
+    - build-docker-image.sh && push-docker-image.sh
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 8fbe82e540a815ffe2e105fabc16225633684b02..4d9c517bea14d7d9ff68034a84b7689db2d4c38a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -16,9 +16,10 @@ RUN yum update -y && \
     mkdir /pkgs && \
     yum clean all && rm -rf /var/cache/yum
 
-# install nginx with patch for HTTPG and voms module
-COPY ngx-artifacts/*.rpm /pkgs/
-COPY voms-artifacts/*.rpm /pkgs/
+# install nginx with patch for HTTPG and voms dynamic module
+COPY *.rpm /pkgs/
+RUN rpm -ivh /pkgs/nginx-1.22.1-1.el7.ngx.x86_64.rpm && \
+    rpm -ivh /pkgs/nginx-module-http-voms-1.22.1-1.el7.x86_64.rpm
 
 # import test 
 COPY t /home/nginx/t