diff --git a/.dockerignore b/.dockerignore
index 774e6421dd3..2702934ae2a 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,2 +1,7 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 obc-peer
 .git
diff --git a/bddtests/.behaverc b/bddtests/.behaverc
index e9d6c132e19..40d27597915 100644
--- a/bddtests/.behaverc
+++ b/bddtests/.behaverc
@@ -1,3 +1,8 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
 [behave]
 tags=~@orderer
 	 ~@endorser
diff --git a/bddtests/common/__init__.py b/bddtests/common/__init__.py
index e69de29bb2d..49cd7f3ac80 100644
--- a/bddtests/common/__init__.py
+++ b/bddtests/common/__init__.py
@@ -0,0 +1,5 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
diff --git a/bddtests/msp/__init__.py b/bddtests/msp/__init__.py
index 8d1c8b69c3f..da6b6ab91a7 100644
--- a/bddtests/msp/__init__.py
+++ b/bddtests/msp/__init__.py
@@ -1 +1,5 @@
- 
+ #
+ # Copyright IBM Corp. All Rights Reserved.
+ #
+ # SPDX-License-Identifier: Apache-2.0
+ #
diff --git a/bddtests/orderer/__init__.py b/bddtests/orderer/__init__.py
index e69de29bb2d..49cd7f3ac80 100644
--- a/bddtests/orderer/__init__.py
+++ b/bddtests/orderer/__init__.py
@@ -0,0 +1,5 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
diff --git a/bddtests/peer/__init__.py b/bddtests/peer/__init__.py
index e69de29bb2d..49cd7f3ac80 100644
--- a/bddtests/peer/__init__.py
+++ b/bddtests/peer/__init__.py
@@ -0,0 +1,5 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
diff --git a/bddtests/regression/go/ote/json2yml.js b/bddtests/regression/go/ote/json2yml.js
index 9ac1a9d2855..274ed123f2e 100644
--- a/bddtests/regression/go/ote/json2yml.js
+++ b/bddtests/regression/go/ote/json2yml.js
@@ -1,3 +1,8 @@
+//
+// Copyright IBM Corp. All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
 var fs = require('fs');
 
 var cfgFile = process.argv[2];
diff --git a/bddtests/steps/__init__.py b/bddtests/steps/__init__.py
index e69de29bb2d..49cd7f3ac80 100644
--- a/bddtests/steps/__init__.py
+++ b/bddtests/steps/__init__.py
@@ -0,0 +1,5 @@
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
diff --git a/bddtests/templates/html/appendix-py.html b/bddtests/templates/html/appendix-py.html
index 928593282d1..aa342374175 100644
--- a/bddtests/templates/html/appendix-py.html
+++ b/bddtests/templates/html/appendix-py.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div>
     {% set msgClassModule = directory.__class__.__module__ %}
     {% set msgClassName = directory.__class__.__name__ %}
@@ -43,4 +50,4 @@
 
         </code>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/bddtests/templates/html/cli.html b/bddtests/templates/html/cli.html
index c027c2660c4..2495ea106e0 100644
--- a/bddtests/templates/html/cli.html
+++ b/bddtests/templates/html/cli.html
@@ -1,5 +1,12 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div class="scrollBox">
     <code>
 {{ command }}
     </code>
-</div>
\ No newline at end of file
+</div>
diff --git a/bddtests/templates/html/composition-py.html b/bddtests/templates/html/composition-py.html
index 58585c0a03f..1d7c8684b03 100644
--- a/bddtests/templates/html/composition-py.html
+++ b/bddtests/templates/html/composition-py.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div>
     {% set msgClassModule = directory.__class__.__module__ %}
     {% set msgClassName = directory.__class__.__name__ %}
@@ -11,4 +18,4 @@
 
 </code>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/bddtests/templates/html/directory-py.html b/bddtests/templates/html/directory-py.html
index 6bfe29d883c..66b54069d42 100644
--- a/bddtests/templates/html/directory-py.html
+++ b/bddtests/templates/html/directory-py.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div>
     {% set msgClassModule = directory.__class__.__module__ %}
     {% set msgClassName = directory.__class__.__name__ %}
@@ -10,4 +17,4 @@
 
 </code>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/bddtests/templates/html/directory.html b/bddtests/templates/html/directory.html
index 47394f05aaf..3f22ffc8e36 100644
--- a/bddtests/templates/html/directory.html
+++ b/bddtests/templates/html/directory.html
@@ -1,7 +1,14 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div id="directory">
     <h1>Directory</h1>
     <hr/>
     {% if path_to_pickle %}
     {% include 'html/directory-py.html' %}
     {% endif %}
-</div>
\ No newline at end of file
+</div>
diff --git a/bddtests/templates/html/error.html b/bddtests/templates/html/error.html
index 6162cf4c2f0..e3939d4e047 100644
--- a/bddtests/templates/html/error.html
+++ b/bddtests/templates/html/error.html
@@ -1,5 +1,12 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div class="scrollBox">
     <code>
 {{ err }}
     </code>
-</div>
\ No newline at end of file
+</div>
diff --git a/bddtests/templates/html/graph.html b/bddtests/templates/html/graph.html
index ec6acda14c3..7a2e1a83a24 100644
--- a/bddtests/templates/html/graph.html
+++ b/bddtests/templates/html/graph.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <style>
 
 .links line {
@@ -94,4 +101,4 @@
   d.fy = null;
 }
 
-</script>
\ No newline at end of file
+</script>
diff --git a/bddtests/templates/html/header.html b/bddtests/templates/html/header.html
index 30a235d4c61..45936a6d783 100644
--- a/bddtests/templates/html/header.html
+++ b/bddtests/templates/html/header.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div>
     <h{{ level }}>{{ text }}</h{{ level }}>
 </div>
diff --git a/bddtests/templates/html/main.html b/bddtests/templates/html/main.html
index 68b91a2d788..db3e7717c0b 100644
--- a/bddtests/templates/html/main.html
+++ b/bddtests/templates/html/main.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -19,4 +26,4 @@
     {% endblock %}
 </div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/bddtests/templates/html/org-py.html b/bddtests/templates/html/org-py.html
index 886ce9cfa83..666dc8ebe98 100644
--- a/bddtests/templates/html/org-py.html
+++ b/bddtests/templates/html/org-py.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div>
     {% set certVarName = ['cert_for',org.name]|join('_') %}
 <div class="scrollBox">
diff --git a/bddtests/templates/html/org.html b/bddtests/templates/html/org.html
index 33698261e35..3aabe854fcc 100644
--- a/bddtests/templates/html/org.html
+++ b/bddtests/templates/html/org.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div id="{{ org.name }}">
     <h4>Created new organization {{ org.name }} with <a href="{{ cert_href }}">public cert</a></h4>
     <code>{{ org.getCertAsPEM() }}</code>
diff --git a/bddtests/templates/html/protobuf-py.html b/bddtests/templates/html/protobuf-py.html
index e9f282c141a..903d31b8da0 100644
--- a/bddtests/templates/html/protobuf-py.html
+++ b/bddtests/templates/html/protobuf-py.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div>
     {% set msgClassModule = msg.__class__.__module__ %}
     {% set msgClassName = msg.__class__.__name__ %}
diff --git a/bddtests/templates/html/protobuf.html b/bddtests/templates/html/protobuf.html
index 001044f1a2a..e7b3e923386 100644
--- a/bddtests/templates/html/protobuf.html
+++ b/bddtests/templates/html/protobuf.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div>
     {% set maxLength = 10*1024 %}
     {% if linkUrl %}
diff --git a/bddtests/templates/html/report.css b/bddtests/templates/html/report.css
index e1ac712324f..0e60787f65e 100644
--- a/bddtests/templates/html/report.css
+++ b/bddtests/templates/html/report.css
@@ -1,3 +1,10 @@
+/*
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+*/
 table {
     border-collapse: collapse;
 }
@@ -74,4 +81,3 @@ body {
     background-color: #3e4142;
 }
 */
-
diff --git a/bddtests/templates/html/scenario.html b/bddtests/templates/html/scenario.html
index d1a9345e596..c63e9e1c997 100644
--- a/bddtests/templates/html/scenario.html
+++ b/bddtests/templates/html/scenario.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div>
 
     <h1>{{ scenario.name }}</h1>
diff --git a/bddtests/templates/html/step.html b/bddtests/templates/html/step.html
index 100d53981e5..a988249d876 100644
--- a/bddtests/templates/html/step.html
+++ b/bddtests/templates/html/step.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div id="{{ step_id }}">
     <h2>{{ step_id }}</h2>
     <hr/>
diff --git a/bddtests/templates/html/tag.html b/bddtests/templates/html/tag.html
index 8441407499c..619326f2fcc 100644
--- a/bddtests/templates/html/tag.html
+++ b/bddtests/templates/html/tag.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div id="{{ user.name }}-{{ tag_key }}">
     <h4>User {{ user.name }} setting tag key {{ tag_key }} to value</h4>
 </div>
diff --git a/bddtests/templates/html/user.html b/bddtests/templates/html/user.html
index f84dfeb6a35..5dd0a576124 100644
--- a/bddtests/templates/html/user.html
+++ b/bddtests/templates/html/user.html
@@ -1,3 +1,10 @@
+<!--
+#
+# Copyright IBM Corp. All Rights Reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+-->
 <div id="{{ user.name }}">
     <h4>Created new user {{ user.name }} with <a href="{{ private_key_href }}">private key</a></h4>
     <code>{{ user.getPrivateKeyAsPEM() }}</code>