diff --git a/meta/main.yml b/meta/main.yml
index abfb250..5df1314 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -2,6 +2,8 @@
 
 galaxy_info:
   author: Felix Niederwanger
+  role_name: pureftpd
+  namespace: geekoops
   description: Install and configure PureFTPd
   company: SUSE
   # issue_tracker_url: http://example.com/issue/tracker
@@ -13,7 +15,8 @@ galaxy_info:
   platforms:
     - name: opensuse
       versions:
-        - 15.2
+        - 15.3
+        - 15.4
 
   galaxy_tags: ['ftp']
 
diff --git a/molecule/default/Dockerfile.leap15_3 b/molecule/default/Dockerfile.leap15_3
new file mode 100644
index 0000000..ddbdb53
--- /dev/null
+++ b/molecule/default/Dockerfile.leap15_3
@@ -0,0 +1,7 @@
+FROM registry.opensuse.org/opensuse/leap:15.3
+
+# Install systemd and development tools, clear cache
+RUN zypper in -y systemd systemd-sysvinit firewalld python3 python3-firewall curl && rm -rf /var/cache/*
+
+# Start container with systemd
+ENTRYPOINT ["/usr/sbin/init"]
diff --git a/molecule/default/Dockerfile.leap15_4 b/molecule/default/Dockerfile.leap15_4
new file mode 100644
index 0000000..ca91067
--- /dev/null
+++ b/molecule/default/Dockerfile.leap15_4
@@ -0,0 +1,7 @@
+FROM registry.opensuse.org/opensuse/leap:15.4
+
+# Install systemd and development tools, clear cache
+RUN zypper in -y systemd systemd-sysvinit firewalld python3 python3-firewall curl && rm -rf /var/cache/*
+
+# Start container with systemd
+ENTRYPOINT ["/usr/sbin/init"]
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
index 497f036..f2315c0 100644
--- a/molecule/default/converge.yml
+++ b/molecule/default/converge.yml
@@ -6,6 +6,11 @@
       include_role:
         name: "geekoops-pureftpd"
     ## Setup test enviroment
+    - name: Enable firewall
+      systemd:
+        name: firewalld
+        state: started
+        enabled: true
     # Test file 1 is accessible (0754), test file 2 not (0750)
     - name: Deploy test file
       copy:
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index c6b8641..4331bb9 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -4,14 +4,23 @@ dependency:
 driver:
   name: docker
 platforms:
-  - name: leap15_2
-    image: grisu48/leap-ansible
-    pre_build_image: true
+  - name: leap15_3
+    image: registry.opensuse.org/opensuse/leap:15.3
+    dockerfile: Dockerfile.leap15_3
+    command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
+    privileged: true
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
-    capabilities:
-      - SYS_ADMIN
+    tmpfs:
+      - /run
+      - /tmp
+  - name: leap15_4
+    image: registry.opensuse.org/opensuse/leap:15.4
+    dockerfile: Dockerfile.leap15_4
+    command: ${MOLECULE_DOCKER_COMMAND:-"/usr/sbin/init"}
     privileged: true
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
     tmpfs:
       - /run
       - /tmp
@@ -19,8 +28,12 @@ provisioner:
   name: ansible
   inventory:
     host_vars:
-      leap15_2:
+      leap15_3:
         ftp_dir: "/srv/ftp"
+        config_firewall: true
+      leap15_4:
+        ftp_dir: "/srv/ftp"
+        config_firewall: true
 verifier:
   name: testinfra
   lint:
diff --git a/tasks/main.yml b/tasks/main.yml
index eb91048..9ecd8f8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -20,6 +20,7 @@
     group: root
     mode: 0744
   notify: restart pureftpd
+  tags: ['ftp']
 - name: Ensure PureFTPd service is started and enabled
   systemd:
     name: "{{pureftpd_service}}"
@@ -27,5 +28,5 @@
     enabled: true
   tags: ['ftp', 'systemd']
 
-- include: firewall.yml
+- include_tasks: firewall.yml
   when: config_firewall == true
diff --git a/vars/openSUSE Leap_15.2.yml b/vars/openSUSE Leap_15.3.yml
similarity index 56%
rename from vars/openSUSE Leap_15.2.yml
rename to vars/openSUSE Leap_15.3.yml
index 745546f..6c8df69 100644
--- a/vars/openSUSE Leap_15.2.yml	
+++ b/vars/openSUSE Leap_15.3.yml	
@@ -1,5 +1,5 @@
 ---
-# openSUSE Leap 15.2 specific variables
+# openSUSE Leap 15.3 specific variables
 
 ## Software packages
 
diff --git a/vars/openSUSE Leap_15.4.yml b/vars/openSUSE Leap_15.4.yml
new file mode 100644
index 0000000..d796c2f
--- /dev/null
+++ b/vars/openSUSE Leap_15.4.yml	
@@ -0,0 +1,6 @@
+---
+# openSUSE Leap 15.4 specific variables
+
+## Software packages
+
+packages: ['pure-ftpd']