diff --git a/components/opdk-iptables-block.yml b/components/opdk-iptables-block.yml
new file mode 100644
index 0000000..59e0dc0
--- /dev/null
+++ b/components/opdk-iptables-block.yml
@@ -0,0 +1,12 @@
+---
+- hosts: '{{ hosts }}'
+  vars_files:
+  - ~/.apigee/credentials.yml
+  roles:
+  - apigee-opdk-setup-bootstrap
+  - apigee-opdk-setup-component-installer
+  - { role: apigee-opdk-set-reachable, reachability: False, server_type: '{{ server_type_name }}' }
+  - { role: apigee-opdk-iptables-port-block, destination_port: '{{ qpid_messaging_port }}' }
+  - { role: apigee-opdk-update-component, apigee_component: '{{ upgrade_component }}' }
+  - { role: apigee-opdk-iptables-flush }
+  - { role: apigee-opdk-set-reachable, reachability: True, server_type: '{{ server_type_name }}' }
diff --git a/components/opdk-upgrade-component.yml b/components/opdk-upgrade-component.yml
index dd5d0b7..3e71e16 100644
--- a/components/opdk-upgrade-component.yml
+++ b/components/opdk-upgrade-component.yml
@@ -1,11 +1,8 @@
 ---
 - hosts: '{{ hosts }}'
-  vars:
-    opdk_version: 4.16.09
   vars_files:
   - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-bootstrap
   - apigee-opdk-setup-component-installer
-#  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
   - { role: apigee-opdk-update-component, apigee_component: '{{ upgrade_component }}' }
diff --git a/components/opdk-upgrade-reachability-component.yml b/components/opdk-upgrade-reachability-component.yml
index a614150..7dd477a 100644
--- a/components/opdk-upgrade-reachability-component.yml
+++ b/components/opdk-upgrade-reachability-component.yml
@@ -2,14 +2,9 @@
 - hosts: '{{ hosts }}'
   vars_files:
   - ~/.apigee/credentials.yml
-  vars:
-    opdk_version: 4.16.09
-  vars_files:
-  - ~/.apigee/credentials.yml
   roles:
   - apigee-opdk-setup-bootstrap
   - apigee-opdk-setup-component-installer
   - { role: apigee-opdk-set-reachable, reachability: False, server_type: '{{ server_type_name }}' }
-#  - { role: apigee-opdk-setup-component, profile: '{{ component_profile }}' }
   - { role: apigee-opdk-update-component, apigee_component: '{{ upgrade_component }}' }
   - { role: apigee-opdk-set-reachable, reachability: True, server_type: '{{ server_type_name }}' }
diff --git a/requirements.yml b/requirements.yml
index a3c275e..8c52bef 100644
--- a/requirements.yml
+++ b/requirements.yml
@@ -22,3 +22,7 @@
 - src: https://github.com/carlosfrias/apigee-opdk-update-component
 
 - src: https://github.com/carlosfrias/apigee-opdk-setup-bootstrap
+
+- src: https://github.com/carlosfrias/apigee-opdk-iptables-flush
+
+- src: https://github.com/carlosfrias/apigee-opdk-iptables-port-block
diff --git a/upgrade.yml b/upgrade.yml
index 342a2b8..7781cb3 100644
--- a/upgrade.yml
+++ b/upgrade.yml
@@ -19,7 +19,7 @@
     hosts: ds
     upgrade_component: zk
 
-- include: components/opdk-upgrade-reachability-component.yml
+- include: components/opdk-iptables-block.yml
   vars:
     update_apigee_service: true
     hosts: qpid