diff --git a/controllers/nginx/pkg/cmd/controller/nginx.go b/controllers/nginx/pkg/cmd/controller/nginx.go
index 979b25f23..b551f9ddd 100644
--- a/controllers/nginx/pkg/cmd/controller/nginx.go
+++ b/controllers/nginx/pkg/cmd/controller/nginx.go
@@ -34,7 +34,7 @@ import (
 	"github.com/spf13/pflag"
 
 	proxyproto "github.com/armon/go-proxyproto"
-	api_v1 "k8s.io/client-go/pkg/api/v1"
+	api_v1 "k8s.io/api/core/v1"
 
 	"k8s.io/ingress/controllers/nginx/pkg/config"
 	ngx_template "k8s.io/ingress/controllers/nginx/pkg/template"
diff --git a/controllers/nginx/pkg/config/config.go b/controllers/nginx/pkg/config/config.go
index c75004813..7fcf44775 100644
--- a/controllers/nginx/pkg/config/config.go
+++ b/controllers/nginx/pkg/config/config.go
@@ -335,39 +335,39 @@ func NewDefault() Configuration {
 		HTTP2MaxFieldSize:          "4k",
 		HTTP2MaxHeaderSize:         "16k",
 		HSTS:                       true,
-		HSTSIncludeSubdomains:    true,
-		HSTSMaxAge:               hstsMaxAge,
-		HSTSPreload:              false,
-		IgnoreInvalidHeaders:     true,
-		GzipTypes:                gzipTypes,
-		KeepAlive:                75,
-		KeepAliveRequests:        100,
-		LargeClientHeaderBuffers: "4 8k",
-		LogFormatEscapeJSON:      false,
-		LogFormatStream:          logFormatStream,
-		LogFormatUpstream:        logFormatUpstream,
-		MaxWorkerConnections:     16384,
-		MapHashBucketSize:        64,
-		ProxyRealIPCIDR:          defIPCIDR,
-		ServerNameHashMaxSize:    1024,
-		ProxyHeadersHashMaxSize:  512,
+		HSTSIncludeSubdomains:      true,
+		HSTSMaxAge:                 hstsMaxAge,
+		HSTSPreload:                false,
+		IgnoreInvalidHeaders:       true,
+		GzipTypes:                  gzipTypes,
+		KeepAlive:                  75,
+		KeepAliveRequests:          100,
+		LargeClientHeaderBuffers:   "4 8k",
+		LogFormatEscapeJSON:        false,
+		LogFormatStream:            logFormatStream,
+		LogFormatUpstream:          logFormatUpstream,
+		MaxWorkerConnections:       16384,
+		MapHashBucketSize:          64,
+		ProxyRealIPCIDR:            defIPCIDR,
+		ServerNameHashMaxSize:      1024,
+		ProxyHeadersHashMaxSize:    512,
 		ProxyHeadersHashBucketSize: 64,
-		ShowServerTokens:         true,
-		SSLBufferSize:            sslBufferSize,
-		SSLCiphers:               sslCiphers,
-		SSLECDHCurve:             "secp384r1",
-		SSLProtocols:             sslProtocols,
-		SSLSessionCache:          true,
-		SSLSessionCacheSize:      sslSessionCacheSize,
-		SSLSessionTickets:        true,
-		SSLSessionTimeout:        sslSessionTimeout,
-		UseGzip:                  true,
-		WorkerProcesses:          strconv.Itoa(runtime.NumCPU()),
-		LoadBalanceAlgorithm:     defaultLoadBalancerAlgorithm,
-		VtsStatusZoneSize:        "10m",
-		VariablesHashBucketSize:  64,
-		VariablesHashMaxSize:     2048,
-		UseHTTP2:                 true,
+		ShowServerTokens:           true,
+		SSLBufferSize:              sslBufferSize,
+		SSLCiphers:                 sslCiphers,
+		SSLECDHCurve:               "secp384r1",
+		SSLProtocols:               sslProtocols,
+		SSLSessionCache:            true,
+		SSLSessionCacheSize:        sslSessionCacheSize,
+		SSLSessionTickets:          true,
+		SSLSessionTimeout:          sslSessionTimeout,
+		UseGzip:                    true,
+		WorkerProcesses:            strconv.Itoa(runtime.NumCPU()),
+		LoadBalanceAlgorithm:       defaultLoadBalancerAlgorithm,
+		VtsStatusZoneSize:          "10m",
+		VariablesHashBucketSize:    64,
+		VariablesHashMaxSize:       2048,
+		UseHTTP2:                   true,
 		Backend: defaults.Backend{
 			ProxyBodySize:        bodySize,
 			ProxyConnectTimeout:  5,