diff --git a/CHANGELOG.md b/CHANGELOG.md
index d3ce80f..b6eacba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,11 @@ SPDX-License-Identifier: GPL-3.0-or-later
 Changelog
 ---------
 
+**7.9.0**
+
+- Added support for `Fedora 33` (contribution by @wzzrd)
+- Removed support for `Fedora 31` (reached end of life)
+
 **7.8.0**
 
 - Added support for `openSUSE Leap 15.2`
diff --git a/README.md b/README.md
index a2cfb38..447ed95 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ I used [PeerVPN](https://peervpn.net/) before but that wasn't updated for a whil
 
 In general WireGuard is a network tunnel (VPN) for IPv4 and IPv6 that uses UDP. If you need more information about [WireGuard](https://www.wireguard.io/) you can find a good introduction here: [Installing WireGuard, the Modern VPN](https://research.kudelskisecurity.com/2017/06/07/installing-wireguard-the-modern-vpn/).
 
-This role is tested with Ubuntu 18.04 (Bionic Beaver), Ubuntu 20.04 (Focal Fossa) and Archlinux. Ubuntu 16.04 (Xenial Xerus), Debian 10 (Buster), Fedora 31 (or later), CentOS 7 and partially MacOS (see below) might also work or other distributions but haven't tested it (code for this operating systems was submitted by other contributors). If someone tested it let me please know if it works or send a pull request to make it work ;-)
+This role is tested with Ubuntu 18.04 (Bionic Beaver), Ubuntu 20.04 (Focal Fossa) and Archlinux. Ubuntu 16.04 (Xenial Xerus), Debian 10 (Buster), Fedora 32 (or later), CentOS 7/8 and partially MacOS (see below) might also work but only best effort (code for this operating systems was submitted by other contributors).
 
 ### Running the VPN on MacOS
 
@@ -297,16 +297,24 @@ Endpoint = server.at.home.p.domain.tld:51820
 
 The other WireGuard config files (`wg0.conf` by default) looks similar but of course `[Interface]` includes the config of that specific host and the `[Peer]` entries lists the config of the other hosts.
 
-Example Playbook
-----------------
+Example Playbooks
+-----------------
 
 ```yaml
 - hosts: vpn
   roles:
-    - wireguard
+    - githubixx.ansible_role_wireguard
 ```
 
-Example Inventory using two different WireGuard interfaces on host "multi"
+```yaml
+  hosts: vpn
+  roles:
+    -
+      role: githubixx.ansible_role_wireguard
+      tags: role-wireguard
+```
+
+Example inventory using two different WireGuard interfaces on host "multi"
 --------------------------------------------------------------------------
 
 This is a complex example using yaml inventory format:
@@ -348,19 +356,18 @@ vpn2:
       wireguard_endpoint: another.exemple.com
 ```
 
-Playbooks
----------
+Sample playbooks for example above:
 
 ```yaml
 - hosts: vpn1
   roles:
-    - wireguard
+    - githubixx.ansible_role_wireguard
 ```
 
 ```yaml
 - hosts: vpn2
   roles:
-    - wireguard
+    - githubixx.ansible_role_wireguard
 ```
 
 License
diff --git a/meta/main.yml b/meta/main.yml
index fab832c..d9f59f5 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -21,8 +21,8 @@ galaxy_info:
     - 8
   - name: Fedora
     versions:
-    - 31
     - 32
+    - 33
   - name: opensuse
     versions:
     - 15.2
diff --git a/molecule/kvm/molecule.yml b/molecule/kvm/molecule.yml
index eae0c11..820abf5 100644
--- a/molecule/kvm/molecule.yml
+++ b/molecule/kvm/molecule.yml
@@ -43,8 +43,8 @@ platforms:
         ip: 192.168.10.30
     groups:
       - vpn
-  - name: test-wg-fedora31
-    box: generic/fedora31
+  - name: test-wg-fedora33
+    box: generic/fedora33
     interfaces:
       - auto_config: true
         network_name: private_network
@@ -124,7 +124,7 @@ provisioner:
         wireguard_persistent_keepalive: "30"
         wireguard_endpoint: "192.168.10.30"
         ansible_python_interpreter: "/usr/bin/python"
-      test-wg-fedora31:
+      test-wg-fedora33:
         wireguard_address: "10.10.10.40/24"
         wireguard_port: 51820
         wireguard_persistent_keepalive: "30"