diff --git a/makefiles/release/targets.mk b/makefiles/release/targets.mk
index a984051..44aaac7 100644
--- a/makefiles/release/targets.mk
+++ b/makefiles/release/targets.mk
@@ -32,6 +32,8 @@
 # fatal to make help
 voltha-version ?= $(error $(MAKE) voltha-verison=voltha-x.yy is required)\
 
+last-release  := voltha-2.11
+
 ## Known releases
 versions += master
 versions += voltha-2.12
@@ -48,6 +50,7 @@
 ## Intent: Create branch driven pipeline test jobs.
 ## ---------------------------------------------------------------------------
 ## Build these deps to create a new release area
+create-jobs-release += create-jobs-release-certification
 create-jobs-release += create-jobs-release-nightly
 create-jobs-release += create-jobs-release-units
 
@@ -77,17 +80,16 @@
 ## ---------------------------------------------------------------------------
 ## NOTE: WIP - nightly jobs have not yet migrated from the mega job config file
 ## ---------------------------------------------------------------------------
-replace-ver  := voltha-2.11
 nightly-dir  := $(release-mk-top)/jjb/voltha-test/voltha-nightly-jobs
 nightly-yaml := $(nightly-dir)/$(voltha-version).yaml
-nightly-tmpl := $(nightly-dir)/$(replace-ver).yaml
+nightly-tmpl := $(nightly-dir)/$(last-release).yaml
 
 create-jobs-release-nightly : $(nightly-yaml)
 $(nightly-yaml) : $(nightly-tmpl)
 
 	@echo
 	@echo "** Create branch driven pipeline: nightly tests"
-	sed -e 's/$(replace-ver)/$(voltha-version)/g' $< > $@
+	sed -e 's/$(last-release)/$(voltha-version)/g' $< > $@
 	$(HIDE)/bin/ls -l $(dir $@)
 
 ## ---------------------------------------------------------------------------
@@ -99,8 +101,36 @@
 
 ## ---------------------------------------------------------------------------
 ## Intent: Create branch driven nightly test jobs.
+##   o Clone config for the last nightly release
+##   o In-place edit to the latest version.
+## ---------------------------------------------------------------------------
+## NOTE: WIP - nightly jobs have not yet migrated from the mega job config file
+## ---------------------------------------------------------------------------
+certification-dir  := $(release-mk-top)/jjb/voltha-test/voltha-certification
+certification-yaml := $(certification-dir)/$(voltha-version).yaml
+certification-tmpl := $(certification-dir)/$(last-release).yaml
+
+create-jobs-release-certification : $(certification-yaml)
+$(certification-yaml) : $(certification-tmpl)
+
+	@echo
+	@echo "** Create branch driven pipeline: nightly tests"
+	sed -e 's/$(last-release)/$(voltha-version)/g' $< > $@
+	$(HIDE)/bin/ls -l $(dir $@)
+
+## ---------------------------------------------------------------------------
+## Intent: Create branch driven nightly test jobs.
+## ---------------------------------------------------------------------------
+$(certification-tmpl):
+	@echo "ERROR: Yaml template branch does not exist: $@"
+	@echo 1
+
+
+## ---------------------------------------------------------------------------
+## Intent: Create branch driven nightly test jobs.
 ## ---------------------------------------------------------------------------
 sterile-create-jobs-release :
+	$(RM) $(certification-yaml)
 	$(RM) $(nightly-yaml)
 	$(RM) -r $(units-yaml)