diff --git a/Makefile b/Makefile
index c2c756a..2edb1a2 100644
--- a/Makefile
+++ b/Makefile
@@ -25,13 +25,20 @@
 
 # build targets
 
+products:
+	mkdir products
+
+site:
+	mkdir site
+
+
 build: buildcollector siterender ## Collect build info and create website
 
-buildcollector: $(VENV_NAME) ## Collect build information from Jenkins jobs
+buildcollector: $(VENV_NAME) products ## Collect build information from Jenkins jobs
 	source ./$</bin/activate ; set -u ;\
 	$(PYTHON) buildcollector.py scrape.yaml --credentials credentials.yaml $(COMMON_ARGS)
 
-siterender: $(VENV_NAME) ## Create static website from build information
+siterender: $(VENV_NAME) site ## Create static website from build information
 	source ./$</bin/activate ; set -u ;\
 	$(PYTHON) siterender.py $(COMMON_ARGS)
 	cp -r static/* site/
@@ -62,13 +69,13 @@
 	reuse --root . lint
 
 clean: ## Delete all temporary files
-	rm -rf products/* site/*
+	rm -rf products site
 
 clean-all: clean ## Delete virtualenv and all cached job information
-	rm -rf $(VENV_NAME) jobs/* .tox
+	rm -rf $(VENV_NAME) jobs .tox
 
 help: ## Print help for each target
-	@echo nginx test targets
+	@echo sjsg test targets
 	@echo
 	@grep '^[[:alnum:]_-]*:.* ##' $(MAKEFILE_LIST) \
     | sort | awk 'BEGIN {FS=":.* ## "}; {printf "%-25s %s\n", $$1, $$2};'
diff --git a/scrape.yaml b/scrape.yaml
index 857dd07..979403a 100644
--- a/scrape.yaml
+++ b/scrape.yaml
@@ -66,10 +66,10 @@
           timestamp: "timestamp"
           build_url: "url"
           artifacts: "artifacts[*].fileName"
-  - group: "2.5 - DT workflow"
+  - group: "2.6 - DT workflow"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_onf-demo-pod_1T8GEM_voltha_DT_2.5_test"
+      - name: "build_onf-demo-pod_1T8GEM_voltha_DT_2.6_test"
         extract:
           id: "id"
           result: "result"
@@ -88,10 +88,10 @@
           build_url: "url"
           artifacts: "artifacts[*].fileName"
 
-  - group: "2.5 - AT&T workflow"
+  - group: "2.6 - AT&T workflow"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_flex-ocp-cord_1T4GEM_voltha_2.5_test"
+      - name: "build_flex-ocp-cord_1T4GEM_voltha_2.6_test"
         extract:
           id: "id"
           result: "result"
@@ -116,10 +116,10 @@
           timestamp: "timestamp"
           build_url: "url"
           artifacts: "artifacts[*].fileName"
-  - group: "2.5 - DT workflow"
+  - group: "2.6 - DT workflow"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_onf-demo-pod_1T8GEM_voltha_DT_2.5_test"
+      - name: "build_onf-demo-pod_1T8GEM_voltha_DT_2.6_test"
         extract:
           id: "id"
           result: "result"
@@ -138,10 +138,10 @@
           build_url: "url"
           artifacts: "artifacts[*].fileName"
 
-  - group: "2.5 - AT&T workflow"
+  - group: "2.6 - AT&T workflow"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_flex-ocp-cord_1T4GEM_voltha_2.5_test"
+      - name: "build_flex-ocp-cord_1T4GEM_voltha_2.6_test"
         extract:
           id: "id"
           result: "result"
@@ -168,10 +168,10 @@
           timestamp: "timestamp"
           build_url: "url"
           artifacts: "artifacts[*].fileName"
-  - group: "2.5"
+  - group: "2.6"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_2.5_test"
+      - name: "build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_2.6_test"
         extract:
           id: "id"
           result: "result"
@@ -198,10 +198,10 @@
           timestamp: "timestamp"
           build_url: "url"
           artifacts: "artifacts[*].fileName"
-  - group: "2.5"
+  - group: "2.6"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_2.5_test"
+      - name: "build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_2.6_test"
         extract:
           id: "id"
           result: "result"
@@ -227,10 +227,10 @@
           timestamp: "timestamp"
           build_url: "url"
           artifacts: "artifacts[*].fileName"
-  - group: "2.5"
+  - group: "2.6"
     jenkins_url: "https://jenkins.opencord.org"
     jobs:
-      - name: "build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_2.5_test"
+      - name: "build_dt-berlin-pod-gpon_1T8GEM_voltha_DT_2.6_test"
         extract:
           id: "id"
           result: "result"
@@ -249,7 +249,7 @@
   - group: "master"
     jenkins_url: "https://jenkins.stratumproject.org"
     jobs:
-      - name: "stratum-bf-test-master"
+      - name: "stratum-bf-test"
         extract:
           id: "id"
           result: "result"
@@ -270,7 +270,7 @@
   - group: "master"
     jenkins_url: "https://jenkins.stratumproject.org"
     jobs:
-      - name: "stratum-bf-test-master"
+      - name: "stratum-bf-test"
         extract:
           id: "id"
           result: "result"
@@ -291,7 +291,7 @@
   - group: "master"
     jenkins_url: "https://jenkins.stratumproject.org"
     jobs:
-      - name: "stratum-bf-test-master"
+      - name: "stratum-bf-test"
         extract:
           id: "id"
           result: "result"
@@ -312,7 +312,7 @@
   - group: "master"
     jenkins_url: "https://jenkins.stratumproject.org"
     jobs:
-      - name: "stratum-bf-test-master"
+      - name: "stratum-bf-test"
         extract:
           id: "id"
           result: "result"
@@ -333,7 +333,7 @@
   - group: "master"
     jenkins_url: "https://jenkins.stratumproject.org"
     jobs:
-      - name: "stratum-bcm-test-master"
+      - name: "stratum-bcm-test"
         extract:
           id: "id"
           result: "result"
@@ -354,7 +354,7 @@
   - group: "master"
     jenkins_url: "https://jenkins.stratumproject.org"
     jobs:
-      - name: "stratum-bcm-test-master"
+      - name: "stratum-bcm-test"
         extract:
           id: "id"
           result: "result"