diff --git a/app/workers/builds.php b/app/workers/builds.php
index cee3f8c77e..3e425c909e 100644
--- a/app/workers/builds.php
+++ b/app/workers/builds.php
@@ -98,7 +98,8 @@ class BuildsV1 extends Worker
                 'endTime' => null,
                 'duration' => 0
             ]));
-            $deployment->setAttribute('buildId', $buildId);
+            $deployment->setAttribute('buildId', $build->getId());
+            $deployment->setAttribute('buildInternalId', $build->getInternalId());
             $deployment = $dbForProject->updateDocument('deployments', $deployment->getId(), $deployment);
         } else {
             $build = $dbForProject->getDocument('builds', $buildId);
@@ -234,6 +235,7 @@ class BuildsV1 extends Worker
                 $usage = new Stats($statsd);
                 $usage
                     ->setParam('projectId', $project->getId())
+                    ->setParam('projectInternalId', $project->getInternalId())
                     ->setParam('functionId', $function->getId())
                     ->setParam('builds.{scope}.compute', 1)
                     ->setParam('buildStatus', $build->getAttribute('status', ''))
diff --git a/tests/unit/Docker/EnvTest.php b/tests/unit/Docker/EnvTest.php
index 6730491438..e6c9b8cadf 100644
--- a/tests/unit/Docker/EnvTest.php
+++ b/tests/unit/Docker/EnvTest.php
@@ -37,6 +37,7 @@ class EnvTest extends TestCase
         $this->assertEquals("_APP_X=value1
 _APP_Y=value2
 _APP_Z=value3
+_APP_W=value5=
 ", $this->object->export());
     }
 }