diff --git a/diskimage-create/diskimage-create.sh b/diskimage-create/diskimage-create.sh
index f7028479..ec14b04b 100755
--- a/diskimage-create/diskimage-create.sh
+++ b/diskimage-create/diskimage-create.sh
@@ -117,8 +117,8 @@ if [ -z "$PLUGIN" -o "$PLUGIN" = "vanilla" ]; then
   export HIVE_VERSION=${HIVE_VERSION:-"0.11.0"}
 
   ubuntu_elements_sequence="base vm ubuntu hadoop swift_hadoop oozie mysql hive"
-  fedora_elements_sequence="base vm fedora hadoop swift_hadoop oozie mysql hive"
-  centos_elements_sequence="vm rhel hadoop swift_hadoop oozie mysql hive redhat-lsb"
+  fedora_elements_sequence="base vm fedora hadoop swift_hadoop oozie mysql hive disable-firewall"
+  centos_elements_sequence="vm rhel hadoop swift_hadoop oozie mysql hive redhat-lsb disable-firewall"
 
   # Workaround for https://bugs.launchpad.net/diskimage-builder/+bug/1204824
   # https://bugs.launchpad.net/sahara/+bug/1252684
diff --git a/elements/disable-firewall/post-install.d/30-disable-firewalld b/elements/disable-firewall/post-install.d/30-disable-firewalld
index 96050dc1..1e65ced6 100755
--- a/elements/disable-firewall/post-install.d/30-disable-firewalld
+++ b/elements/disable-firewall/post-install.d/30-disable-firewalld
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+install-packages which
+
 if which systemctl; then
    systemctl disable firewalld
 fi
diff --git a/elements/disable-firewall/post-install.d/30-disable-ip6tables b/elements/disable-firewall/post-install.d/31-disable-ip6tables
similarity index 100%
rename from elements/disable-firewall/post-install.d/30-disable-ip6tables
rename to elements/disable-firewall/post-install.d/31-disable-ip6tables
diff --git a/elements/disable-firewall/post-install.d/30-disable-iptables b/elements/disable-firewall/post-install.d/32-disable-iptables
similarity index 100%
rename from elements/disable-firewall/post-install.d/30-disable-iptables
rename to elements/disable-firewall/post-install.d/32-disable-iptables
diff --git a/elements/hadoop/post-install.d/firstboot b/elements/hadoop/post-install.d/firstboot
index c24216fc..dc958744 100644
--- a/elements/hadoop/post-install.d/firstboot
+++ b/elements/hadoop/post-install.d/firstboot
@@ -23,14 +23,9 @@ function firstboot_common()
              sleep 1
           done
           chown -R $user:$user /home/$user
-
-          #TODO: configure iptables (https://bugs.launchpad.net/sahara/+bug/1195744)
-          iptables -F
        ;;
        CentOS )
           chown -R cloud-user:cloud-user /home/cloud-user
-          service iptables stop
-          chkconfig iptables off
        ;;
        * )
           echo "Unknown distro: $distro. Exiting."