diff --git a/docker/crd-installer.Dockerfile b/docker/crd-installer.Dockerfile
index 302c6e0a1..dea82ea12 100644
--- a/docker/crd-installer.Dockerfile
+++ b/docker/crd-installer.Dockerfile
@@ -16,9 +16,9 @@ RUN go mod download
 COPY cmd/crdinstaller/ cmd/crdinstaller/
 COPY pkg pkg
 
-# Build with CGO enabled and GOEXPERIMENT=systemcrypto for internal usage
+# Build with CGO enabled for internal usage
 RUN echo "Building for GOOS=$GOOS GOARCH=$GOARCH"
-RUN CGO_ENABLED=1 GOOS=$GOOS GOARCH=$GOARCH GOEXPERIMENT=systemcrypto GO111MODULE=on go build -o crdinstaller cmd/crdinstaller/main.go
+RUN CGO_ENABLED=1 GOOS=$GOOS GOARCH=$GOARCH GO111MODULE=on go build -o crdinstaller cmd/crdinstaller/main.go
 
 # Use Azure Linux distroless base image to package the crdinstaller binary
 # Refer to https://mcr.microsoft.com/en-us/artifact/mar/azurelinux/distroless/base/about for more details
diff --git a/docker/hub-agent.Dockerfile b/docker/hub-agent.Dockerfile
index 5c751257d..ed8deb1ac 100644
--- a/docker/hub-agent.Dockerfile
+++ b/docker/hub-agent.Dockerfile
@@ -17,9 +17,9 @@ COPY cmd/hubagent/  cmd/hubagent/
 COPY apis/ apis/
 COPY pkg/ pkg/
 
-# Build with CGO enabled and GOEXPERIMENT=systemcrypto for internal usage
+# Build with CGO enabled for internal usage
 RUN echo "Building for GOOS=$GOOS GOARCH=$GOARCH"
-RUN CGO_ENABLED=1 GOOS=$GOOS GOARCH=$GOARCH GOEXPERIMENT=systemcrypto GO111MODULE=on go build -o hubagent  cmd/hubagent/main.go
+RUN CGO_ENABLED=1 GOOS=$GOOS GOARCH=$GOARCH GO111MODULE=on go build -o hubagent  cmd/hubagent/main.go
 
 # Use Azure Linux distroless base image to package the hubagent binary
 # Refer to https://mcr.microsoft.com/en-us/artifact/mar/azurelinux/distroless/base/about for more details
diff --git a/docker/member-agent.Dockerfile b/docker/member-agent.Dockerfile
index 33e122e1b..cee0f6eed 100644
--- a/docker/member-agent.Dockerfile
+++ b/docker/member-agent.Dockerfile
@@ -19,7 +19,7 @@ COPY pkg/ pkg/
 
 # Build
 RUN echo "Building images with GOOS=$GOOS GOARCH=$GOARCH"
-RUN CGO_ENABLED=1 GOOS=$GOOS GOARCH=$GOARCH GOEXPERIMENT=systemcrypto GO111MODULE=on go build -o memberagent cmd/memberagent/main.go
+RUN CGO_ENABLED=1 GOOS=$GOOS GOARCH=$GOARCH GO111MODULE=on go build -o memberagent cmd/memberagent/main.go
 
 # Use Azure Linux distroless base image to package the memberagent binary
 # Refer to https://mcr.microsoft.com/en-us/artifact/mar/azurelinux/distroless/base/about for more details
diff --git a/docker/refresh-token.Dockerfile b/docker/refresh-token.Dockerfile
index f688c9e68..5e71a07c5 100644
--- a/docker/refresh-token.Dockerfile
+++ b/docker/refresh-token.Dockerfile
@@ -16,9 +16,9 @@ RUN go mod download
 COPY cmd/authtoken/main.go main.go
 COPY pkg/authtoken pkg/authtoken
 
-# Build with CGO enabled and GOEXPERIMENT=systemcrypto for internal usage
+# Build with CGO enabled for internal usage
 RUN echo "Building for GOOS=${GOOS} GOARCH=${GOARCH}"
-RUN CGO_ENABLED=1 GOOS=$GOOS GOARCH=$GOARCH GOEXPERIMENT=systemcrypto GO111MODULE=on go build -o refreshtoken main.go
+RUN CGO_ENABLED=1 GOOS=$GOOS GOARCH=$GOARCH GO111MODULE=on go build -o refreshtoken main.go
 
 # Use Azure Linux distroless base image to package the refreshtoken binary
 # Refer to https://mcr.microsoft.com/en-us/artifact/mar/azurelinux/distroless/base/about for more details