diff --git a/server/fw_util_firewalld.c b/server/fw_util_firewalld.c
index 3eae64a2..cdf6e4f8 100644
--- a/server/fw_util_firewalld.c
+++ b/server/fw_util_firewalld.c
@@ -793,9 +793,15 @@ fw_config_init(fko_srv_options_t * const opts)
 
     memset(&fwc, 0x0, sizeof(struct fw_config));
 
-    /* Set our firewall exe command path (firewalld in most cases).
+    /* Set our firewall exe command path (firewall-cmd or iptables in most cases).
     */
+#if FIREWALL_FIREWALLD
+    char cmd_passthru[512];
+    snprintf(cmd_passthru, sizeof cmd_passthru, "%s %s ", opts->config[CONF_FIREWALL_EXE], " --direct --passthrough ipv4 ");
+    strlcpy(fwc.fw_command, cmd_passthru, sizeof(fwc.fw_command));
+#else
     strlcpy(fwc.fw_command, opts->config[CONF_FIREWALL_EXE], sizeof(fwc.fw_command));
+#endif
 
 #if HAVE_LIBFIU
     fiu_return_on("fw_config_init", 0);
diff --git a/server/fw_util_firewalld.h b/server/fw_util_firewalld.h
index 2fe789d2..b27da5c5 100644
--- a/server/fw_util_firewalld.h
+++ b/server/fw_util_firewalld.h
@@ -35,25 +35,25 @@
 
 /* firewalld command args
 */
-#define FIREWD_CHK_RULE_ARGS       "--direct --passthrough ipv4 -C %s %s"  /* 2>&1 is always added in the second %s */
-#define FIREWD_RULE_ARGS           "--direct --passthrough ipv4 -t %s -p %i -s %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s 2>&1"
-#define FIREWD_OUT_RULE_ARGS       "--direct --passthrough ipv4 -t %s -p %i -d %s --sport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s 2>&1"
-#define FIREWD_FWD_RULE_ARGS       "--direct --passthrough ipv4 -t %s -p %i -s %s -d %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s 2>&1"
-#define FIREWD_DNAT_RULE_ARGS      "--direct --passthrough ipv4 -t %s -p %i -s %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s --to-destination %s:%i 2>&1"
-#define FIREWD_SNAT_RULE_ARGS      "--direct --passthrough ipv4 -t %s -p %i -d %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s %s 2>&1"
-#define FIREWD_TMP_COMMENT_ARGS    "--direct --passthrough ipv4 -t %s -I %s %i -s 127.0.0.2 -m comment --comment " TMP_COMMENT " -j %s 2>&1"
-#define FIREWD_TMP_CHK_RULE_ARGS   "--direct --passthrough ipv4 -t %s -I %s %i -s 127.0.0.2 -p udp -j %s 2>&1"
-#define FIREWD_TMP_VERIFY_CHK_ARGS "--direct --passthrough ipv4 -t %s -C %s -s 127.0.0.2 -p udp -j %s 2>&1"
-#define FIREWD_DEL_RULE_ARGS       "--direct --passthrough ipv4 -t %s -D %s %i 2>&1"
-#define FIREWD_NEW_CHAIN_ARGS      "--direct --passthrough ipv4 -t %s -N %s 2>&1"
-#define FIREWD_FLUSH_CHAIN_ARGS    "--direct --passthrough ipv4 -t %s -F %s 2>&1"
-#define FIREWD_CHAIN_EXISTS_ARGS   "--direct --passthrough ipv4 -t %s -L %s -n 2>&1"
-#define FIREWD_DEL_CHAIN_ARGS      "--direct --passthrough ipv4 -t %s -X %s 2>&1"
-#define FIREWD_CHK_JUMP_RULE_ARGS  "--direct --passthrough ipv4 -t %s -j %s 2>&1"
-#define FIREWD_ADD_JUMP_RULE_ARGS  "--direct --passthrough ipv4 -t %s -I %s %i -j %s 2>&1"
-#define FIREWD_DEL_JUMP_RULE_ARGS  "--direct --passthrough ipv4 -t %s -D %s -j %s 2>&1"  /* let firewalld work out the rule number */
-#define FIREWD_LIST_RULES_ARGS     "--direct --passthrough ipv4 -t %s -L %s --line-numbers -n 2>&1"
-#define FIREWD_LIST_ALL_RULES_ARGS "--direct --passthrough ipv4 -t %s -v -n -L --line-numbers 2>&1"
+#define FIREWD_CHK_RULE_ARGS       "-C %s %s"  /* 2>&1 is always added in the second %s */
+#define FIREWD_RULE_ARGS           "-t %s -p %i -s %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s 2>&1"
+#define FIREWD_OUT_RULE_ARGS       "-t %s -p %i -d %s --sport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s 2>&1"
+#define FIREWD_FWD_RULE_ARGS       "-t %s -p %i -s %s -d %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s 2>&1"
+#define FIREWD_DNAT_RULE_ARGS      "-t %s -p %i -s %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s --to-destination %s:%i 2>&1"
+#define FIREWD_SNAT_RULE_ARGS      "-t %s -p %i -d %s --dport %i -m comment --comment " EXPIRE_COMMENT_PREFIX "%u -j %s %s 2>&1"
+#define FIREWD_TMP_COMMENT_ARGS    "-t %s -I %s %i -s 127.0.0.2 -m comment --comment " TMP_COMMENT " -j %s 2>&1"
+#define FIREWD_TMP_CHK_RULE_ARGS   "-t %s -I %s %i -s 127.0.0.2 -p udp -j %s 2>&1"
+#define FIREWD_TMP_VERIFY_CHK_ARGS "-t %s -C %s -s 127.0.0.2 -p udp -j %s 2>&1"
+#define FIREWD_DEL_RULE_ARGS       "-t %s -D %s %i 2>&1"
+#define FIREWD_NEW_CHAIN_ARGS      "-t %s -N %s 2>&1"
+#define FIREWD_FLUSH_CHAIN_ARGS    "-t %s -F %s 2>&1"
+#define FIREWD_CHAIN_EXISTS_ARGS   "-t %s -L %s -n 2>&1"
+#define FIREWD_DEL_CHAIN_ARGS      "-t %s -X %s 2>&1"
+#define FIREWD_CHK_JUMP_RULE_ARGS  "-t %s -j %s 2>&1"
+#define FIREWD_ADD_JUMP_RULE_ARGS  "-t %s -I %s %i -j %s 2>&1"
+#define FIREWD_DEL_JUMP_RULE_ARGS  "-t %s -D %s -j %s 2>&1"  /* let firewalld work out the rule number */
+#define FIREWD_LIST_RULES_ARGS     "-t %s -L %s --line-numbers -n 2>&1"
+#define FIREWD_LIST_ALL_RULES_ARGS "-t %s -v -n -L --line-numbers 2>&1"
 
 int validate_firewd_chain_conf(const char * const chain_str);