diff --git a/jjb/shell/docker-login.sh b/jjb/shell/docker-login.sh
index 41344c9..444bf61 100644
--- a/jjb/shell/docker-login.sh
+++ b/jjb/shell/docker-login.sh
@@ -30,3 +30,9 @@
       echo "Docker login: registry.aetherproject.org"
       docker login registry.aetherproject.org --username "${AETHER_REGISTRY_USERNAME}" --password "${AETHER_REGISTRY_PASSWORD}"
 fi
+
+if [ -n "${ONF_REGISTRY_USERNAME}" ]
+then
+      echo "Docker login: registry.opennetworking.org"
+      docker login registry.opennetworking.org --username "${ONF_REGISTRY_USERNAME}" --password "${ONF_REGISTRY_PASSWORD}"
+fi
diff --git a/jjb/templates/fabric-tna-jobs.yaml b/jjb/templates/fabric-tna-jobs.yaml
index 2b41e96..3ce3c71 100644
--- a/jjb/templates/fabric-tna-jobs.yaml
+++ b/jjb/templates/fabric-tna-jobs.yaml
@@ -56,6 +56,11 @@
               username: AETHER_REGISTRY_USERNAME
               password: AETHER_REGISTRY_PASSWORD
       - credentials-binding:
+          - username-password-separated:
+              credential-id: onf-internal-registry
+              username: ONF_REGISTRY_USERNAME
+              password: ONF_REGISTRY_PASSWORD
+      - credentials-binding:
           - text:
               credential-id: codecov-fabric-tna
               variable: CODECOV_TOKEN
@@ -129,6 +134,11 @@
               username: AETHER_REGISTRY_USERNAME
               password: AETHER_REGISTRY_PASSWORD
       - credentials-binding:
+          - username-password-separated:
+              credential-id: onf-internal-registry
+              username: ONF_REGISTRY_USERNAME
+              password: ONF_REGISTRY_PASSWORD
+      - credentials-binding:
           - text:
               credential-id: codecov-fabric-tna
               variable: CODECOV_TOKEN