diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index d4256df..b867c9b 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -45,6 +45,9 @@
     # - Auth ID for GitHub account "onf-bot" (via Personal Access Token)
     github-pr-auth-id-onf-bot: '3a50653e-c14e-4a15-bfbc-206c6a4eccac'
 
+    # SSH credentials for OMEC project Github account
+    github-omec-project-ssh-credential: 'github-omec-project-ssh-key'
+
     # Java glob of artifacts to archive
     archive-artifacts: ''
 
@@ -108,9 +111,6 @@
     # ONF docker credentials for onfbuilder user
     docker-credentials-id: 'docker-artifact-push-credentials'
 
-    # OMECProject api token
-    omec-project-api: '64fe2b1a-b33a-4f13-8442-ad8360434003'
-
     # maintainers
     # Used to notify users in supported tests
     maintainers: 'zdw@opennetworking.org'
diff --git a/jjb/pipeline/docker-publish.groovy b/jjb/pipeline/docker-publish.groovy
index 9ec89e3..8b38bd4 100644
--- a/jjb/pipeline/docker-publish.groovy
+++ b/jjb/pipeline/docker-publish.groovy
@@ -43,8 +43,7 @@
     stage('build'){
       steps {
         script {
-          withCredentials([string(credentialsId: 'onos-builder', variable: 'ONOS_BUILDER_API')]) {
-            withCredentials([string(credentialsId: '64fe2b1a-b33a-4f13-8442-ad8360434003', variable: 'OMECPROJECT_API')]) {
+          sshagent(credentials: ['github-onf-bot-ssh-key', 'github-omec-project-ssh-key']) {
               withDockerRegistry([credentialsId: 'docker-artifact-push-credentials']) {
                 sh( script: """
                   #!/usr/bin/env bash
diff --git a/jjb/templates/private-make-test.yaml b/jjb/templates/private-make-test.yaml
index f716bb8..c98397a 100644
--- a/jjb/templates/private-make-test.yaml
+++ b/jjb/templates/private-make-test.yaml
@@ -25,20 +25,18 @@
           artifact-num-to-keep: '{artifact-num-to-keep}'
 
     wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
       - credentials-binding:
           - username-password-separated:
               credential-id: docker-artifact-push-credentials
               username: DOCKERHUB_USERNAME
               password: DOCKERHUB_PASSWORD
-          - text:
-              credential-id: 64fe2b1a-b33a-4f13-8442-ad8360434003
-              variable: OMECPROJECT_API
-          - text:
-              credential-id: onos-builder
-              variable: ONOS_BUILDER_API
+      - lf-infra-wrappers-common:
+          build-timeout: "{build-timeout}"
+      - ssh-agent-credentials:
+          users:
+            - '{jenkins-ssh-credential}'
+            - '{github-onf-bot-ssh-credential}'
+            - '{github-omec-project-ssh-credential}'
 
     scm:
       - onf-infra-gerrit-scm: