diff --git a/.fixtures.yml b/.fixtures.yml
index c289e9b..88b650f 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,23 +1,10 @@
-# This file can be used to install module dependencies for unit testing
-# See https://github.com/puppetlabs/puppetlabs_spec_helper#using-fixtures for details
-
 ---
 fixtures:
   forge_modules:
-    stdlib:
-      repo: puppetlabs/stdlib
-    apt:
-      repo: puppetlabs/apt
-    yumrepo_core:
-      repo: puppetlabs/yumrepo_core
-    firewall:
-      repo: puppetlabs/firewall
-      ref: '6.0.0'
-    epel:
-      repo: puppet/epel
-    augeasproviders_apache:
-      repo: puppet/augeasproviders_apache
-    httpauth:
-      repo: jamtur01/httpauth
-  symlinks:
-    perfsonar: "#{source_dir}"
+    apt: puppetlabs/apt
+    augeasproviders_apache: puppet/augeasproviders_apache
+    epel: puppet/epel
+    firewall: puppetlabs/firewall
+    httpauth: jamtur01/httpauth
+    stdlib: puppetlabs/stdlib
+    yumrepo_core: puppetlabs/yumrepo_core
diff --git a/data/common.yaml b/data/common.yaml
deleted file mode 100644
index ed97d53..0000000
--- a/data/common.yaml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/manifests/firewall.pp b/manifests/firewall.pp
index b308829..75c5611 100644
--- a/manifests/firewall.pp
+++ b/manifests/firewall.pp
@@ -44,10 +44,10 @@
     $_i = sprintf('%05d', $index)
     $rule['proto'].each |String $proto| {
       firewall { "${_i} ${rule['name']} ${proto} ipv4":
-        proto  => $proto,
-        dport  => $rule['dport'],
-        chain  => 'perfSONAR',
-        action => 'accept',
+        proto => $proto,
+        dport => $rule['dport'],
+        chain => 'perfSONAR',
+        jump  => 'accept',
       }
     }
   }
@@ -56,7 +56,7 @@
     firewall { '100 forward to perfSONAR ipv6':
       chain    => 'INPUT',
       jump     => 'perfSONAR',
-      provider => 'ip6tables',
+      protocol => 'IPv6',
     }
 
     firewallchain { 'perfSONAR:filter:IPv6':
@@ -71,8 +71,8 @@
           proto    => $proto,
           dport    => $rule['dport'],
           chain    => 'perfSONAR',
-          action   => 'accept',
-          provider => 'ip6tables',
+          jump     => 'accept',
+          protocol => 'IPv6',
         }
       }
     }
diff --git a/metadata.json b/metadata.json
index da3d63b..a7f730f 100644
--- a/metadata.json
+++ b/metadata.json
@@ -22,7 +22,7 @@
     },
     {
       "name": "puppetlabs/firewall",
-      "version_requirement": ">= 1.0.0 <7.0.0"
+      "version_requirement": ">= 7.0.0 <9.0.0"
     },
     {
       "name": "puppet/epel",