diff --git a/azure/network.tf b/azure/network.tf
index 23e85cd3..b93cabfa 100644
--- a/azure/network.tf
+++ b/azure/network.tf
@@ -28,7 +28,7 @@ resource "azurerm_public_ip" "public_ip" {
 locals {
   fw_tags = toset([ for key, value in var.firewall_rules: value.tag ])
   fw_sets = {
-    for tags in distinct([for key, values in module.design.instances: toset(setintersection(values.tags, local.fw_tags))]):
+    for tags in distinct([for key, values in module.design.instances: toset(values.tags) if length(setintersection(values.tags, local.fw_tags)) > 0]):
       join("-", toset(tags)) => toset(tags)
       if length(tags) > 0
   }
diff --git a/common/configuration/puppet.yaml b/common/configuration/puppet.yaml
index 1f300e8c..d34a70e5 100644
--- a/common/configuration/puppet.yaml
+++ b/common/configuration/puppet.yaml
@@ -40,7 +40,7 @@ runcmd:
       # Install required packages in runcmd instead of packages to speedup configuration
       # of the admin user. This reduces the risk of Terraform timing out when trying to
       # upload the terraform_data.yaml
-      dnf -y install git pciutils unzip
+      dnf -y install git pciutils unzip rsync
       dnf -y remove cockpit\* firewalld --exclude=iptables
 %{ if ! skip_upgrade ~}
       # Upgrade all packages except Puppet if already installed