diff --git a/gocd/templates/jsonnetfile.json b/gocd/templates/jsonnetfile.json
index 736010c098..da7a921657 100644
--- a/gocd/templates/jsonnetfile.json
+++ b/gocd/templates/jsonnetfile.json
@@ -8,7 +8,7 @@
           "subdir": "libs"
         }
       },
-      "version": "v2.2.2"
+      "version": "v2.3.1"
     }
   ],
   "legacyImports": true
diff --git a/gocd/templates/jsonnetfile.lock.json b/gocd/templates/jsonnetfile.lock.json
index b477e853ec..48073b7286 100644
--- a/gocd/templates/jsonnetfile.lock.json
+++ b/gocd/templates/jsonnetfile.lock.json
@@ -8,8 +8,8 @@
           "subdir": "libs"
         }
       },
-      "version": "54bb0adceffb690bf4aa744b23acdb7888c51fd5",
-      "sum": "stYmA7r5/MARC5qkFFR+94R1W5juwjmRNVQFOTxmwVA="
+      "version": "cfd0a0c54a580e1932e14368d0c99b2b5013c434",
+      "sum": "SFeCD13Z2qQftwrjVAKE19IjjgJAk8ninSJwePKhI8A="
     }
   ],
   "legacyImports": false
diff --git a/gocd/templates/snuba.jsonnet b/gocd/templates/snuba.jsonnet
index 774fa2e45c..d51de262bb 100644
--- a/gocd/templates/snuba.jsonnet
+++ b/gocd/templates/snuba.jsonnet
@@ -15,6 +15,9 @@ local pipedream_config = {
     material_name: 'snuba_repo',
     stage: 'deploy-primary',
     elastic_profile_id: 'snuba',
+    // TODO: Remove this field once a few deploys have completed with the
+    // `pipeline-complete` stage.
+    final_stage: 'deploy-primary',
   },
 
   // Set to true to auto-deploy changes (defaults to true)