diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index f4ef061..cd17d16 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -377,9 +377,6 @@
           config-pod: 'infosys-pod'
           release: '2.4'
           branch: 'voltha-2.4'
-          num-of-openonu: '2'
-          num-of-onos: '3'
-          num-of-atomix: '3'
           test-repo: 'voltha-system-tests'
           Jenkinsfile: 'Jenkinsfile-voltha-build'
           configurePod: true
diff --git a/jjb/omec-ci.yaml b/jjb/omec-ci.yaml
index 2541963..3be724d 100644
--- a/jjb/omec-ci.yaml
+++ b/jjb/omec-ci.yaml
@@ -38,7 +38,7 @@
           project: '{name}'
           build-node: 'omec-ci'
           c3po-branch-name: 'master'
-          ngic-branch-name: 'central-cp-multi-upfs'
+          spgw-branch-name: 'master'
           nucleus-branch-name: 'master'
           upf-branch-name: 'master'
           pipeline-file: 'omec-postmerge.groovy'
@@ -609,9 +609,9 @@
           description: 'Branch name of c3po repo which we run tests against'
 
       - string:
-          name: ngicBranchName
-          default: '{ngic-branch-name}'
-          description: 'Branch name of ngic-rtc repo which we run tests against'
+          name: spgwBranchName
+          default: '{spgw-branch-name}'
+          description: 'Branch name of spgw repo which we run tests against'
 
       - string:
           name: nucleusBranchName
diff --git a/jjb/pipeline/omec-postmerge.groovy b/jjb/pipeline/omec-postmerge.groovy
index acc90c8..621e147 100644
--- a/jjb/pipeline/omec-postmerge.groovy
+++ b/jjb/pipeline/omec-postmerge.groovy
@@ -26,11 +26,15 @@
     stage('Build and Publish') {
       steps {
         script {
+          build_job_name = "docker-publish-github_$repoName"
+          if ("${repoName}" == "spgw"){
+            build_job_name = "aether-member-only-jobs/" + build_job_name
+          }
           abbreviated_commit_hash = commitHash.substring(0, 7)
           tags_to_build = [ "${branchName}-latest",
                             "${branchName}-${abbreviated_commit_hash}"]
           tags_to_build.each { tag ->
-            build job: "docker-publish-github_$repoName", parameters: [
+            build job: "${build_job_name}", parameters: [
                   string(name: 'gitUrl', value: "${repoUrl}"),
                   string(name: 'gitRef', value: "${branchName}"),
                   string(name: 'branchName', value: "${tag}"),
@@ -47,31 +51,34 @@
           hssdb_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/c3po-hssdb/tags/' | jq '.results[] | select(.name | contains("${c3poBranchName}")).name' | head -1 | tr -d \\\""""
           hss_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/c3po-hss/tags/' | jq '.results[] | select(.name | contains("${c3poBranchName}")).name' | head -1 | tr -d \\\""""
           mme_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/nucleus/tags/' | jq '.results[] | select(.name | contains("${nucleusBranchName}")).name' | head -1 | tr -d \\\""""
-          spgwc_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/ngic-cp/tags/' | jq '.results[] | select(.name | contains("${ngicBranchName}")).name' | head -1 | tr -d \\\""""
+          spgwc_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/spgw/tags/' | jq '.results[] | select(.name | contains("${spgwBranchName}")).name' | head -1 | tr -d \\\""""
           bess_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-bess/tags/' | jq '.results[] | select(.name | contains("${upfBranchName}")).name' | head -1 | tr -d \\\""""
-          cpiface_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-cpiface/tags/' | jq '.results[] | select(.name | contains("${upfBranchName}")).name' | head -1 | tr -d \\\""""
+          zmqiface_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-cpiface/tags/' | jq '.results[] | select(.name | contains("${upfBranchName}")).name' | head -1 | tr -d \\\""""
+          pfcpiface_tag = sh returnStdout: true, script: """curl -s 'https://registry.hub.docker.com/v2/repositories/omecproject/upf-epc-pfcpiface/tags/' | jq '.results[] | select(.name | contains("${upfBranchName}")).name' | head -1 | tr -d \\\""""
 
           hssdb_image = "omecproject/c3po-hssdb:"+hssdb_tag
           hss_image = "omecproject/c3po-hss:"+hss_tag
           mme_image = "omecproject/nucleus:"+mme_tag
-          spgwc_image = "omecproject/ngic-cp:"+spgwc_tag
+          spgwc_image = "omecproject/spgw:"+spgwc_tag
           bess_image = "omecproject/upf-epc-bess:"+bess_tag
-          cpiface_image = "omecproject/upf-epc-cpiface:"+cpiface_tag
+          zmqiface_image = "omecproject/upf-epc-cpiface:"+zmqiface_tag
+          pfcpiface_image = "omecproject/upf-epc-pfcpiface:"+pfcpiface_tag
 
           switch("${params.repoName}") {
           case "c3po":
             hssdb_image = "${params.registry}/c3po-hssdb:${branchName}-${abbreviated_commit_hash}"
             hss_image = "${params.registry}/c3po-hss:${branchName}-${abbreviated_commit_hash}"
             break
-          case "ngic-rtc":
-            spgwc_image = "${params.registry}/ngic-cp:${branchName}-${abbreviated_commit_hash}"
+          case "spgw":
+            spgwc_image = "${params.registry}/spgw:${branchName}-${abbreviated_commit_hash}"
             break
           case "Nucleus":
             mme_image = "${params.registry}/nucleus:${branchName}-${abbreviated_commit_hash}"
             break
           case "upf-epc":
             bess_image = "${params.registry}/upf-epc-bess:${branchName}-${abbreviated_commit_hash}"
-            cpiface_image = "${params.registry}/upf-epc-cpiface:${branchName}-${abbreviated_commit_hash}"
+            zmqiface_image = "${params.registry}/upf-epc-cpiface:${branchName}-${abbreviated_commit_hash}"
+            pfcpiface_image = "${params.registry}/upf-epc-pfcpiface:${branchName}-${abbreviated_commit_hash}"
             break
           }
           echo "Using hssdb image: ${hssdb_image}"
@@ -79,7 +86,8 @@
           echo "Using mme image: ${mme_image}"
           echo "Using spgwc image: ${spgwc_image}"
           echo "Using bess image: ${bess_image}"
-          echo "Using cpiface image: ${cpiface_image}"
+          echo "Using zmqiface image: ${zmqiface_image}"
+          echo "Using pfcpiface image: ${pfcpiface_image}"
         }
       }
     }
@@ -98,7 +106,8 @@
                   string(name: 'mmeImage', value: "${mme_image.trim()}"),
                   string(name: 'spgwcImage', value: "${spgwc_image.trim()}"),
                   string(name: 'bessImage', value: "${bess_image.trim()}"),
-                  string(name: 'cpifaceImage', value: "${cpiface_image.trim()}"),
+                  string(name: 'zmqifaceImage', value: "${zmqiface_image.trim()}"),
+                  string(name: 'pfcpifaceImage', value: "${pfcpiface_image.trim()}"),
             ]
           }
         }