diff --git a/Dockerfile.opensuse b/Dockerfile.opensuse
index b3b880ae5..a4a5ab039 100644
--- a/Dockerfile.opensuse
+++ b/Dockerfile.opensuse
@@ -81,8 +81,6 @@ RUN zypper in -y \
     vim \
     which && zypper cc
 
-RUN systemctl enable fail2ban
-
 # Copy the luet config file pointing to the upgrade repository
 COPY repositories.yaml /etc/luet/luet.yaml
 
diff --git a/Dockerfile.opensuse-arm-rpi b/Dockerfile.opensuse-arm-rpi
index 734de3df6..f5663a0b1 100644
--- a/Dockerfile.opensuse-arm-rpi
+++ b/Dockerfile.opensuse-arm-rpi
@@ -88,8 +88,6 @@ RUN zypper in -y \
     vim \
     which && zypper cc
 
-RUN systemctl enable fail2ban
-
 # Copy the luet config file pointing to the upgrade repository
 COPY repositories.yaml /etc/luet/luet.yaml
 
diff --git a/overlay/files/system/oem/03_branding.yaml b/overlay/files/system/oem/03_branding.yaml
index 959599169..6e393aee6 100644
--- a/overlay/files/system/oem/03_branding.yaml
+++ b/overlay/files/system/oem/03_branding.yaml
@@ -13,6 +13,7 @@ stages:
         - systemd-timesyncd
         - nohang
         - nohang-desktop
+        - fail2ban
         - sshd
         mask:
         - purge-kernels