diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index 641385f..0000000
--- a/.gitreview
+++ /dev/null
@@ -1,5 +0,0 @@
-[gerrit]
-host=gerrit.opencord.org
-port=29418
-project=ansible/role/gerrit.git
-defaultremote=origin
diff --git a/.reuse/dep5 b/.reuse/dep5
index 36ce305..1fed8b9 100644
--- a/.reuse/dep5
+++ b/.reuse/dep5
@@ -1,5 +1,5 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 
-Files: .cookiecutter_params.json VERSION .gitreview
+Files: .cookiecutter_params.json VERSION README.md
 Copyright: 2020 Open Networking Foundation
 License: Apache-2.0
diff --git a/Makefile b/Makefile
index 337beea..2e86c51 100644
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,13 @@
     -d "{extends: default, rules: {line-length: {max: 99}}}" \
     -s $(YAML_FILES)
 
+# List of molecule files, not including base molecule.yml which isn't ansible format
+MOLECULE_FILES ?= $(shell find molecule -type f -name '*.yml' \! -name 'molecule.yml' -print )
+
 ansiblelint: ## lint check with ansible-lint
 	ansible-lint --version
 	ansible-lint -v .
-	ansible-lint -v molecule/*/*
+	ansible-lint -v $(MOLECULE_FILES)
 
 license: ## Check license with the reuse tool
 	reuse --version
diff --git a/README.md b/README.md
index ba04dcb..7cb4be1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,3 @@
-<!--
-SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
-SPDX-License-Identifier: Apache-2.0
---!>
 # gerrit
 
 Gerrit Code Review
diff --git a/meta/main.yml b/meta/main.yml
index c26dce7..752c386 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -5,6 +5,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 galaxy_info:
+  role_name: gerrit
+  namespace: onf
+
   author: Open Networking Foundation
   description: Gerrit Code Review
   company: Open Networking Foundation
@@ -16,10 +19,9 @@
   min_ansible_version: 2.9.5
 
   platforms:
-    - name: Ubuntu
+    - name: Debian
       versions:
-        - "16.04"
-        - "18.04"
+        - bullseye
 
   galaxy_tags:
     - gerrit