diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index bc5343c..0000000
--- a/.gitreview
+++ /dev/null
@@ -1,5 +0,0 @@
-[gerrit]
-host=gerrit.opencord.org
-port=29418
-project=ansible/role/nsd.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 897b99b..0fcf6e0 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 84896ba..349c0d4 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
---!>
 # nsd
 
 NSD Authoritative DNS Server
diff --git a/meta/main.yml b/meta/main.yml
index f437da5..759ce66 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -5,6 +5,9 @@
 # SPDX-License-Identifier: Apache-2.0
 
 galaxy_info:
+  role_name: nsd
+  namespace: onf
+
   author: Open Networking Foundation
   description: NSD Authoritative DNS Server
   company: Open Networking Foundation
@@ -13,18 +16,18 @@
 
   license: Apache-2.0
 
-  min_ansible_version: 2.9.5
+  min_ansible_version: 2.10.17
 
   platforms:
-    - name: Ubuntu
+    - name: ubuntu
       versions:
-        - "18.04"
+        - bionic
     - name: Debian
       versions:
-        - "10"
+        - bullseye
     - name: OpenBSD
       versions:
-        - "6.8"
+        - "7.1"
 
   galaxy_tags:
     - nsd
diff --git a/molecule/default/verify.yml b/molecule/default/verify.yml
index 596330b..d7cb7db 100644
--- a/molecule/default/verify.yml
+++ b/molecule/default/verify.yml
@@ -14,7 +14,7 @@
     # Lint flags the checks as they execute every time, skip this with 'noqa 301'
 
     - name: Check for A record
-      command:  # noqa 301
+      command:  # noqa 301 no-tabs
         cmd: "dig gw.example.com @127.0.0.1"
       register: a_dig
       failed_when: "'gw.example.com.\t\t3600\tIN\tA\t10.0.0.1' not in a_dig.stdout"
@@ -26,7 +26,7 @@
       failed_when: "'gw.example.com.' not in ns_dig.stdout"
 
     - name: Check for CNAME record
-      command:  # noqa 301
+      command:  # noqa 301 no-tabs
         cmd: "dig lpr.example.com @127.0.0.1"
       register: cn_dig
       failed_when: "'lpr.example.com.\t3600\tIN\tCNAME\tprinter.example.com.' not in cn_dig.stdout"