diff --git a/.github/workflows/molecule.yml b/.github/workflows/molecule.yml
index e6e7e46..37d38de 100644
--- a/.github/workflows/molecule.yml
+++ b/.github/workflows/molecule.yml
@@ -11,7 +11,6 @@ name: Molecule
 jobs:
   build:
     runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.allowed-to-fail }}
     strategy:
       fail-fast: false
       matrix:
@@ -19,7 +18,6 @@ jobs:
           - debian-10
           - debian-11
           - debian-12
-          - ubuntu-18.04
           - ubuntu-22.04
         allowed-to-fail:
           - false
@@ -39,3 +37,7 @@ jobs:
           molecule_options: --base-config molecule/_shared/base.yml
           molecule_args: --scenario-name ${{ matrix.scenario }}
           molecule_working_dir: "HanXHX/ansible-nginx"
+        continue-on-error: ${{ matrix.allowed-to-fail }}
+
+      - name: Fake command
+        run: echo "End of job"
diff --git a/README.md b/README.md
index 9281d04..7073d9f 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,6 @@ Supported OS:
 | Debian Bookworm (12) | Yes     | Not yet :)                                                                                           |
 | FreeBSD 11           | NA      | No                                                                                                   |
 | FreeBSD 12           | NA      | No                                                                                                   |
-| Ubuntu 18.04         | Yes     | Yes                                                                                                  |
 | Ubuntu 20.04         | Yes     | Yes                                                                                                  |
 | Ubuntu 22.04         | Yes     | Yes                                                                                                  |
 
diff --git a/meta/main.yml b/meta/main.yml
index 57d4d68..7445dcc 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -16,7 +16,6 @@ galaxy_info:
         - bookworm
     - name: Ubuntu
       versions:
-        - bionic
         - focal
         - jammy
     - name: FreeBSD
diff --git a/molecule/ubuntu-18.04/molecule.yml b/molecule/ubuntu-18.04/molecule.yml
deleted file mode 100644
index 7a55da6..0000000
--- a/molecule/ubuntu-18.04/molecule.yml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-
-platforms:
-  - name: ubuntu-18.04
-    image: dokken/ubuntu-18.04
-    command: /lib/systemd/systemd
-    dockerfile: ../_shared/Dockerfile.j2
-    capabilities:
-      - SYS_ADMIN
-    cgroupns_mode: host
-    volumes:
-      - /sys/fs/cgroup:/sys/fs/cgroup:rw
-    privileged: true
diff --git a/tests/includes/post_common.yml b/tests/includes/post_common.yml
index 6ac8078..275ee43 100644
--- a/tests/includes/post_common.yml
+++ b/tests/includes/post_common.yml
@@ -240,20 +240,17 @@
 # --------------------------------
 # Check Proxy protocol
 # --------------------------------
-- name: BLOCK - Check proxy protocol
-  when: not (ansible_distribution == 'Ubuntu' and ansible_distribution_major_version | int == 18)
-  block:
-    - name: SHELL | Check HTTP proxy protocol
-      ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol http://test-ssl-proxy-protocol.local:20080 | grep -qi 'X-Proxy-Protocol'
-      args:
-        executable: /bin/bash
-      changed_when: false
+- name: SHELL | Check HTTP proxy protocol
+  ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol http://test-ssl-proxy-protocol.local:20080 | grep -qi 'X-Proxy-Protocol'
+  args:
+    executable: /bin/bash
+  changed_when: false
 
-    - name: SHELL | Check HTTPS proxy protocol
-      ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol -k https://test-ssl-proxy-protocol.local:20443 | grep -qi 'X-Proxy-Protocol'
-      args:
-        executable: /bin/bash
-      changed_when: false
+- name: SHELL | Check HTTPS proxy protocol
+  ansible.builtin.shell: set -o pipefail && curl -I --haproxy-protocol -k https://test-ssl-proxy-protocol.local:20443 | grep -qi 'X-Proxy-Protocol'
+  args:
+    executable: /bin/bash
+  changed_when: false
 
 # --------------------------------
 # Check HTTP2