diff --git a/data/class_groups/firewall_compute.yaml b/data/class_groups/firewall_compute.yaml
new file mode 100644
index 0000000..c75f02e
--- /dev/null
+++ b/data/class_groups/firewall_compute.yaml
@@ -0,0 +1,5 @@
+classes:
+  - openstacklib::firewall
+  - openstacklib::firewall::base
+  - openstacklib::firewall::ssh
+  - openstacklib::firewall::compute
diff --git a/data/class_groups/firewall_control.yaml b/data/class_groups/firewall_control.yaml
index f325ddd..e909c52 100644
--- a/data/class_groups/firewall_control.yaml
+++ b/data/class_groups/firewall_control.yaml
@@ -1,5 +1,8 @@
 classes:
   - openstacklib::firewall
+  - openstacklib::firewall::base
+  - openstacklib::firewall::ssh
+  - openstacklib::firewall::memcached
   - openstacklib::firewall::nova
   - openstacklib::firewall::dhcp
   - openstacklib::firewall::keystone
diff --git a/data/data_mappings/scenario/stacktira.yaml b/data/data_mappings/scenario/stacktira.yaml
index 2e8aca6..947c8fe 100644
--- a/data/data_mappings/scenario/stacktira.yaml
+++ b/data/data_mappings/scenario/stacktira.yaml
@@ -54,10 +54,7 @@ domain_name:
 deploy_control_firewall_source:
   - openstacklib::firewall::edeploy::source
   - openstacklib::firewall::puppet::source
-
-deploy_control_firewall_source:
-  - openstacklib::firewall::edeploy::source
-  - openstacklib::firewall::puppet::source
+  - openstacklib::firewall::ssh::source
 
 public_control_firewall_source:
   - openstacklib::firewall::cinder::source
@@ -74,7 +71,7 @@ private_control_firewall_source:
   - galera::firewall::source
   - openstacklib::firewall::cinder::internal_source
   - openstacklib::firewall::ceilometer::internal_source
-  - openstacklib::firewall::dashboard::internal_source
+  - openstacklib::firewall::memcached::source
   - openstacklib::firewall::glance::internal_source
   - openstacklib::firewall::heat::internal_source
   - openstacklib::firewall::keystone::internal_source
diff --git a/data/scenarios/stacktira.yaml b/data/scenarios/stacktira.yaml
index 03412ac..23c895a 100644
--- a/data/scenarios/stacktira.yaml
+++ b/data/scenarios/stacktira.yaml
@@ -46,6 +46,7 @@ roles:
       - cinder_volume
       - ceilometer_compute
       - nova_compute_ml2
+      - firewall_compute
     classes:
       - openstacklib::repo
       - openstacklib::hosts