diff --git a/tasks/configs.yml b/tasks/configs.yml
index c1dd7ff..1a5e41c 100644
--- a/tasks/configs.yml
+++ b/tasks/configs.yml
@@ -24,3 +24,8 @@
     dest: "{{ shorewall_configs_dir }}/interfaces"
   notify:
     - shorewall restart
+
+- name: Configure shorewall service autostart
+  service:
+    name:  shorewall
+    enabled: "{{ 'yes' if shorewall_startup == 1 else 'no' }}"
diff --git a/tasks/configsipv6.yml b/tasks/configsipv6.yml
index 1ebac41..17aeeef 100644
--- a/tasks/configsipv6.yml
+++ b/tasks/configsipv6.yml
@@ -27,3 +27,9 @@
   notify:
     - shorewall6 restart
   when: shorewall6_enable
+
+- name: Configure shorewall6 service autostart
+  service:
+    name:  shorewall6
+    enabled: "{{ 'yes' if shorewall_startup == 1 else 'no' }}"
+  when: shorewall6_enable