diff --git a/controllers/nginx/Makefile b/controllers/nginx/Makefile
index e09c3f35e..1ae30e9ef 100644
--- a/controllers/nginx/Makefile
+++ b/controllers/nginx/Makefile
@@ -1,7 +1,7 @@
 all: push
 
 # 0.0 shouldn't clobber any release builds
-TAG = 0.62
+TAG = 0.7
 PREFIX = gcr.io/google_containers/nginx-ingress-controller
 
 REPO_INFO=$(shell git config --get remote.origin.url)
@@ -11,8 +11,8 @@ ifndef VERSION
 endif
 
 controller: controller.go clean
-	CGO_ENABLED=0 GOOS=linux godep go build -a -installsuffix cgo -ldflags \
-		"-w -X main.version=${VERSION} -X main.gitRepo=${REPO_INFO}" \
+	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -ldflags \
+		"-s -w -X main.version=${VERSION} -X main.gitRepo=${REPO_INFO}" \
 		-o nginx-ingress-controller
 
 container: controller
diff --git a/controllers/nginx/README.md b/controllers/nginx/README.md
index b4d2321d3..663310e10 100644
--- a/controllers/nginx/README.md
+++ b/controllers/nginx/README.md
@@ -268,10 +268,14 @@ Using this two headers is possible to use a custom backend service like [this on
 |ingress.kubernetes.io/add-base-url|true\|false| |
 |ingress.kubernetes.io/limit-connections| ||
 |ingress.kubernetes.io/limit-rps|||
-|ingress.kubernetes.io/auth-type|basic\|digest|Indicates the [HTTP Authentication Type: Basic or Digest Access Authentication](https://tools.ietf.org/html/rfc2617)||
+|ingress.kubernetes.io/auth-type|basic or digest|Indicates the [HTTP Authentication Type: Basic or Digest Access Authentication](https://tools.ietf.org/html/rfc2617)||
 |ingress.kubernetes.io/auth-secret|string|Name of the secret that contains the usernames and passwords.
 | | |The secret must be created in the same namespace than the Ingress rule||
 |ingress.kubernetes.io/auth-realm|string| |
+|ingress.kubernetes.io/upstream-max-fails| |
+|ingress.kubernetes.io/upstream-max-fails| |
+|ingress.kubernetes.io/upstream-fail-timeout| |
+
 
 
 ### Custom configuration options
diff --git a/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml b/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml
index 93a4c2a9e..c791a8577 100644
--- a/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml
+++ b/controllers/nginx/examples/custom-configuration/rc-custom-configuration.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.62
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.7
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml b/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml
index 7a4a13a80..3d74e9c35 100644
--- a/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml
+++ b/controllers/nginx/examples/custom-errors/rc-custom-errors.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.6
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.7
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/custom-template/custom-template.yaml b/controllers/nginx/examples/custom-template/custom-template.yaml
index 7ec396851..d132221e8 100644
--- a/controllers/nginx/examples/custom-template/custom-template.yaml
+++ b/controllers/nginx/examples/custom-template/custom-template.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.62
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.7
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/daemonset/as-daemonset.yaml b/controllers/nginx/examples/daemonset/as-daemonset.yaml
index 5333d5d84..859e60cf9 100644
--- a/controllers/nginx/examples/daemonset/as-daemonset.yaml
+++ b/controllers/nginx/examples/daemonset/as-daemonset.yaml
@@ -10,7 +10,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.62
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.7
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/default/rc-default.yaml b/controllers/nginx/examples/default/rc-default.yaml
index 7962c957d..d2c2731c2 100644
--- a/controllers/nginx/examples/default/rc-default.yaml
+++ b/controllers/nginx/examples/default/rc-default.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.62
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.7
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/full/rc-full.yaml b/controllers/nginx/examples/full/rc-full.yaml
index df0722c7c..859bc281d 100644
--- a/controllers/nginx/examples/full/rc-full.yaml
+++ b/controllers/nginx/examples/full/rc-full.yaml
@@ -21,7 +21,7 @@ spec:
         secret:
           secretName: dhparam-example
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.62
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.7
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml b/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml
index d6b89e468..2bad5b8fd 100644
--- a/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml
+++ b/controllers/nginx/examples/proxy-protocol/nginx-rc.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.62
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.7
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/tcp/rc-tcp.yaml b/controllers/nginx/examples/tcp/rc-tcp.yaml
index 73b956bbf..1f0da3c00 100644
--- a/controllers/nginx/examples/tcp/rc-tcp.yaml
+++ b/controllers/nginx/examples/tcp/rc-tcp.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.62
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.7
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/tls/rc-ssl.yaml b/controllers/nginx/examples/tls/rc-ssl.yaml
index 7962c957d..d2c2731c2 100644
--- a/controllers/nginx/examples/tls/rc-ssl.yaml
+++ b/controllers/nginx/examples/tls/rc-ssl.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.62
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.7
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/examples/udp/rc-udp.yaml b/controllers/nginx/examples/udp/rc-udp.yaml
index 96973d22f..5e156f690 100644
--- a/controllers/nginx/examples/udp/rc-udp.yaml
+++ b/controllers/nginx/examples/udp/rc-udp.yaml
@@ -16,7 +16,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60      
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.62
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.7
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe:
diff --git a/controllers/nginx/rc.yaml b/controllers/nginx/rc.yaml
index ff36c9384..3230bc1e8 100644
--- a/controllers/nginx/rc.yaml
+++ b/controllers/nginx/rc.yaml
@@ -68,7 +68,7 @@ spec:
     spec:
       terminationGracePeriodSeconds: 60
       containers:
-      - image: gcr.io/google_containers/nginx-ingress-controller:0.62
+      - image: gcr.io/google_containers/nginx-ingress-controller:0.7
         name: nginx-ingress-lb
         imagePullPolicy: Always
         livenessProbe: