diff --git a/.ansible-lint-ignore b/.ansible-lint-ignore
index b1276b58..8773c24c 100644
--- a/.ansible-lint-ignore
+++ b/.ansible-lint-ignore
@@ -1,3 +1,18 @@
 test/gce/scenarios/linux/molecule.yml yaml[line-length]
 test/gce/scenarios/windows/molecule.yml yaml[line-length]
 test/roles/ec2plugin/molecule/default/create.yml no-handler
+
+test/roles/vagrantplugin/molecule/default/destroy.yml yaml[octal-values]
+test/roles/vagrantplugin/molecule/default/create.yml yaml[octal-values]
+test/roles/podmanplugin/molecule/default/destroy.yml yaml[octal-values]
+test/roles/podmanplugin/molecule/default/create.yml yaml[octal-values]
+test/roles/gceplugin/molecule/default/destroy.yml yaml[octal-values]
+test/roles/gceplugin/molecule/default/create.yml yaml[octal-values]
+test/roles/ec2plugin/molecule/default/destroy.yml yaml[octal-values]
+test/roles/ec2plugin/molecule/default/create.yml yaml[octal-values]
+test/roles/dockerplugin/molecule/default/destroy.yml yaml[octal-values]
+test/roles/dockerplugin/molecule/default/create.yml yaml[octal-values]
+test/roles/containersplugin/molecule/default/destroy.yml yaml[octal-values]
+test/roles/containersplugin/molecule/default/create.yml yaml[octal-values]
+test/roles/azureplugin/molecule/default/create.yml yaml[octal-values]
+test/roles/azureplugin/molecule/default/destroy.yml yaml[octal-values]
diff --git a/tools/generate-templates.sh b/tools/generate-templates.sh
index 7a65c7fa..19fa1846 100644
--- a/tools/generate-templates.sh
+++ b/tools/generate-templates.sh
@@ -9,16 +9,21 @@ while IFS='' read -r line; do DRIVER_NAMES+=("$line"); done < <(python "tools/ex
 
 cd test/roles
 for DRIVER_NAME in "${DRIVER_NAMES[@]}"; do
-  molecule init role roles."${DRIVER_NAME}"plugin --driver-name="${DRIVER_NAME}"
+  ansible-galaxy role init "${DRIVER_NAME}"plugin
+  cd "${DRIVER_NAME}"plugin
+  ansible localhost -o -m lineinfile -a 'path=meta/main.yml line="  namespace: roles" insertafter="  author: your name"'
+  molecule init scenario --driver-name="${DRIVER_NAME}"
   sed \
 	-e 's!author:.*!author: molecule-plugins!g' \
+  -e 's!namespace:.*!namespace: roles!g' \
 	-e 's!company:.*!company: ansible-community!g' \
 	-e 's!min_ansible_version:.*!min_ansible_version: "2.1"!g' \
 	-e 's!license:.*!license: MIT!g' \
-	-i "${DRIVER_NAME}"plugin/meta/main.yml
+	-i meta/main.yml
   # Not sure if the issue is in molecule or ansible-lint or pre-commit ansible-lint hook
   # As a workaround, kill the offending files.
-  rm -rf "${DRIVER_NAME}"plugin/tests
+  rm -rf tests
+  cd ..
 done
 
 exit 0