diff --git a/.github/workflows/dockers-agent-ngt-image.yml b/.github/workflows/dockers-agent-ngt-image.yml
index afe22c3b86..507b74cbc9 100644
--- a/.github/workflows/dockers-agent-ngt-image.yml
+++ b/.github/workflows/dockers-agent-ngt-image.yml
@@ -51,6 +51,7 @@ on:
       - "apis/grpc/**"
       - "pkg/agent/core/ngt/**"
       - "cmd/agent/core/ngt/**"
+      - "dockers/agent/core/ngt/Dockerfile"
       - "versions/GO_VERSION"
       - "versions/NGT_VERSION"
 
diff --git a/dockers/agent/core/ngt/Dockerfile b/dockers/agent/core/ngt/Dockerfile
index 7f15da0cc9..55be2c882c 100644
--- a/dockers/agent/core/ngt/Dockerfile
+++ b/dockers/agent/core/ngt/Dockerfile
@@ -22,7 +22,7 @@ ARG MAINTAINER="vdaas.org vald team <vald@vdaas.org>"
 
 FROM golang:${GO_VERSION} AS golang
 
-FROM ubuntu:devel AS builder
+FROM ubuntu:hirsute AS builder
 
 ARG UPX_OPTIONS
 
diff --git a/dockers/ci/base/Dockerfile b/dockers/ci/base/Dockerfile
index 4458b01293..b6e8800d3b 100644
--- a/dockers/ci/base/Dockerfile
+++ b/dockers/ci/base/Dockerfile
@@ -19,9 +19,9 @@ ARG MAINTAINER="vdaas.org vald team <vald@vdaas.org>"
 
 FROM golang:${GO_VERSION} AS golang
 
-FROM ubuntu:devel AS builder
+FROM ubuntu:hirsute AS builder
 ARG PROTOBUF_VERSION=3.14.0
-ARG GOLANGCI_LINT_VERSION=v1.36.0
+ARG GOLANGCI_LINT_VERSION=v1.42.1
 ARG REVIEWDOG_VERSION=v0.11.0
 
 LABEL maintainer "${MAINTAINER}"
diff --git a/dockers/dev/Dockerfile b/dockers/dev/Dockerfile
index c89227d3e2..8e2f91bfe2 100644
--- a/dockers/dev/Dockerfile
+++ b/dockers/dev/Dockerfile
@@ -16,9 +16,9 @@
 
 ARG MAINTAINER="vdaas.org vald team <vald@vdaas.org>"
 
-FROM ubuntu:devel AS builder
+FROM ubuntu:hirsute AS builder
 ARG PROTOBUF_VERSION=3.14.0
-ARG GOLANGCI_LINT_VERSION=v1.36.0
+ARG GOLANGCI_LINT_VERSION=v1.42.1
 ARG REVIEWDOG_VERSION=v0.11.0
 ARG YQ_VERSION=4.5.0