diff --git a/doc/source/launchers.rst b/doc/source/launchers.rst
index eb8cd10efc..70b1455279 100644
--- a/doc/source/launchers.rst
+++ b/doc/source/launchers.rst
@@ -70,11 +70,17 @@ with the type **String Parameter**:
 **ZUUL_COMMIT**
   The commit SHA1 at the head of ZUUL_REF
 
-Those are the only required parameters.  The UUID is needed for Zuul
-to keep track of the build, and the REF and COMMIT parameters are for
-use in preparing the git repo for the build.  The following parameters
-will be sent for all builds, but are not required so you do not need
-to configure Jenkins to accept them if you do not plan on using them:
+Those are the only required parameters.  The ZUUL_UUID is needed for Zuul to
+keep track of the build, and the ZUUL_REF and ZUUL_COMMIT parameters are for
+use in preparing the git repo for the build.
+
+.. note::
+    The GERRIT_PROJECT and UUID parameters are deprecated respectively in
+    favor of ZUUL_PROJECT and ZUUL_UUID.
+
+The following parameters will be sent for all builds, but are not required so
+you do not need to configure Jenkins to accept them if you do not plan on using
+them:
 
 **ZUUL_PROJECT**
   The project that triggered this build
diff --git a/zuul/launcher/jenkins.py b/zuul/launcher/jenkins.py
index 31a548e5fd..8feea0217e 100644
--- a/zuul/launcher/jenkins.py
+++ b/zuul/launcher/jenkins.py
@@ -80,7 +80,8 @@ class JenkinsCallback(threading.Thread):
                 number = build.get('number')
                 params = build.get('parameters')
                 if params:
-                    uuid = params.get('UUID')
+                    # UUID is deprecated in favor of ZUUL_UUID
+                    uuid = params.get('ZUUL_UUID') or params.get('UUID')
                     if (status and url and uuid and phase and
                         phase == 'COMPLETED'):
                         self.jenkins.onBuildCompleted(uuid,
@@ -331,8 +332,9 @@ class Jenkins(object):
                     continue
                 parameters = action['parameters']
                 for param in parameters:
-                    if (param['name'] == 'UUID' and
-                        build.uuid == param['value']):
+                    # UUID is deprecated in favor of ZUUL_UUID
+                    if ((param['name'] in ['ZUUL_UUID', 'UUID'])
+                        and build.uuid == param['value']):
                         return item
         return False