diff --git a/.github/workflows/check-license.yaml b/.github/workflows/check-license.yaml
index 07359149c..fea361d25 100644
--- a/.github/workflows/check-license.yaml
+++ b/.github/workflows/check-license.yaml
@@ -20,14 +20,12 @@ jobs:
 
       - name: Check License Header
         run: |
-          if [ "$(grep -rcL --exclude-dir=.git --exclude-dir=build \
-            --exclude=\*.crt --exclude=\*.key --exclude=\*.pem \
-            --exclude=\*.zed --exclude=\*.hcl \
-            --exclude=CODEOWNERS --exclude=LICENSE --exclude=MAINTAINERS \
-            --exclude=\*.md --exclude=\*.json --exclude=\*.csv \
-            --exclude=\*.mod --exclude=\*.sum \
-            --exclude=\*.tmpl --exclude=\*.args \
-            --regexp "Copyright (c) Abstract Machines" .)" ]; then
-            echo "License header check failed"
+          CHECK=$(grep -rcL --exclude-dir={.git,build} \
+            --exclude=\*.{crt,key,pem,zed,hcl,md,json,csv,mod,sum,tmpl,args} \
+            --exclude={CODEOWNERS,LICENSE,MAINTAINERS} \
+            --regexp "Copyright (c) Abstract Machines" .)
+          if [ "$CHECK" ]; then
+            echo "License header check failed. Fix the following files:"
+            echo "$CHECK"
             exit 1
           fi
diff --git a/auth/api/http/domains/decode.go b/auth/api/http/domains/decode.go
index c55e1fab9..9ca8d7ce2 100644
--- a/auth/api/http/domains/decode.go
+++ b/auth/api/http/domains/decode.go
@@ -1,4 +1,4 @@
-// Copyright (c) Magistrala
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package domains
diff --git a/auth/api/http/domains/endpoint.go b/auth/api/http/domains/endpoint.go
index ee94bd837..7a408c05c 100644
--- a/auth/api/http/domains/endpoint.go
+++ b/auth/api/http/domains/endpoint.go
@@ -1,4 +1,4 @@
-// Copyright (c) Magistrala
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package domains
diff --git a/auth/api/http/domains/requests.go b/auth/api/http/domains/requests.go
index 626a5e661..02d4cf7dc 100644
--- a/auth/api/http/domains/requests.go
+++ b/auth/api/http/domains/requests.go
@@ -1,4 +1,4 @@
-// Copyright (c) Magistrala
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package domains
diff --git a/auth/api/http/domains/responses.go b/auth/api/http/domains/responses.go
index 1d7ecc99c..6342f8ca6 100644
--- a/auth/api/http/domains/responses.go
+++ b/auth/api/http/domains/responses.go
@@ -1,4 +1,4 @@
-// Copyright (c) Magistrala
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package domains
diff --git a/auth/api/http/domains/transport.go b/auth/api/http/domains/transport.go
index a0a6c24ac..c3f70412f 100644
--- a/auth/api/http/domains/transport.go
+++ b/auth/api/http/domains/transport.go
@@ -1,4 +1,4 @@
-// Copyright (c) Magistrala
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package domains
diff --git a/auth/domains.go b/auth/domains.go
index 8a1b589da..b391c4127 100644
--- a/auth/domains.go
+++ b/auth/domains.go
@@ -1,4 +1,4 @@
-// Copyright (c) Magistrala
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package auth
diff --git a/auth/mocks/domains.go b/auth/mocks/domains.go
index 5dd4a98ba..7969c26a0 100644
--- a/auth/mocks/domains.go
+++ b/auth/mocks/domains.go
@@ -1,4 +1,4 @@
-// Copyright (c) Magistrala
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package mocks
diff --git a/auth/postgres/domains.go b/auth/postgres/domains.go
index 086c06679..96a63d558 100644
--- a/auth/postgres/domains.go
+++ b/auth/postgres/domains.go
@@ -1,4 +1,4 @@
-// Copyright (c) Magistrala
+// Copyright (c) Abstract Machines
 // SPDX-License-Identifier: Apache-2.0
 
 package postgres
diff --git a/auth/postgres/domains_test.go b/auth/postgres/domains_test.go
index 52ecf9a59..32c2a69b8 100644
--- a/auth/postgres/domains_test.go
+++ b/auth/postgres/domains_test.go
@@ -1,3 +1,6 @@
+// Copyright (c) Abstract Machines
+// SPDX-License-Identifier: Apache-2.0
+
 package postgres_test
 
 import (