diff --git a/templates/ansible-lint.j2 b/templates/ansible-lint.j2
index 5cc4f2d..172b963 100644
--- a/templates/ansible-lint.j2
+++ b/templates/ansible-lint.j2
@@ -20,3 +20,5 @@ exclude_paths:
   - ./molecule/default/collections.yml
   - ./.tox
   - ./.cache
+  - ./.github
+  - ./requirements.yml
diff --git a/vars/main.yml b/vars/main.yml
index 41dfe83..37549ee 100644
--- a/vars/main.yml
+++ b/vars/main.yml
@@ -28,7 +28,7 @@ platform_image_mapping:
   Debian: debian
   EL: "{{ enterprise_linux | default('enterpriselinux') }}"
   Fedora: fedora
-  OpenSUSE: opensuse
+  opensuse: opensuse
   Ubuntu: ubuntu
 
 # This maps the Galaxy distribution and version to Docker images.
@@ -40,7 +40,7 @@ distribution_version_mapping:
     all:
       - 1
       - latest
-    2018.03:
+    "2018.03":
       - 1
     Candidate:
       - latest
@@ -59,22 +59,22 @@ distribution_version_mapping:
     all:
       - 7
       - latest
-    7:
+    "7":
       - 7
-    8:
+    "8":
       - latest
   Fedora:
     all:
-      - 34
+      - 35
       - latest
       - rawhide
-    34:
-      - 34
-    35:
+    "35":
+      - 35
+    "36":
       - latest
-    36:
+    "37":
       - rawhide
-  OpenSUSE:
+  opensuse:
     all:
       - latest
   Ubuntu: