diff --git a/charts/shipyard/templates/network_policy_airflow.yaml b/charts/shipyard/templates/network_policy_airflow.yaml
new file mode 100644
index 00000000..cf5267c3
--- /dev/null
+++ b/charts/shipyard/templates/network_policy_airflow.yaml
@@ -0,0 +1,18 @@
+# Copyright 2017-2018 The Openstack-Helm Authors.
+#
+# 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.
+
+{{ if .Values.manifests.network_policy -}}
+{{- $netpol_opts := dict "envAll" . "name" "application" "label" "airflow" -}}
+{{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }}
+{{- end -}}
diff --git a/charts/shipyard/templates/network_policy_shipyard.yaml b/charts/shipyard/templates/network_policy_shipyard.yaml
new file mode 100644
index 00000000..0901f368
--- /dev/null
+++ b/charts/shipyard/templates/network_policy_shipyard.yaml
@@ -0,0 +1,18 @@
+# Copyright 2017-2018 The Openstack-Helm Authors.
+#
+# 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.
+
+{{ if .Values.manifests.network_policy -}}
+{{- $netpol_opts := dict "envAll" . "name" "application" "label" "shipyard" -}}
+{{ $netpol_opts | include "helm-toolkit.manifests.kubernetes_network_policy" }}
+{{- end -}}
diff --git a/charts/shipyard/values.yaml b/charts/shipyard/values.yaml
index 8bf30721..bc8f5296 100644
--- a/charts/shipyard/values.yaml
+++ b/charts/shipyard/values.yaml
@@ -884,6 +884,18 @@ pod:
           memory: "128Mi"
           cpu: "100m"
 
+network_policy:
+  airflow:
+    ingress:
+      - {}
+    egress:
+      - {}
+  shipyard:
+    ingress:
+      - {}
+    egress:
+      - {}
+
 manifests:
   configmap_shipyard_bin: true
   configmap_shipyard_etc: true
@@ -914,3 +926,4 @@ manifests:
   service_airflow_worker: true
   service_discovery_airflow_worker: true
   test_shipyard_api: true
+  network_policy: false