diff --git a/.ansible-lint b/.ansible-lint
index 9ede9f9..937b336 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -3,14 +3,14 @@
 # Ansible managed
 #
 exclude_paths:
-  - ./molecule/default/prepare.yml
-  - ./molecule/default/converge.yml
-  - ./molecule/default/verify.yml
-  - ./molecule/default/collections.yml
-  - ./.tox
-  - ./.cache
-  - ./.github
-  - ./requirements.yml
+  - molecule/default/prepare.yml
+  - molecule/default/converge.yml
+  - molecule/default/verify.yml
+  - molecule/default/collections.yml
+  - .tox
+  - .cache
+  - .github
+  - requirements.yml
 
 skip_list:
   - yaml[truthy]
diff --git a/.github/settings.yml b/.github/settings.yml
index 8248de2..32c1eca 100644
--- a/.github/settings.yml
+++ b/.github/settings.yml
@@ -5,4 +5,4 @@
 repository:
   description: Install and configure httpd on your system.
   homepage: https://robertdebock.nl/
-  topics: webserver, apache, httpd, installer, package, ansible, molecule, tox, playbook
+  topics: webserver, apache, httpd, installer, package, system, networking, ansible, molecule, tox, playbook
diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index bac619f..3ab9bbd 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -31,16 +31,16 @@ jobs:
         config:
           - image: "enterpriselinux"
             tag: "8"
+          - image: "enterpriselinux"
+            tag: "latest"
           - image: "debian"
             tag: "latest"
           - image: "debian"
-            tag: "bookworm"
+            tag: "bullseye"
           - image: "fedora"
-            tag: "36"
+            tag: "37"
           - image: "fedora"
             tag: "latest"
-          - image: "fedora"
-            tag: "rawhide"
           - image: "opensuse"
             tag: "latest"
           - image: "ubuntu"
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5be63d1..945398b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,16 +14,16 @@ molecule:
     matrix:
       - image: "enterpriselinux"
         tag: "8"
+      - image: "enterpriselinux"
+        tag: "latest"
       - image: "debian"
         tag: "latest"
       - image: "debian"
-        tag: "bookworm"
+        tag: "bullseye"
       - image: "fedora"
-        tag: "36"
+        tag: "37"
       - image: "fedora"
         tag: "latest"
-      - image: "fedora"
-        tag: "rawhide"
       - image: "opensuse"
         tag: "latest"
       - image: "ubuntu"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7beec98..f889d1d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,14 +1,14 @@
 ---
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-added-large-files
 
   - repo: https://github.com/adrienverge/yamllint
-    rev: v1.26.3
+    rev: v1.32.0
     hooks:
       - id: yamllint
         args: [-c=.yamllint]
diff --git a/README.md b/README.md
index fe6da1d..6ffbd21 100644
--- a/README.md
+++ b/README.md
@@ -164,7 +164,7 @@ This role has been tested on these [container images](https://hub.docker.com/u/r
 
 |container|tags|
 |---------|----|
-|[EL](https://hub.docker.com/repository/docker/robertdebock/enterpriselinux/general)|8|
+|[EL](https://hub.docker.com/repository/docker/robertdebock/enterpriselinux/general)|8, 9|
 |[Debian](https://hub.docker.com/repository/docker/robertdebock/debian/general)|all|
 |[Fedora](https://hub.docker.com/repository/docker/robertdebock/fedora/general)|all|
 |[opensuse](https://hub.docker.com/repository/docker/robertdebock/opensuse/general)|all|
diff --git a/meta/main.yml b/meta/main.yml
index 6983942..06c059a 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -11,6 +11,7 @@ galaxy_info:
     - name: EL
       versions:
         - "8"
+        - "9"
     - name: Debian
       versions:
         - all
@@ -30,5 +31,7 @@ galaxy_info:
     - httpd
     - installer
     - package
+    - system
+    - networking
 
 dependencies: []
diff --git a/tasks/assert.yml b/tasks/assert.yml
index 1ee642f..ba4b5d0 100644
--- a/tasks/assert.yml
+++ b/tasks/assert.yml
@@ -4,6 +4,7 @@
     that:
       - httpd_servername is defined
       - httpd_servername is string
+      - httpd_servername is not none
     quiet: yes
 
 - name: assert | Test if httpd_port is set correctly
@@ -27,6 +28,7 @@
     that:
       - httpd_ssl_servername is defined
       - httpd_ssl_servername is string
+      - httpd_ssl_servername is not none
     quiet: yes
 
 - name: assert | Test if httpd_ssl_port is set correctly
@@ -52,10 +54,13 @@
     that:
       - item.name is defined
       - item.name is string
+      - item.name is not none
       - item.location is defined
       - item.location is string
+      - item.location is not none
       - item.backend_url is defined
       - item.backend_url is string
+      - item.backend_url is not none
     quiet: yes
   loop: "{{ httpd_locations }}"
   loop_control:
@@ -76,6 +81,7 @@
     that:
       - item.name is defined
       - item.name is string
+      - item.name is not none
       - item.servername is defined
       - item.servername is string
     quiet: yes
@@ -121,9 +127,10 @@
   ansible.builtin.assert:
     that:
       - item.name is defined
-      - item.name is string
+      - item.name is not none
       - item.path is defined
       - item.path is string
+      - item.path is not none
       - item.option is defined or item.allow_override is defined
     quiet: yes
   loop: "{{ httpd_directories }}"
@@ -148,6 +155,7 @@
   ansible.builtin.assert:
     that:
       - item.allow_override is string
+      - item.allow_override is not none
     quiet: yes
   loop: "{{ httpd_directories }}"
   loop_control:
diff --git a/tox.ini b/tox.ini
index 27bf4b2..708d5bc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -3,16 +3,16 @@
 #
 [tox]
 minversion = 4.2.4
-envlist = py{310}-ansible{5,6,7}
+envlist = py{310}-ansible{6,7,8}
 
 skipsdist = true
 
 [testenv]
 deps =
     -rrequirements.txt
-    ansible5: ansible == 5.*
     ansible6: ansible == 6.*
     ansible7: ansible == 7.*
+    ansible8: ansible == 8.*
 commands = molecule test
 setenv =
     TOX_ENVNAME={envname}