diff --git a/jjb/maven.yaml b/jjb/maven.yaml
index 8f1eded..f928067 100644
--- a/jjb/maven.yaml
+++ b/jjb/maven.yaml
@@ -52,7 +52,7 @@
       # run tests and install
       - maven-target:
           pom: pom.xml
-          settings: onoscord-apps
+          settings: cord-apps-maven-settings
           settings-type: cfp
           goals: 'clean test install'
 
@@ -102,20 +102,13 @@
           artifact-num-to-keep: '{artifact-num-to-keep}'
 
     scm:
-      - cord-infra-gerrit-scm:
+      - lf-infra-gerrit-scm:
           git-url: '$GIT_URL/$GERRIT_PROJECT'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: 'false'
           choosing-strategy: gerrit
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
-          basedir: '{project}'
-
-    wrappers:
-      - credentials-binding:
-        - file:
-            credential-id: 'gpg-creds-maven'
-            variable: 'GNUPG'
 
     builders:
       # Set JDK version
@@ -126,13 +119,9 @@
           sudo update-java-alternatives -s $jdkDistro
           echo "Java Version:"
           java -version
-          echo "Unpacking GPG Keys"
-          tar -xvf $GNUPG -C ~
 
       - maven-target:
-          pom: "{project}/pom.xml"
-          settings: onoscord-apps
+          pom: pom.xml
+          settings: cord-apps-maven-settings
           settings-type: cfp
-          global-settings: global-onos-cord-settings
-          global-settings-type: cfp
-          goals: '-Prelease clean deploy'
+          goals: 'clean deploy'