diff --git a/controllers/nginx/pkg/template/template.go b/controllers/nginx/pkg/template/template.go
index 72912ca1e..3eb2e8107 100644
--- a/controllers/nginx/pkg/template/template.go
+++ b/controllers/nginx/pkg/template/template.go
@@ -170,28 +170,14 @@ func buildResolvers(a interface{}) string {
 }
 
 // buildLocation produces the location string, if the ingress has redirects
-// (specified through the ingress.kubernetes.io/rewrite-to annotation)
+// (specified through the ingress.kubernetes.io/rewrite-target annotation)
 func buildLocation(input interface{}) string {
 	location, ok := input.(*ingress.Location)
 	if !ok {
 		return slash
 	}
 
-	path := location.Path
-	if len(location.Redirect.Target) > 0 && location.Redirect.Target != path {
-		if path == slash {
-			return fmt.Sprintf("~* %s", path)
-		}
-		// baseuri regex will parse basename from the given location
-		baseuri := `(?<baseuri>.*)`
-		if !strings.HasSuffix(path, slash) {
-			// Not treat the slash after "location path" as a part of baseuri
-			baseuri = fmt.Sprintf(`\/?%s`, baseuri)
-		}
-		return fmt.Sprintf(`~* ^%s%s`, path, baseuri)
-	}
-
-	return path
+	return location.Path
 }
 
 func buildAuthLocation(input interface{}) string {
@@ -240,7 +226,7 @@ func buildLogFormatUpstream(input interface{}) string {
 }
 
 // buildProxyPass produces the proxy pass string, if the ingress has redirects
-// (specified through the ingress.kubernetes.io/rewrite-to annotation)
+// (specified through the ingress.kubernetes.io/rewrite-target annotation)
 // If the annotation ingress.kubernetes.io/add-base-url:"true" is specified it will
 // add a base tag in the head of the response from the service
 func buildProxyPass(b interface{}, loc interface{}) string {
@@ -274,29 +260,31 @@ func buildProxyPass(b interface{}, loc interface{}) string {
 	}
 
 	if len(location.Redirect.Target) > 0 {
-		abu := ""
-		if location.Redirect.AddBaseURL {
-			// path has a slash suffix, so that it can be connected with baseuri directly
-			bPath := fmt.Sprintf("%s%s", path, "$baseuri")
-			abu = fmt.Sprintf(`subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host%v">' r;
-	subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host%v">' r;
-	`, bPath, bPath)
-		}
-
+		rewrite := ""
 		if location.Redirect.Target == slash {
 			// special case redirect to /
 			// ie /something to /
-			return fmt.Sprintf(`
-	rewrite %s(.*) /$1 break;
-	rewrite %s / break;
-	proxy_pass %s://%s;
-	%v`, path, location.Path, proto, location.Backend, abu)
+			rewrite = fmt.Sprintf(`
+				rewrite %s(.*) /$1 break;
+				rewrite %s / break;
+				proxy_pass %s://%s;`, path, location.Path, proto, location.Backend)
+		} else {
+			rewrite = fmt.Sprintf(`
+				rewrite %s(.*) %s/$1 break;
+				proxy_pass %s://%s;`, path, location.Redirect.Target, proto, location.Backend)
 		}
 
-		return fmt.Sprintf(`
-	rewrite %s(.*) %s/$1 break;
-	proxy_pass %s://%s;
-	%v`, path, location.Redirect.Target, proto, location.Backend, abu)
+		if location.Redirect.AddBaseURL {
+			// path has a slash suffix, so that it can be connected with baseuri directly
+			return fmt.Sprintf(`
+				location ~* %s(?<baseuri>.*) {
+					subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host%s$baseuri">' r;
+					subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host%s$baseuri">' r;
+					%v
+				}`, path, path, path, rewrite)
+		}
+
+		return rewrite
 	}
 
 	// default proxy_pass
diff --git a/controllers/nginx/pkg/template/template_test.go b/controllers/nginx/pkg/template/template_test.go
index a19b6de30..a91930c40 100644
--- a/controllers/nginx/pkg/template/template_test.go
+++ b/controllers/nginx/pkg/template/template_test.go
@@ -42,49 +42,52 @@ var (
 		AddBaseURL bool
 	}{
 		"invalid redirect / to /": {"/", "/", "/", "proxy_pass http://upstream-name;", false},
-		"redirect / to /jenkins": {"/", "/jenkins", "~* /",
-			`
-	rewrite /(.*) /jenkins/$1 break;
-	proxy_pass http://upstream-name;
-	`, false},
-		"redirect /something to /": {"/something", "/", `~* ^/something\/?(?<baseuri>.*)`, `
-	rewrite /something/(.*) /$1 break;
-	rewrite /something / break;
-	proxy_pass http://upstream-name;
-	`, false},
-		"redirect /end-with-slash/ to /not-root": {"/end-with-slash/", "/not-root", "~* ^/end-with-slash/(?<baseuri>.*)", `
-	rewrite /end-with-slash/(.*) /not-root/$1 break;
-	proxy_pass http://upstream-name;
-	`, false},
-		"redirect /something-complex to /not-root": {"/something-complex", "/not-root", `~* ^/something-complex\/?(?<baseuri>.*)`, `
-	rewrite /something-complex/(.*) /not-root/$1 break;
-	proxy_pass http://upstream-name;
-	`, false},
-		"redirect / to /jenkins and rewrite": {"/", "/jenkins", "~* /", `
-	rewrite /(.*) /jenkins/$1 break;
-	proxy_pass http://upstream-name;
-	subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/$baseuri">' r;
-	subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/$baseuri">' r;
-	`, true},
-		"redirect /something to / and rewrite": {"/something", "/", `~* ^/something\/?(?<baseuri>.*)`, `
-	rewrite /something/(.*) /$1 break;
-	rewrite /something / break;
-	proxy_pass http://upstream-name;
-	subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/something/$baseuri">' r;
-	subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/something/$baseuri">' r;
-	`, true},
-		"redirect /end-with-slash/ to /not-root and rewrite": {"/end-with-slash/", "/not-root", `~* ^/end-with-slash/(?<baseuri>.*)`, `
-	rewrite /end-with-slash/(.*) /not-root/$1 break;
-	proxy_pass http://upstream-name;
-	subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/end-with-slash/$baseuri">' r;
-	subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/end-with-slash/$baseuri">' r;
-	`, true},
-		"redirect /something-complex to /not-root and rewrite": {"/something-complex", "/not-root", `~* ^/something-complex\/?(?<baseuri>.*)`, `
-	rewrite /something-complex/(.*) /not-root/$1 break;
-	proxy_pass http://upstream-name;
-	subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/something-complex/$baseuri">' r;
-	subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/something-complex/$baseuri">' r;
-	`, true},
+		"redirect / to /jenkins": {"/", "/jenkins", "/", `
+				rewrite /(.*) /jenkins/$1 break;
+				proxy_pass http://upstream-name;`, false},
+		"redirect /something to /": {"/something", "/", "/something", `
+				rewrite /something/(.*) /$1 break;
+				rewrite /something / break;
+				proxy_pass http://upstream-name;`, false},
+		"redirect /end-with-slash/ to /not-root": {"/end-with-slash/", "/not-root", "/end-with-slash/", `
+				rewrite /end-with-slash/(.*) /not-root/$1 break;
+				proxy_pass http://upstream-name;`, false},
+		"redirect /something-complex to /not-root": {"/something-complex", "/not-root", "/something-complex", `
+				rewrite /something-complex/(.*) /not-root/$1 break;
+				proxy_pass http://upstream-name;`, false},
+		"redirect / to /jenkins and rewrite": {"/", "/jenkins", "/", `
+				location ~* /(?<baseuri>.*) {
+					subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/$baseuri">' r;
+					subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/$baseuri">' r;
+					
+				rewrite /(.*) /jenkins/$1 break;
+				proxy_pass http://upstream-name;
+				}`, true},
+		"redirect /something to / and rewrite": {"/something", "/", "/something", `
+				location ~* /something/(?<baseuri>.*) {
+					subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/something/$baseuri">' r;
+					subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/something/$baseuri">' r;
+					
+				rewrite /something/(.*) /$1 break;
+				rewrite /something / break;
+				proxy_pass http://upstream-name;
+				}`, true},
+		"redirect /end-with-slash/ to /not-root and rewrite": {"/end-with-slash/", "/not-root", "/end-with-slash/", `
+				location ~* /end-with-slash/(?<baseuri>.*) {
+					subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/end-with-slash/$baseuri">' r;
+					subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/end-with-slash/$baseuri">' r;
+					
+				rewrite /end-with-slash/(.*) /not-root/$1 break;
+				proxy_pass http://upstream-name;
+				}`, true},
+		"redirect /something-complex to /not-root and rewrite": {"/something-complex", "/not-root", "/something-complex", `
+				location ~* /something-complex/(?<baseuri>.*) {
+					subs_filter '<head(.*)>' '<head$1><base href="$scheme://$http_host/something-complex/$baseuri">' r;
+					subs_filter '<HEAD(.*)>' '<HEAD$1><base href="$scheme://$http_host/something-complex/$baseuri">' r;
+					
+				rewrite /something-complex/(.*) /not-root/$1 break;
+				proxy_pass http://upstream-name;
+				}`, true},
 	}
 )