2 files changed, 17 insertions, 2 deletions
diff --git a/data/templates/firewall/nftables.j2 b/data/templates/firewall/nftables.j2
index 84af0449a..0fbddfaa9 100644
--- a/data/templates/firewall/nftables.j2
+++ b/data/templates/firewall/nftables.j2
@@ -2,6 +2,21 @@
 
 {% import 'firewall/nftables-defines.j2' as group_tmpl %}
 
+flush chain raw FW_CONNTRACK
+flush chain ip6 raw FW_CONNTRACK
+
+table raw {
+    chain FW_CONNTRACK {
+        {{ ipv4_conntrack_action }}
+    }
+}
+
+table ip6 raw {
+    chain FW_CONNTRACK {
+        {{ ipv6_conntrack_action }}
+    }
+}
+
 {% if first_install is not vyos_defined %}
 delete table inet vyos_global_rpfilter
 {% endif %}
diff --git a/data/vyos-firewall-init.conf b/data/vyos-firewall-init.conf
index ab25ab4bd..41e7627f5 100644
--- a/data/vyos-firewall-init.conf
+++ b/data/vyos-firewall-init.conf
@@ -73,7 +73,7 @@ table raw {
     }
 
     chain FW_CONNTRACK {
-        accept
+        return
     }
 }
 
@@ -109,6 +109,6 @@ table ip6 raw {
     }
 
     chain FW_CONNTRACK {
-        accept
+        return
     }
 }