diff --git a/config/rules.yml.backup b/config/rules.yml.backup
deleted file mode 100644
index 2a00311..0000000
--- a/config/rules.yml.backup
+++ /dev/null
@@ -1,46 +0,0 @@
-subject: namespace:ns
-revision: "2022"
-rules:
-- selector: # must be empty for preprocessing adapters
-  aspects:
-  # Fetch the API key and use it to set various request attributes.
-  # This is where the adapter should cache, because this one gets called three times
-  # (check, quota, and report)
-  - kind: attributes
-    adapter: apigeeAttributes
-    params:
-      input_expressions:
-        apiKey: request.headers["apikey"] | "INVALID_KEY"
-        requestPath: request.path | "/"
-      attribute_bindings:
-        authorization.success.string: successString
-        authorization.success: success
-        authorization.client.id: clientID
-        authorization.application.name: applicationName
-        authorization.apiproduct.name: apiProduct
-  # In "check" reject the request if the key is invalid. It'd be nice if we could
-  # customize the error here. We could build yet another adapter for that purpose!
-  - kind: lists
-    adapter: authorizationChecker
-    params:
-      checkExpression: authorization.success.string
-  - kind: attributes
-    adapter: apigeeAnalytics
-    params:
-      logName: accesslog.apigee
-      log: 
-        descriptorName: accesslog.apigee
-        labels:
-          sourceIP: source.ip
-          urlPath: request.path
-          hostHeader: request.host
-          httpMethod: request.method
-          userAgent: request.useragent
-          requestTime: request.time
-          responseTime: response.time
-          responseCode: response.code | 200
-          proxyName: proxy.name | "istio"
-          proxyRevision: proxy.revision | 1
-          clientID: authorization.client.id | ""
-          applicationName: authorization.application.name | ""
-          apiProduct: authorization.apiproduct.name | ""
diff --git a/setup/istio.yaml b/setup/istio.yaml
index dc36bc7..a02b16a 100644
--- a/setup/istio.yaml
+++ b/setup/istio.yaml
@@ -1,19 +1,5 @@
-# Copyright 2017 Google, Inc.
-#
-#   Licensed under the Apache License, Version 2.0 (the "License");
-#   you may not use this file except in compliance with the License.
-#   You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-#   Unless required by applicable law or agreed to in writing, software
-#   distributed under the License is distributed on an "AS IS" BASIS,
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-#   See the License for the specific language governing permissions and
-#   limitations under the License.
-
 # GENERATED FILE. Use with Kubernetes 1.5+
-# TO UPDATE, modify files in install/kubernetes/templates and run updateVersion.sh
+# TO UPDATE, modify files in install/kubernetes/templates and run install/updateVersion.sh
 # Mixer
 apiVersion: v1
 kind: Service
@@ -47,7 +33,6 @@
     spec:
       containers:
       - name: mixer
-#        image: docker.io/istio/mixer:0.1.2-6bfa390
         image: kidiyoor/mixer:apigeev4
         imagePullPolicy: Always
         ports:
@@ -68,7 +53,7 @@
         secret:
           secretName: apigee-mixer-adapter
 ---
-# Manager service for discovery
+# Pilot service for discovery
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -78,16 +63,16 @@
     # Uncomment the following line to enable mutual TLS between proxies
     # authPolicy: MUTUAL_TLS
     mixerAddress: istio-mixer:9091
-    discoveryAddress: istio-manager:8080
+    discoveryAddress: istio-pilot:8080
     ingressService: istio-ingress
     zipkinAddress: zipkin:9411
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: istio-manager
+  name: istio-pilot
   labels:
-    istio: manager
+    istio: pilot
 spec:
   ports:
   - port: 8080
@@ -95,17 +80,17 @@
   - port: 8081
     name: http-apiserver
   selector:
-    istio: manager
+    istio: pilot
 ---
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: istio-manager-service-account
+  name: istio-pilot-service-account
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
-  name: istio-manager
+  name: istio-pilot
 spec:
   replicas: 1
   template:
@@ -113,12 +98,12 @@
       annotations:
         alpha.istio.io/sidecar: ignore
       labels:
-        istio: manager
+        istio: pilot
     spec:
-      serviceAccountName: istio-manager-service-account
+      serviceAccountName: istio-pilot-service-account
       containers:
       - name: discovery
-        image: docker.io/istio/manager:0.1.2-6dbd19d
+        image: docker.io/istio/pilot:0.1.6
         imagePullPolicy: Always
         args: ["discovery", "-v", "2"]
         ports:
@@ -130,7 +115,7 @@
               apiVersion: v1
               fieldPath: metadata.namespace
       - name: apiserver
-        image: docker.io/istio/manager:0.1.2-6dbd19d
+        image: docker.io/istio/pilot:0.1.6
         imagePullPolicy: Always
         args: ["apiserver", "-v", "2"]
         ports:
@@ -183,7 +168,7 @@
       serviceAccountName: istio-ingress-service-account
       containers:
       - name: istio-ingress
-        image: docker.io/istio/proxy_debug:0.1.2-6dbd19d
+        image: docker.io/istio/proxy_debug:0.1.6
         args: ["proxy", "ingress", "-v", "2"]
         imagePullPolicy: Always
         ports:
@@ -223,7 +208,7 @@
     spec:
       containers:
       - name: proxy
-        image: docker.io/istio/proxy_debug:0.1.2-6dbd19d
+        image: docker.io/istio/proxy_debug:0.1.6
         imagePullPolicy: Always
         args: ["proxy", "egress", "-v", "2"]
         env:
@@ -233,3 +218,4 @@
               apiVersion: v1
               fieldPath: metadata.namespace
 ---
+
diff --git a/setup/mixer-0.1.6.yaml b/setup/mixer-0.1.6.yaml
new file mode 100644
index 0000000..648f726
--- /dev/null
+++ b/setup/mixer-0.1.6.yaml
@@ -0,0 +1,35 @@
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: istio-mixer
+spec:
+  replicas: 1
+  template:
+    metadata:
+      annotations:
+        alpha.istio.io/sidecar: ignore
+      labels:
+        istio: mixer
+    spec:
+      containers:
+      - name: mixer
+        image: kidiyoor/mixer:apigeev4
+        imagePullPolicy: Always
+        ports:
+        - containerPort: 9091
+        - containerPort: 9094
+        - containerPort: 42422
+        args:
+          - --configStoreURL=fs:///etc/opt/mixer/configroot
+          - --logtostderr
+          - -v
+          - "3"
+        volumeMounts:
+        - name: apigee-mixer-adapter
+          mountPath: /etc/opt/mixer/apigee
+          readOnly: true
+      volumes:
+      - name: apigee-mixer-adapter
+        secret:
+          secretName: apigee-mixer-adapter