diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c0bd6f8..d74b6b6 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -49,7 +49,6 @@ jobs:
         set:
           - "centos-7"
           - "debian-9"
-          - "ubuntu-1604"
           - "ubuntu-1804"
         puppet:
           - "puppet6"
diff --git a/.sync.yml b/.sync.yml
index fe21fe3..4542e65 100644
--- a/.sync.yml
+++ b/.sync.yml
@@ -3,9 +3,8 @@
   acceptance_matrix:
     set:
       - centos-7
-      - ---centos-8
+      - ---rocky-8
       - debian-9
-      - ubuntu-1604
       - ubuntu-1804
 .gitlab-ci.yml:
   delete: true
@@ -15,7 +14,7 @@ Gemfile:
   required:
     ':development':
       - gem: rspec-json_expectations
-spec/acceptance/nodesets/centos-8.yml:
+spec/acceptance/nodesets/rocky-8.yml:
   delete: true
 spec/acceptance/nodesets/debian-10.yml:
   delete: true
diff --git a/metadata.json b/metadata.json
index 8f3a81e..f7a8603 100644
--- a/metadata.json
+++ b/metadata.json
@@ -61,7 +61,6 @@
     {
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
-        "16.04",
         "18.04"
       ]
     }
@@ -72,7 +71,7 @@
       "version_requirement": ">= 6.0.0 < 8.0.0"
     }
   ],
-  "pdk-version": "1.17.0",
+  "pdk-version": "2.1.0",
   "template-url": "https://github.com/treydock/pdk-templates.git#master",
-  "template-ref": "heads/master-0-g1d2967a"
+  "template-ref": "heads/master-0-g089be8b"
 }
diff --git a/spec/acceptance/nodesets/ubuntu-1604.yml b/spec/acceptance/nodesets/ubuntu-1604.yml
deleted file mode 100644
index e5181fe..0000000
--- a/spec/acceptance/nodesets/ubuntu-1604.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-HOSTS:
-  ubuntu1604:
-    roles:
-      - agent
-    platform: ubuntu-16.04-amd64
-    hypervisor : docker
-    image: ubuntu:16.04
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      - 'apt-get install -y wget net-tools locales apt-transport-https ca-certificates'
-      - 'locale-gen en_US.UTF-8'
-    docker_env:
-      - LANG=en_US.UTF-8
-      - LANGUAGE=en_US.UTF-8
-      - LC_ALL=en_US.UTF-8
-    docker_container_name: 'perfsonar-ubuntu1604'
-CONFIG:
-  log_level: debug
-  type: foss
-ssh:
-  password: root
-  auth_methods: ["password"]
-
diff --git a/spec/acceptance/nodesets/ubuntu-1804.yml b/spec/acceptance/nodesets/ubuntu-1804.yml
index bade857..ba61c72 100644
--- a/spec/acceptance/nodesets/ubuntu-1804.yml
+++ b/spec/acceptance/nodesets/ubuntu-1804.yml
@@ -9,7 +9,7 @@ HOSTS:
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
       - "rm -f /etc/dpkg/dpkg.cfg.d/excludes"
-      - 'apt-get install -y wget net-tools locales apt-transport-https ca-certificates'
+      - 'apt-get install -y wget net-tools iproute2 locales apt-transport-https ca-certificates'
       - 'locale-gen en_US.UTF-8'
     docker_env:
       - LANG=en_US.UTF-8