diff --git a/Makefile b/Makefile
index 2d4125dde..196301b75 100644
--- a/Makefile
+++ b/Makefile
@@ -311,8 +311,8 @@ fix: ## fix trivial linting error automatically
 	${DOCKER_COMPOSE_TOOLS_CMD} run --rm tools bin/lint.sh ${pysrcdirs}
 
 check-gixy: env=test
-check-gixy: ## run nginx config check
-	${DOCKER_COMPOSE_CMD} exec webserver /opt/gixy/bin/gixy /etc/nginx/nginx.conf
+check-gixy: ## run nginx config check, skip the checks HSTS max-age=0 and header redefinitions
+	${DOCKER_COMPOSE_CMD} exec webserver /opt/gixy/bin/gixy --skips hsts_header,add_header_redefinition /etc/nginx/nginx.conf
 
 build-tools tools-build: ## build tools image
 	${DOCKER_COMPOSE_TOOLS_CMD} build tools
diff --git a/docker/webserver.Dockerfile b/docker/webserver.Dockerfile
index a44025a4d..2d4014570 100644
--- a/docker/webserver.Dockerfile
+++ b/docker/webserver.Dockerfile
@@ -1,4 +1,5 @@
 ARG CERTBOT_VERSION=5.6.0
+ARG GIXY_NG_VERSION=0.2.48
 
 FROM nginx:1.31.2-alpine3.23
 
@@ -15,7 +16,8 @@ RUN apk upgrade --no-cache \
 
 # install nginx config static analysis tool
 RUN python3 -m venv /opt/gixy
-RUN /opt/gixy/bin/pip install gixy==0.1.21
+ARG GIXY_NG_VERSION
+RUN /opt/gixy/bin/pip install gixy-ng==${GIXY_NG_VERSION}
 
 # install certbot
 RUN python3 -m venv /opt/certbot