diff --git a/istio-manifests/whitelist-egress-google-metadata.yaml b/istio-manifests/whitelist-egress-google-metadata.yaml
new file mode 100644
index 0000000..ae4f14c
--- /dev/null
+++ b/istio-manifests/whitelist-egress-google-metadata.yaml
@@ -0,0 +1,30 @@
+# Copyright 2018 Google LLC
+#
+# 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.
+
+apiVersion: networking.istio.io/v1alpha3
+kind: ServiceEntry
+metadata:
+  name: whitelist-egress-google-metadata
+spec:
+  hosts:
+  - metadata.google.internal
+  addresses:
+  - 169.254.169.254 # GCE metadata server
+  ports:
+  - number: 80
+    name: http
+    protocol: HTTP
+  - number: 443
+    name: https
+    protocol: HTTPS
diff --git a/istio-manifests/whitelist-egress-googleapis.yaml b/istio-manifests/whitelist-egress-googleapis.yaml
index 92ead32..2e93698 100644
--- a/istio-manifests/whitelist-egress-googleapis.yaml
+++ b/istio-manifests/whitelist-egress-googleapis.yaml
@@ -18,9 +18,6 @@ metadata:
   name: whitelist-egress-googleapis
 spec:
   hosts:
-  - "169.254.169.254" # GCE metadata server
-  - "metadata.google" # GCE metadata server
-  - "metadata.google.internal" # GCE metadata server
   - "accounts.google.com" # Used to get token
   - "*.googleapis.com"
   ports:
diff --git a/release/istio-manifests.yaml b/release/istio-manifests.yaml
index fb89f70..284131d 100644
--- a/release/istio-manifests.yaml
+++ b/release/istio-manifests.yaml
@@ -82,9 +82,6 @@ metadata:
   name: whitelist-egress-googleapis
 spec:
   hosts:
-  - "169.254.169.254" # GCE metadata server
-  - "metadata.google" # GCE metadata server
-  - "metadata.google.internal" # GCE metadata server
   - "accounts.google.com" # Used to get token
   - "*.googleapis.com"
   ports:
@@ -95,3 +92,20 @@ spec:
     protocol: HTTPS
     name: https
 ---
+apiVersion: networking.istio.io/v1alpha3
+kind: ServiceEntry
+metadata:
+  name: whitelist-egress-google-metadata
+spec:
+  hosts:
+  - metadata.google.internal
+  addresses:
+  - 169.254.169.254 # GCE metadata server
+  ports:
+  - number: 80
+    name: http
+    protocol: HTTP
+  - number: 443
+    name: https
+    protocol: HTTPS
+---