diff --git a/Dockerfile b/Dockerfile
index 188f8f7..a6c242d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -5,12 +5,12 @@ FROM ubuntu:latest
 
 ENV DEBIAN_FRONTEND noninteractive
 
-# Prepare requirements 
+# Prepare requirements
 RUN apt-get update -qy && \
     apt-get install --no-install-recommends -qy software-properties-common
 
 # setup confd
-ADD https://github.com/kelseyhightower/confd/releases/download/v0.6.3/confd-0.6.3-linux-amd64 /usr/local/bin/confd
+ADD https://github.com/kelseyhightower/confd/releases/download/v0.9.0/confd-0.9.0-linux-amd64 /usr/local/bin/confd
 RUN chmod u+x /usr/local/bin/confd && \
 	mkdir -p /etc/confd/conf.d && \
 	mkdir -p /etc/confd/templates
diff --git a/src/confd/templates/nginx.tmpl b/src/confd/templates/nginx.tmpl
index 8f09bc7..b156216 100644
--- a/src/confd/templates/nginx.tmpl
+++ b/src/confd/templates/nginx.tmpl
@@ -57,8 +57,8 @@ http {
 
 	{{range $spec := getvs "/registry/services/specs/*/*"}}
 	{{$data := json $spec}}
-	{{ if $data.annotations.kubernetesReverseproxy }}
-	{{$p := json $data.annotations.kubernetesReverseproxy }}
+	{{ if $data.metadata.annotations.kubernetesReverseproxy }}
+	{{$p := json $data.metadata.annotations.kubernetesReverseproxy }}
 	{{range $proxy := $p.hosts}}
 	{{if $proxy.host }}
 	server {
@@ -98,7 +98,11 @@ http {
 			proxy_set_header Connection "upgrade";
 			{{ end }}
 
-			proxy_pass http://{{$data.portalIP}}:{{$data.port}};
+			{{ if $proxy.targetPort }}
+			proxy_pass http://{{$data.spec.portalIP}}:{{$proxy.targetPort}};
+			{{ else }}
+			proxy_pass http://{{$data.spec.portalIP}};
+			{{ end }}
 		}
 		{{ end }}
 
@@ -127,7 +131,11 @@ http {
 			proxy_set_header Connection "upgrade";
 			{{ end }}
 
-			proxy_pass http://{{$data.portalIP}}:{{$data.port}};
+			{{ if $proxy.targetPort }}
+			proxy_pass http://{{$data.spec.portalIP}}:{{$proxy.targetPort}};
+			{{ else }}
+			proxy_pass http://{{$data.spec.portalIP}};
+			{{ end }}
 		}
 		{{ end }}