diff --git a/Dockerfile b/Dockerfile
index bf015a783..4bd56202b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,6 @@
-# syntax = docker/dockerfile:experimental
+# syntax=docker/dockerfile:experimental
+
+
 #   Copyright 2020 Docker, Inc.
 
 #   Licensed under the Apache License, Version 2.0 (the "License");
@@ -89,4 +91,5 @@ FROM base as check-license-headers
 RUN go get -u github.com/kunalkushwaha/ltag 
 RUN --mount=target=. \
     --mount=type=cache,target=/root/.cache/go-build \
-    make -f builder.Makefile check-license-headers
\ No newline at end of file
+    make -f builder.Makefile check-license-headers
+
diff --git a/Makefile b/Makefile
index 5976b81f4..b04403abf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-#   Copyright 2020 The 2020 Docker, Inc.
+#   Copyright 2020 Docker, 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/aci/aci_test.go b/aci/aci_test.go
index 145bf2802..22efe8eab 100644
--- a/aci/aci_test.go
+++ b/aci/aci_test.go
@@ -1,3 +1,19 @@
+/*
+   Copyright 2020 Docker, Inc.
+
+   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.
+*/
+
 package aci
 
 import (
diff --git a/aci/convert/container.go b/aci/convert/container.go
index 6929e97fd..742e7f7e1 100644
--- a/aci/convert/container.go
+++ b/aci/convert/container.go
@@ -1,3 +1,19 @@
+/*
+   Copyright 2020 Docker, Inc.
+
+   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.
+*/
+
 package convert
 
 import (
diff --git a/aci/login/client.go b/aci/login/client.go
index ad92441bb..6175fd2fd 100644
--- a/aci/login/client.go
+++ b/aci/login/client.go
@@ -1,3 +1,19 @@
+/*
+   Copyright 2020 Docker, Inc.
+
+   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.
+*/
+
 package login
 
 import (
diff --git a/aci/login/storage_helper.go b/aci/login/storage_helper.go
index 51d047462..2cc5d59b2 100644
--- a/aci/login/storage_helper.go
+++ b/aci/login/storage_helper.go
@@ -1,3 +1,19 @@
+/*
+   Copyright 2020 Docker, Inc.
+
+   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.
+*/
+
 package login
 
 import (
diff --git a/cli/cmd/login/azurelogin.go b/cli/cmd/login/azurelogin.go
index 4b7f3a28f..433ad5501 100644
--- a/cli/cmd/login/azurelogin.go
+++ b/cli/cmd/login/azurelogin.go
@@ -1,3 +1,19 @@
+/*
+   Copyright 2020 Docker, Inc.
+
+   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.
+*/
+
 package login
 
 import (
diff --git a/cli/cmd/logout/azure.go b/cli/cmd/logout/azure.go
index 478f821cf..a976b800b 100644
--- a/cli/cmd/logout/azure.go
+++ b/cli/cmd/logout/azure.go
@@ -1,3 +1,19 @@
+/*
+   Copyright 2020 Docker, Inc.
+
+   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.
+*/
+
 package logout
 
 import (
diff --git a/cli/cmd/logout/logout.go b/cli/cmd/logout/logout.go
index cfc63ed3e..bea8a8e53 100644
--- a/cli/cmd/logout/logout.go
+++ b/cli/cmd/logout/logout.go
@@ -1,3 +1,19 @@
+/*
+   Copyright 2020 Docker, Inc.
+
+   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.
+*/
+
 package logout
 
 import (
diff --git a/cli/cmd/mobyflags/mobyflags.go b/cli/cmd/mobyflags/mobyflags.go
index dcce02d8b..e6c7bcf1a 100644
--- a/cli/cmd/mobyflags/mobyflags.go
+++ b/cli/cmd/mobyflags/mobyflags.go
@@ -1,3 +1,19 @@
+/*
+   Copyright 2020 Docker, Inc.
+
+   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.
+*/
+
 package mobyflags
 
 import (
diff --git a/cli/mobycli/delegate_ecs.go b/cli/mobycli/delegate_ecs.go
index dccc7e095..65415e8c0 100644
--- a/cli/mobycli/delegate_ecs.go
+++ b/cli/mobycli/delegate_ecs.go
@@ -1,5 +1,21 @@
 // +build !ecs
 
+/*
+   Copyright 2020 Docker, Inc.
+
+   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.
+*/
+
 package mobycli
 
 import "github.com/docker/api/context/store"
diff --git a/cli/mobycli/exec_test.go b/cli/mobycli/exec_test.go
index ed186b892..8c1f18c20 100644
--- a/cli/mobycli/exec_test.go
+++ b/cli/mobycli/exec_test.go
@@ -1,3 +1,19 @@
+/*
+   Copyright 2020 Docker, Inc.
+
+   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.
+*/
+
 package mobycli
 
 import (
diff --git a/docs/install/install.sh b/docs/install/install.sh
index 62fd74279..aa6800372 100755
--- a/docs/install/install.sh
+++ b/docs/install/install.sh
@@ -1,5 +1,20 @@
 #!/bin/sh
 
+#   Copyright 2020 Docker, Inc.
+
+#   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.
+
+
 # Script to install the Docker ACI integration CLI on Ubuntu (Beta).
 
 set -eu
diff --git a/ecs/backend.go b/ecs/backend.go
index 02cf121a6..3b1e91327 100644
--- a/ecs/backend.go
+++ b/ecs/backend.go
@@ -2,10 +2,13 @@
 
 /*
    Copyright 2020 Docker, Inc.
+
    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.
diff --git a/ecs/context.go b/ecs/context.go
index de7a34153..f6eaa0cab 100644
--- a/ecs/context.go
+++ b/ecs/context.go
@@ -2,10 +2,13 @@
 
 /*
    Copyright 2020 Docker, Inc.
+
    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.
diff --git a/ecs/doc.go b/ecs/doc.go
index 2ea49a880..74f8b51d2 100644
--- a/ecs/doc.go
+++ b/ecs/doc.go
@@ -1,9 +1,12 @@
 /*
    Copyright 2020 Docker, Inc.
+
    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.
diff --git a/prompt/prompt.go b/prompt/prompt.go
index 34623b933..d23904cc2 100644
--- a/prompt/prompt.go
+++ b/prompt/prompt.go
@@ -1,9 +1,12 @@
 /*
    Copyright 2020 Docker, Inc.
+
    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.
diff --git a/server/proxy/containers_test.go b/server/proxy/containers_test.go
index 2c0aee2b9..93fe228a2 100644
--- a/server/proxy/containers_test.go
+++ b/server/proxy/containers_test.go
@@ -1,3 +1,19 @@
+/*
+   Copyright 2020 Docker, Inc.
+
+   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.
+*/
+
 package proxy
 
 import (
diff --git a/tests/composefiles/aci-demo/db/Dockerfile b/tests/composefiles/aci-demo/db/Dockerfile
index 35f0e8550..693541387 100644
--- a/tests/composefiles/aci-demo/db/Dockerfile
+++ b/tests/composefiles/aci-demo/db/Dockerfile
@@ -1,3 +1,16 @@
+#   Copyright 2020 Docker, Inc.
+
+#   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 postgres:10.0-alpine
 
 COPY words.sql /docker-entrypoint-initdb.d/
diff --git a/tests/composefiles/aci-demo/web/Dockerfile b/tests/composefiles/aci-demo/web/Dockerfile
index 2dd000aef..47ed36860 100644
--- a/tests/composefiles/aci-demo/web/Dockerfile
+++ b/tests/composefiles/aci-demo/web/Dockerfile
@@ -1,3 +1,16 @@
+#   Copyright 2020 Docker, Inc.
+
+#   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.
 # BUILD
 FROM ubuntu:latest
 
diff --git a/tests/composefiles/aci-demo/words/Dockerfile b/tests/composefiles/aci-demo/words/Dockerfile
index 6171e2361..f2c7652c5 100644
--- a/tests/composefiles/aci-demo/words/Dockerfile
+++ b/tests/composefiles/aci-demo/words/Dockerfile
@@ -1,3 +1,16 @@
+#   Copyright 2020 Docker, Inc.
+
+#   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.
 # BUILD
 FROM openjdk:8u171-jdk-alpine as build
 
diff --git a/utils/stringutils.go b/utils/stringutils.go
index 6febf8e9a..d02a3a874 100644
--- a/utils/stringutils.go
+++ b/utils/stringutils.go
@@ -1,3 +1,19 @@
+/*
+   Copyright 2020 Docker, Inc.
+
+   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.
+*/
+
 package utils
 
 // StringContains check if an array contains a specific value