diff --git a/ceph/Chart.yaml b/ceph/Chart.yaml
index 008a2cb43b..c5d6e4f8f3 100755
--- a/ceph/Chart.yaml
+++ b/ceph/Chart.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017 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.
+
 description: A Helm chart for Kubernetes
 name: ceph
 version: 0.1.0
diff --git a/ceph/requirements.yaml b/ceph/requirements.yaml
index 5a6564045d..7a29aad448 100644
--- a/ceph/requirements.yaml
+++ b/ceph/requirements.yaml
@@ -1,5 +1,18 @@
+# Copyright 2017 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.
+
 dependencies: 
   - name: common
     repository: http://localhost:8879/charts
     version: 0.1.0
-
diff --git a/ceph/templates/daemonset-osd.yaml b/ceph/templates/daemonset-osd.yaml
index 9f85d599c1..0092830c17 100644
--- a/ceph/templates/daemonset-osd.yaml
+++ b/ceph/templates/daemonset-osd.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017 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.
+
 ---
 kind: DaemonSet
 apiVersion: extensions/v1beta1
diff --git a/ceph/templates/deployment-mds.yaml b/ceph/templates/deployment-mds.yaml
index e2f7181193..b45b4d7569 100644
--- a/ceph/templates/deployment-mds.yaml
+++ b/ceph/templates/deployment-mds.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017 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.
+
 ---
 kind: Deployment
 apiVersion: extensions/v1beta1
diff --git a/ceph/templates/deployment-moncheck.yaml b/ceph/templates/deployment-moncheck.yaml
index d2d93333b5..e0fe838878 100644
--- a/ceph/templates/deployment-moncheck.yaml
+++ b/ceph/templates/deployment-moncheck.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017 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.
+
 ---
 kind: Deployment
 apiVersion: extensions/v1beta1
@@ -16,7 +30,7 @@ spec:
         daemon: moncheck
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}      
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       serviceAccount: default
       volumes:
         - name: ceph-conf
diff --git a/ceph/templates/deployment-rgw.yaml b/ceph/templates/deployment-rgw.yaml
index 72069d43d5..430113beb5 100644
--- a/ceph/templates/deployment-rgw.yaml
+++ b/ceph/templates/deployment-rgw.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017 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.rgw.enabled }}
 ---
 kind: Deployment
@@ -5,7 +19,7 @@ apiVersion: extensions/v1beta1
 metadata:
   labels:
     app: ceph
-    daemon: rgw 
+    daemon: rgw
   name: ceph-rgw
 spec:
   replicas: {{ .Values.replicas.rgw }}
diff --git a/ceph/templates/secrets.yaml b/ceph/templates/secrets.yaml
index 63a5b9e111..8c11ec2f7d 100644
--- a/ceph/templates/secrets.yaml
+++ b/ceph/templates/secrets.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017 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.secrets.use_common_secrets -}}
 ---
 apiVersion: v1
diff --git a/ceph/templates/service.yaml b/ceph/templates/service.yaml
index 1a5f85b88e..2015ee7ae6 100644
--- a/ceph/templates/service.yaml
+++ b/ceph/templates/service.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017 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.
+
 ---
 kind: Service
 apiVersion: v1
diff --git a/ceph/templates/statefulset-mon.yaml b/ceph/templates/statefulset-mon.yaml
index 265dafbaaa..5aa86a1564 100644
--- a/ceph/templates/statefulset-mon.yaml
+++ b/ceph/templates/statefulset-mon.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017 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.
+
 ---
 apiVersion: apps/v1beta1
 kind: StatefulSet
@@ -37,7 +51,7 @@ spec:
           }
     spec:
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}      
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       serviceAccount: default
       volumes:
         - name: ceph-conf
@@ -53,7 +67,7 @@ spec:
           secret:
             secretName: ceph-bootstrap-rgw-keyring
         - name: ceph-monfs
-          hostPath: 
+          hostPath:
             path: {{ .Values.storage.mon_directory }}
       containers:
         - name: ceph-mon
diff --git a/ceph/templates/storage.yaml b/ceph/templates/storage.yaml
index b60221c10a..084a75e9e3 100644
--- a/ceph/templates/storage.yaml
+++ b/ceph/templates/storage.yaml
@@ -1,3 +1,17 @@
+# Copyright 2017 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.
+
 # note that these secrets are handled by the common chart, not the ceph
 # chart, as we likely want them "everywhere"
 ---
diff --git a/ceph/values.yaml b/ceph/values.yaml
index aa55e6444a..e865f7d06e 100644
--- a/ceph/values.yaml
+++ b/ceph/values.yaml
@@ -1,11 +1,16 @@
-# Default values for ceph.
-# This is a YAML-formatted file.
-# Declare name/value pairs to be passed into your templates.
-# name: value
+# Copyright 2017 The Openstack-Helm Authors.
 #
-# alanmeadows(NOTE): this is merely a sample of the potential
-# tunables available - parameterizing more of the elements
-# in the manifests is a work in progress
+# 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.
 
 replicas:
   mon: 3
@@ -26,7 +31,7 @@ labels:
 
 network:
   public: "10.25.0.0/16"
-  port: 
+  port:
     mon: 6789
     rgw_ingress: 80
     rgw_target: 8088
@@ -78,22 +83,22 @@ resources:
       cpu: "250m"
     limits:
       memory: "50Mi"
-      cpu: "500m"      
+      cpu: "500m"
 
 # Setting this to false will assume you will
-# setup and orchestrate your own secrets and 
+# setup and orchestrate your own secrets and
 # configmaps outside of this helm chart
-# 
+#
 # The list below is in the format of
 #
 #   configMapName:
 #      elementKeyName
 #
-#   ceph.conf: 
+#   ceph.conf:
 #      ceph.conf
 #      ceph.client.admin.keyring
 #      ceph.client.admin.keyring
-#   ceph.mon.keyring: 
+#   ceph.mon.keyring:
 #      ceph.mon.keyring
 #   ceph-bootstrap-rgw-keyring:
 #      ceph.keyring