diff --git a/.circleci/config.yml b/.circleci/config.yml
index 73e12e746a..e4a7ecbf3b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -31,7 +31,7 @@ orbs:
     executors:
       operator-build:
         docker:
-          - image: ghcr.io/konpyutaika/docker-images/nifikop-build:1.21.5
+          - image: ghcr.io/konpyutaika/docker-images/nifikop-build:1.21.6
     # Define jobs list
     jobs:
       # Build job, which build operator docker image (with operator-sdk build)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d89a264959..b4a10573cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@
 - [PR #350](https://github.com/konpyutaika/nifikop/pull/350) - **[Operator]** Remove optimistic lock on `Patch`.
 - [PR #352](https://github.com/konpyutaika/nifikop/pull/352) - **[Operator]** Changed default LogLevel of NiFi from `DEBUG` to `INFO`.
 - [PR #354](https://github.com/konpyutaika/nifikop/pull/354) - **[Operator/NifiCluster]** Updated `login_identity_providers.xml` template for 2.0.0-M1.
+- [PR #368](https://github.com/konpyutaika/nifikop/pull/368) - **[Operator]** Upgrade golang to 1.21.6.
 
 ### Fixed Bugs
 
diff --git a/Dockerfile b/Dockerfile
index 9a09e8ec78..dd2f7c33f7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Build the manager binary
-FROM golang:1.21.5 as builder
+FROM golang:1.21.6 as builder
 
 WORKDIR /workspace
 
diff --git a/Makefile b/Makefile
index 0fd1ec440b..171acc8da6 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ DOCKER_REGISTRY_BASE 	?= ghcr.io/konpyutaika/docker-images
 IMAGE_TAG				?= $(shell git describe --tags --abbrev=0 --match '[0-9].*[0-9].*[0-9]' 2>/dev/null)
 IMAGE_NAME 				?= $(SERVICE_NAME)
 BUILD_IMAGE				?= ghcr.io/konpyutaika/docker-images/nifikop-build
-GOLANG_VERSION          ?= 1.21.5
+GOLANG_VERSION          ?= 1.21.6
 IMAGE_TAG_BASE ?= <registry>/<operator name>
 OS = $(shell go env GOOS)
 ARCH = $(shell go env GOARCH)