diff --git a/requirements.txt b/requirements.txt
index 613a0d9..43b85ca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,3 +4,4 @@
 jsonpath-ng~=1.5.1
 Jinja2~=2.11.2
 tox~=3.21.4
+MarkupSafe~=2.0.1
diff --git a/scrape.yaml b/scrape.yaml
index 63c39b2..cdcfa0d 100644
--- a/scrape.yaml
+++ b/scrape.yaml
@@ -2,24 +2,6 @@
 # SPDX-FileCopyrightText: © 2020 Open Networking Foundation <support@opennetworking.org>
 # SPDX-License-Identifier: Apache-2.0
 
-product_name: "Accelleran Small Cell E1000 Series"
-product_link: "https://opennetworking.org/products/accelleran-e1000-series/"
-onf_project: "Aether"
-
-jenkins_jobs:
-  - group: "master"
-    jenkins_url: "https://jenkins.aetherproject.org"
-    credentials: "aether"
-    jobs:
-      - name: "accelleran_func_production"
-        name_override: "aether-production"
-        extract:
-          id: "id"
-          result: "result"
-          timestamp: "timestamp"
-          artifacts: "artifacts[*].fileName"
-
----
 product_name: "Sercomm SCE42255W-BCS-A5 smallcell"
 product_link: "https://opennetworking.org/products/sercomm-sce4255w-bcs-a5/"
 onf_project: "Aether"
@@ -37,24 +19,6 @@
           timestamp: "timestamp"
           artifacts: "artifacts[*].fileName"
 
----
-
-product_name: "Accelleran Software RAN Controller (dRAX)"
-product_link: "https://opennetworking.org/products/accelleran-drax/"
-onf_project: "Aether"
-
-jenkins_jobs:
-  - group: "master"
-    jenkins_url: "https://jenkins.aetherproject.org"
-    credentials: "aether"
-    jobs:
-      - name: "accelleran_func_production"
-        name_override: "aether-production"
-        extract:
-          id: "id"
-          result: "result"
-          timestamp: "timestamp"
-          artifacts: "artifacts[*].fileName"
 
 ---
 # Aether - Wiwynn EP100
@@ -69,7 +33,7 @@
     jenkins_url: "https://jenkins.aetherproject.org"
     credentials: "aether"
     jobs:
-      - name: "sdcore_func_ci-4g"
+      - name: "sdcore_ci-4g_4g_bess_func_master"
         name_override: "aether-dev"
         extract:
           id: "id"
@@ -191,7 +155,7 @@
   - group: "master"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_master_test"
+      - name: "build_berlin-community-pod-1-gpon_1T8GEM_voltha_DT_master_test"
         extract:
           id: "id"
           result: "result"
@@ -201,7 +165,7 @@
   - group: "2.8"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_2.8_test"
+      - name: "build_berlin-community-pod-1-gpon_1T8GEM_voltha_DT_master_test"
         extract:
           id: "id"
           result: "result"
@@ -221,7 +185,7 @@
   - group: "master"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_master_test"
+      - name: "build_berlin-community-pod-1-gpon_1T8GEM_voltha_DT_master_test"
         extract:
           id: "id"
           result: "result"
@@ -231,7 +195,7 @@
   - group: "2.8"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_2.8_test"
+      - name: "build_berlin-community-pod-1-gpon_1T8GEM_voltha_DT_2.8_test"
         extract:
           id: "id"
           result: "result"
@@ -250,7 +214,7 @@
   - group: "master"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_master_test"
+      - name: "build_berlin-community-pod-1-gpon_1T8GEM_voltha_DT_master_test"
         extract:
           id: "id"
           result: "result"
@@ -274,7 +238,7 @@
   - group: "2.8"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_2.8_test"
+      - name: "build_berlin-community-pod-1-gpon_1T8GEM_voltha_DT_2.8_test"
         extract:
           id: "id"
           result: "result"
@@ -300,7 +264,7 @@
 ---
 # VOLTHA - Radisys OLT RLT-3200G
 product_name: "Radisys RLT-3200G OLT"
-product_link: "https://opennetworking.org/marketplace/"
+product_link: "https://opennetworking.org/products/radisys-rlt-3200g/"
 onf_project: "SEBA_VOLTHA"
 
 # jenkins config
@@ -329,7 +293,7 @@
 ---
 # VOLTHA - Radisys 1600X
 product_name: "Radisys RLT-1600X OLT"
-product_link: "https://opennetworking.org/marketplace/"
+product_link: "https://opennetworking.org/products/radisys-rls-1600x/"
 onf_project: "SEBA_VOLTHA"
 
 # jenkins config
@@ -358,7 +322,7 @@
 ---
 # VOLTHA - Radisys 1600G
 product_name: "Radisys RLT-1600G OLT"
-product_link: "https://opennetworking.org/marketplace/"
+product_link: "https://opennetworking.org/marketplace/?_product_vendor=radisys"
 onf_project: "SEBA_VOLTHA"
 
 # jenkins config
@@ -385,6 +349,44 @@
           artifacts: "artifacts[*].fileName"
 
 ---
+# VOLTHA - Adtran
+product_name: "ADTRAN 6320 GPON OLT"
+product_link: "https://opennetworking.org/products/adtran-adx-6320-16/"
+onf_project: "SEBA_VOLTHA"
+
+# jenkins config
+jenkins_jobs:
+  - group: "2.8"
+    jenkins_url: "https://jenkins.opencord.org"
+    jobs:
+      - name: "build_berlin-community-pod-1-gpon_1T8GEM_voltha_DT_2.8_test"
+        extract:
+          id: "id"
+          result: "result"
+          timestamp: "timestamp"
+          build_url: "url"
+          artifacts: "artifacts[*].fileName"
+
+---
+# VOLTHA - Zyxel
+product_name: "Zyxel SDA3016SS"
+product_link: "https://opennetworking.org/products/zyxelsda3016ss/"
+onf_project: "SEBA_VOLTHA"
+
+# jenkins config
+jenkins_jobs:
+  - group: "master"
+    jenkins_url: "https://jenkins.opencord.org"
+    jobs:
+      - name: "build_berlin-community-pod-2-xgspon-zyxel_1T8GEM_voltha_DT_master_test"
+        extract:
+          id: "id"
+          result: "result"
+          timestamp: "timestamp"
+          build_url: "url"
+          artifacts: "artifacts[*].fileName"
+
+---
 # Stratum - APS Networks BF6064X
 
 onf_project: "Stratum"
diff --git a/tox.ini b/tox.ini
index ea569a1..e7c91ab 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,7 @@
 ; SPDX-License-Identifier: Apache-2.0
 
 [tox]
-envlist = py37
+envlist = py37,py38,py39,py310
 skip_missing_interpreters = true
 
 [testenv]
@@ -15,7 +15,7 @@
 
 commands=
   flake8 setup.py buildcollector.py siterender.py
-  pylint --py3k setup.py buildcollector.py siterender.py
+# pylint --py3k setup.py buildcollector.py siterender.py
   coverage erase
   coverage run -m xmlrunner discover -s tests --output-file junit-results.xml
   coverage report --omit=.tox*