diff --git a/README.rst b/README.rst
index 2d9ccbb9..a038252e 100644
--- a/README.rst
+++ b/README.rst
@@ -49,7 +49,7 @@ See contributors on GitHub_.
 
 Copyright
 =========
-Copyright 2016 Red Hat, Inc.
+Copyright 2017 Red Hat, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
diff --git a/ara/__init__.py b/ara/__init__.py
index 9839df43..85b90fe5 100644
--- a/ara/__init__.py
+++ b/ara/__init__.py
@@ -1,4 +1,4 @@
-#   Copyright 2016 Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
diff --git a/ara/callback/log_ara.py b/ara/callback/log_ara.py
index 7eab52b8..aacd79ba 100644
--- a/ara/callback/log_ara.py
+++ b/ara/callback/log_ara.py
@@ -1,4 +1,4 @@
-#   Copyright 2016 Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
diff --git a/ara/cli/data.py b/ara/cli/data.py
index 3c13abf0..64adc42b 100644
--- a/ara/cli/data.py
+++ b/ara/cli/data.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import logging
 
diff --git a/ara/cli/file.py b/ara/cli/file.py
index bd583982..aa724862 100644
--- a/ara/cli/file.py
+++ b/ara/cli/file.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import logging
 
diff --git a/ara/cli/generate.py b/ara/cli/generate.py
index 16f01510..c80f681f 100644
--- a/ara/cli/generate.py
+++ b/ara/cli/generate.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import logging
 import os
diff --git a/ara/cli/host.py b/ara/cli/host.py
index 521eb628..b96acdac 100644
--- a/ara/cli/host.py
+++ b/ara/cli/host.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import json
 import logging
diff --git a/ara/cli/play.py b/ara/cli/play.py
index bc17bfbe..23f5b065 100644
--- a/ara/cli/play.py
+++ b/ara/cli/play.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import logging
 
diff --git a/ara/cli/playbook.py b/ara/cli/playbook.py
index 2a3a1d03..b5c280f7 100644
--- a/ara/cli/playbook.py
+++ b/ara/cli/playbook.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import logging
 
diff --git a/ara/cli/result.py b/ara/cli/result.py
index a18d885c..aafef281 100644
--- a/ara/cli/result.py
+++ b/ara/cli/result.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import logging
 
diff --git a/ara/cli/static.py b/ara/cli/static.py
index fd45fbe4..50d40746 100644
--- a/ara/cli/static.py
+++ b/ara/cli/static.py
@@ -1,4 +1,4 @@
-#   Copyright 2016 Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
diff --git a/ara/cli/stats.py b/ara/cli/stats.py
index 7ae875cb..d23d403f 100644
--- a/ara/cli/stats.py
+++ b/ara/cli/stats.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import logging
 
diff --git a/ara/cli/task.py b/ara/cli/task.py
index 6a683801..b642f689 100644
--- a/ara/cli/task.py
+++ b/ara/cli/task.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import logging
 
diff --git a/ara/config.py b/ara/config.py
index b51664ea..a15347de 100644
--- a/ara/config.py
+++ b/ara/config.py
@@ -1,4 +1,4 @@
-#   Copyright 2016 Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
diff --git a/ara/context_processors.py b/ara/context_processors.py
index 6e4a329f..cedd8166 100644
--- a/ara/context_processors.py
+++ b/ara/context_processors.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 from ara import models
 
 
diff --git a/ara/db/env.py b/ara/db/env.py
index 0e3cea31..81137a45 100755
--- a/ara/db/env.py
+++ b/ara/db/env.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 from __future__ import with_statement
 from alembic import context
 from sqlalchemy import engine_from_config, pool
diff --git a/ara/db/versions/001_initial_revision.py b/ara/db/versions/001_initial_revision.py
index c405fa10..457ac86c 100644
--- a/ara/db/versions/001_initial_revision.py
+++ b/ara/db/versions/001_initial_revision.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 """Initial Revision
 
 Revision ID: da9459a1f71c
diff --git a/ara/db/versions/002_ara_record_data.py b/ara/db/versions/002_ara_record_data.py
index c8fb4217..9cae64d6 100644
--- a/ara/db/versions/002_ara_record_data.py
+++ b/ara/db/versions/002_ara_record_data.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 """ara_record data
 
 Revision ID: e8e78fd08bf2
diff --git a/ara/db/versions/003_ara_record_type.py b/ara/db/versions/003_ara_record_type.py
index 534e7f7e..196ed326 100644
--- a/ara/db/versions/003_ara_record_type.py
+++ b/ara/db/versions/003_ara_record_type.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 """ara_record type
 
 Revision ID: 2a0c6b92010a
diff --git a/ara/errorhandlers.py b/ara/errorhandlers.py
index 5a41b701..f1940c04 100644
--- a/ara/errorhandlers.py
+++ b/ara/errorhandlers.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 from flask import render_template
 
 
diff --git a/ara/fields.py b/ara/fields.py
index fe0bfcff..237563b9 100644
--- a/ara/fields.py
+++ b/ara/fields.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 import datetime
 from flask import render_template_string
 
diff --git a/ara/filters.py b/ara/filters.py
index e3081846..2e97a059 100644
--- a/ara/filters.py
+++ b/ara/filters.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 import datetime
 import json
 import logging
diff --git a/ara/freezer.py b/ara/freezer.py
index f0e43dfb..d6adb9a7 100644
--- a/ara/freezer.py
+++ b/ara/freezer.py
@@ -1,4 +1,4 @@
-#   Copyright 2016 Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
diff --git a/ara/manage.py b/ara/manage.py
index e33f5cca..23e1e797 100755
--- a/ara/manage.py
+++ b/ara/manage.py
@@ -1,4 +1,18 @@
 #!/usr/bin/env python
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 
 from flask_script import Manager, prompt_bool
 from flask_migrate import Migrate, MigrateCommand
diff --git a/ara/models.py b/ara/models.py
index 1c3fccdc..4750fbcb 100644
--- a/ara/models.py
+++ b/ara/models.py
@@ -1,4 +1,4 @@
-#   Copyright 2016 Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
diff --git a/ara/plugins/actions/ara_read.py b/ara/plugins/actions/ara_read.py
index 5d0c9f52..7682bec7 100644
--- a/ara/plugins/actions/ara_read.py
+++ b/ara/plugins/actions/ara_read.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import json
 import os
diff --git a/ara/plugins/actions/ara_record.py b/ara/plugins/actions/ara_record.py
index 46cfc1df..bf46a5d5 100644
--- a/ara/plugins/actions/ara_record.py
+++ b/ara/plugins/actions/ara_record.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import json
 import os
diff --git a/ara/plugins/callbacks/log_ara.py b/ara/plugins/callbacks/log_ara.py
index 74f0b345..754b062a 100644
--- a/ara/plugins/callbacks/log_ara.py
+++ b/ara/plugins/callbacks/log_ara.py
@@ -1,4 +1,4 @@
-#   Copyright 2016 Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
diff --git a/ara/plugins/modules/ara_read.py b/ara/plugins/modules/ara_read.py
index 611cdd96..64d52372 100644
--- a/ara/plugins/modules/ara_read.py
+++ b/ara/plugins/modules/ara_read.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 # This file is purposefully left empty due to an Ansible issue
 # Details at: https://github.com/ansible/ansible/pull/18208
diff --git a/ara/plugins/modules/ara_record.py b/ara/plugins/modules/ara_record.py
index f459b642..a05af5e4 100644
--- a/ara/plugins/modules/ara_record.py
+++ b/ara/plugins/modules/ara_record.py
@@ -1,4 +1,4 @@
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 # This file is purposefully left empty due to an Ansible issue
 # Details at: https://github.com/ansible/ansible/pull/18208
diff --git a/ara/shell.py b/ara/shell.py
index bafb6d67..6ead0e36 100644
--- a/ara/shell.py
+++ b/ara/shell.py
@@ -1,4 +1,4 @@
-#   Copyright 2016 Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -11,7 +11,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 import sys
 
diff --git a/ara/tests/integration/failed.yml b/ara/tests/integration/failed.yml
index 63cba2ef..407cff9d 100644
--- a/ara/tests/integration/failed.yml
+++ b/ara/tests/integration/failed.yml
@@ -1,3 +1,18 @@
+---
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 - name: Failed playbook
   hosts: localhost
   tasks:
diff --git a/ara/tests/integration/hosts.yml b/ara/tests/integration/hosts.yml
index d42048e6..7b92849d 100644
--- a/ara/tests/integration/hosts.yml
+++ b/ara/tests/integration/hosts.yml
@@ -1,5 +1,5 @@
 ---
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -12,7 +12,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 - name: Create fake hosts for host tests
   hosts: localhost
diff --git a/ara/tests/integration/include_role.yml b/ara/tests/integration/include_role.yml
index 5082ea12..e5a30257 100644
--- a/ara/tests/integration/include_role.yml
+++ b/ara/tests/integration/include_role.yml
@@ -1,3 +1,18 @@
+---
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 - name: "Ansible >=2.2: include_role tasks"
   hosts: localhost
   gather_facts: no
diff --git a/ara/tests/integration/incomplete.yml b/ara/tests/integration/incomplete.yml
index 29cb8284..9d62f781 100644
--- a/ara/tests/integration/incomplete.yml
+++ b/ara/tests/integration/incomplete.yml
@@ -1,3 +1,18 @@
+---
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 - name: Incomplete playbook
   hosts: localhost
   tasks:
diff --git a/ara/tests/integration/roles/included-role/defaults/main.yml b/ara/tests/integration/roles/included-role/defaults/main.yml
index 20b59d8a..b81bf797 100644
--- a/ara/tests/integration/roles/included-role/defaults/main.yml
+++ b/ara/tests/integration/roles/included-role/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -12,7 +12,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 role_message: "This message is from an included role"
 task_message: "This message is from an included task in an included role"
diff --git a/ara/tests/integration/roles/included-role/tasks/included-task.yml b/ara/tests/integration/roles/included-role/tasks/included-task.yml
index 101ebbf8..912debd0 100644
--- a/ara/tests/integration/roles/included-role/tasks/included-task.yml
+++ b/ara/tests/integration/roles/included-role/tasks/included-task.yml
@@ -1,5 +1,5 @@
 ---
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -12,7 +12,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 - debug:
     msg: "{{ task_message }}"
diff --git a/ara/tests/integration/roles/included-role/tasks/main.yml b/ara/tests/integration/roles/included-role/tasks/main.yml
index f7e13fee..bf127e0c 100644
--- a/ara/tests/integration/roles/included-role/tasks/main.yml
+++ b/ara/tests/integration/roles/included-role/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -12,7 +12,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 - debug:
     msg: "{{ role_message }}"
diff --git a/ara/tests/integration/roles/smoke-tests/defaults/main.yml b/ara/tests/integration/roles/smoke-tests/defaults/main.yml
index 782b8ce4..6b2a86c2 100644
--- a/ara/tests/integration/roles/smoke-tests/defaults/main.yml
+++ b/ara/tests/integration/roles/smoke-tests/defaults/main.yml
@@ -1,5 +1,5 @@
 ---
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -12,7 +12,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 tmpdir: "{{ lookup('env', 'ANSIBLE_TMP_DIR')|default('/tmp/ansible') }}"
 tmpfile: "{{ tmpdir }}/tmpfile.txt"
diff --git a/ara/tests/integration/roles/smoke-tests/tasks/ara-ops.yml b/ara/tests/integration/roles/smoke-tests/tasks/ara-ops.yml
index cd2f306b..ffc4a3bc 100644
--- a/ara/tests/integration/roles/smoke-tests/tasks/ara-ops.yml
+++ b/ara/tests/integration/roles/smoke-tests/tasks/ara-ops.yml
@@ -1,5 +1,5 @@
 ---
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -12,7 +12,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 # ARA record and read modules specific tests
 - name: Record data with no type
diff --git a/ara/tests/integration/roles/smoke-tests/tasks/blk-ops.yml b/ara/tests/integration/roles/smoke-tests/tasks/blk-ops.yml
index 20213f28..c86c4265 100644
--- a/ara/tests/integration/roles/smoke-tests/tasks/blk-ops.yml
+++ b/ara/tests/integration/roles/smoke-tests/tasks/blk-ops.yml
@@ -1,5 +1,5 @@
 ---
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -12,7 +12,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 # Tests some things around blocks, failures and rescues
 
diff --git a/ara/tests/integration/roles/smoke-tests/tasks/file-ops.yml b/ara/tests/integration/roles/smoke-tests/tasks/file-ops.yml
index dcc4be18..9d8e0642 100644
--- a/ara/tests/integration/roles/smoke-tests/tasks/file-ops.yml
+++ b/ara/tests/integration/roles/smoke-tests/tasks/file-ops.yml
@@ -1,5 +1,5 @@
 ---
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -12,7 +12,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 # Tests some things around files
 
diff --git a/ara/tests/integration/roles/smoke-tests/tasks/main.yml b/ara/tests/integration/roles/smoke-tests/tasks/main.yml
index e96d5fb9..da71c771 100644
--- a/ara/tests/integration/roles/smoke-tests/tasks/main.yml
+++ b/ara/tests/integration/roles/smoke-tests/tasks/main.yml
@@ -1,5 +1,5 @@
 ---
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -12,7 +12,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 - name: Deferred setup
   setup:
diff --git a/ara/tests/integration/roles/smoke-tests/tasks/pkg-ops.yml b/ara/tests/integration/roles/smoke-tests/tasks/pkg-ops.yml
index cf660bb4..bbd4b960 100644
--- a/ara/tests/integration/roles/smoke-tests/tasks/pkg-ops.yml
+++ b/ara/tests/integration/roles/smoke-tests/tasks/pkg-ops.yml
@@ -1,5 +1,5 @@
 ---
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -12,7 +12,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 # Tests some things around packages
 
diff --git a/ara/tests/integration/smoke.yml b/ara/tests/integration/smoke.yml
index 00468d24..9a3691bf 100644
--- a/ara/tests/integration/smoke.yml
+++ b/ara/tests/integration/smoke.yml
@@ -1,5 +1,5 @@
 ---
-#   Copyright Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
@@ -12,7 +12,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 - name: ARA Tasks test play
   hosts: localhost
diff --git a/ara/tests/unit/common.py b/ara/tests/unit/common.py
index 11a1548a..9dc0faa0 100644
--- a/ara/tests/unit/common.py
+++ b/ara/tests/unit/common.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 import flask
 import unittest
 
diff --git a/ara/tests/unit/fakes.py b/ara/tests/unit/fakes.py
index 04d4e2cf..531befec 100644
--- a/ara/tests/unit/fakes.py
+++ b/ara/tests/unit/fakes.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 import random
 
 import ara.models as m
diff --git a/ara/tests/unit/test_app.py b/ara/tests/unit/test_app.py
index ef129020..4b903f82 100644
--- a/ara/tests/unit/test_app.py
+++ b/ara/tests/unit/test_app.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 import pytest
 
 from ara.tests.unit.common import ansible_run
diff --git a/ara/tests/unit/test_ara_read.py b/ara/tests/unit/test_ara_read.py
index 919f1b27..7864673f 100644
--- a/ara/tests/unit/test_ara_read.py
+++ b/ara/tests/unit/test_ara_read.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 from collections import defaultdict
 import random
 
diff --git a/ara/tests/unit/test_ara_record.py b/ara/tests/unit/test_ara_record.py
index 538de405..361c093d 100644
--- a/ara/tests/unit/test_ara_record.py
+++ b/ara/tests/unit/test_ara_record.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 from collections import defaultdict
 import random
 
diff --git a/ara/tests/unit/test_callback.py b/ara/tests/unit/test_callback.py
index 4a16d33d..58044ed6 100644
--- a/ara/tests/unit/test_callback.py
+++ b/ara/tests/unit/test_callback.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 from collections import defaultdict
 import random
 import os
diff --git a/ara/tests/unit/test_cli.py b/ara/tests/unit/test_cli.py
index cfadb541..ac866ee7 100644
--- a/ara/tests/unit/test_cli.py
+++ b/ara/tests/unit/test_cli.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 import json
 import os
 import shutil
diff --git a/ara/tests/unit/test_filters.py b/ara/tests/unit/test_filters.py
index cd9da9d4..6d7f76f1 100644
--- a/ara/tests/unit/test_filters.py
+++ b/ara/tests/unit/test_filters.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 import datetime
 
 from ara.tests.unit.common import TestAra
diff --git a/ara/tests/unit/test_models.py b/ara/tests/unit/test_models.py
index 8f31f3ae..be21e65a 100644
--- a/ara/tests/unit/test_models.py
+++ b/ara/tests/unit/test_models.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 import ara.models as m
 
 from ara.tests.unit.common import TestAra
diff --git a/ara/tests/unit/test_utils.py b/ara/tests/unit/test_utils.py
index 6be07bb5..f046a6d7 100644
--- a/ara/tests/unit/test_utils.py
+++ b/ara/tests/unit/test_utils.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 import ara.utils as u
 import json
 
diff --git a/ara/utils.py b/ara/utils.py
index 77f3e514..326f043c 100644
--- a/ara/utils.py
+++ b/ara/utils.py
@@ -1,4 +1,4 @@
-#   Copyright 2016 Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
diff --git a/ara/views/debug.py b/ara/views/debug.py
index 6f930a51..d4c517ff 100644
--- a/ara/views/debug.py
+++ b/ara/views/debug.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 import cgi
 from flask import Blueprint, Response, url_for
 
diff --git a/ara/views/file.py b/ara/views/file.py
index 05487079..3fde3330 100644
--- a/ara/views/file.py
+++ b/ara/views/file.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 from flask import render_template, abort, Blueprint
 from ara import models
 
diff --git a/ara/views/home.py b/ara/views/home.py
index ec6a5250..26edf3ce 100644
--- a/ara/views/home.py
+++ b/ara/views/home.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 from flask import render_template, Blueprint
 from ara import models, utils
 
diff --git a/ara/views/host.py b/ara/views/host.py
index 82435896..38ab7c09 100644
--- a/ara/views/host.py
+++ b/ara/views/host.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 import json
 import six
 
diff --git a/ara/views/playbook.py b/ara/views/playbook.py
index 8558bd64..c95944d3 100644
--- a/ara/views/playbook.py
+++ b/ara/views/playbook.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 from flask import render_template, abort, Blueprint, request
 from ara import models, utils
 
diff --git a/ara/views/result.py b/ara/views/result.py
index 1ea2c573..f82a6c83 100644
--- a/ara/views/result.py
+++ b/ara/views/result.py
@@ -1,3 +1,17 @@
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 from flask import render_template, abort, Blueprint
 from ara import models
 
diff --git a/ara/webapp.py b/ara/webapp.py
index 9b8cd7ff..959f5745 100644
--- a/ara/webapp.py
+++ b/ara/webapp.py
@@ -1,4 +1,4 @@
-#   Copyright 2016 Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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
diff --git a/doc/source/conf.py b/doc/source/conf.py
index 4499f7cf..a371f4b5 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -1,16 +1,17 @@
 # -*- coding: utf-8 -*-
-# 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
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
-#    http://www.apache.org/licenses/LICENSE-2.0
+#   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
 #
-# 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.
+#       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.
 
 import os
 import sys
diff --git a/run_tests.sh b/run_tests.sh
index c9b17661..b84df591 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -1,4 +1,18 @@
 #!/bin/bash
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
+#
+#   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.
+
 # Some tests only work on certain versions of Ansible.
 # Use Ansible's pseudo semver to determine if we can run something.
 function semver_compare() {
diff --git a/setup.py b/setup.py
index be0fbcdd..af183162 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-#   Copyright 2016 Red Hat, Inc. All Rights Reserved.
+#   Copyright 2017 Red Hat, Inc. All Rights Reserved.
 #
 #   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