diff --git a/common/grpc/security.go b/common/grpc/security.go
index e198cb8..930d2c8 100644
--- a/common/grpc/security.go
+++ b/common/grpc/security.go
@@ -1,7 +1,22 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+
+ * 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 grpc
 
 type GrpcSecurity struct {
 	KeyFile  string
 	CertFile string
 	CaFile   string
-}
\ No newline at end of file
+}
diff --git a/common/grpc/server.go b/common/grpc/server.go
index c3f8c3f..0441fcf 100644
--- a/common/grpc/server.go
+++ b/common/grpc/server.go
@@ -1,12 +1,27 @@
+/*
+ * Copyright 2018-present Open Networking Foundation
+
+ * 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 grpc
 
 import (
-	"net"
 	"context"
+	"github.com/opencord/voltha-go/common/log"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
+	"net"
 	"strconv"
-	"github.com/opencord/voltha-go/common/log"
 	"strings"
 )
 
@@ -36,9 +51,7 @@
 4. Start the server
 
 	s.server.Start(ctx)
- */
-
-
+*/
 
 type GrpcServer struct {
 	gs       *grpc.Server