-RELEASE_REPOSITORY="nexus3.openecomp.org:10002"
-SNAPSHOT_REPOSITORY="nexus3.openecomp.org:10003"
-STAGING_IMAGE="openecomp/$PROJECT:$VERSION-STAGING-$TIMESTAMP"
-RELEASE_IMAGE="openecomp/$PROJECT:$VERSION"
+RELEASE_REPOSITORY="nexus3.onap.org:10002"
+SNAPSHOT_REPOSITORY="nexus3.onap.org:10003"
+STAGING_IMAGE="openecomp/$PROJECT:$X.$Y-STAGING-latest"
+RELEASE_IMAGE="openecomp/$PROJECT:$X.$Y.$Z"