diff --git a/config/software/registry.rb b/config/software/registry.rb
index a0acf8afc4d9681eb24c65382ca22c0aced9a695_Y29uZmlnL3NvZnR3YXJlL3JlZ2lzdHJ5LnJi..cc5f2bb64919a7beee442521239e1fae07ab786a_Y29uZmlnL3NvZnR3YXJlL3JlZ2lzdHJ5LnJi 100644
--- a/config/software/registry.rb
+++ b/config/software/registry.rb
@@ -33,8 +33,10 @@
 build do
   env = {
     'GOPATH' => "#{Omnibus::Config.source_dir}/registry",
-    'GO15VENDOREXPERIMENT' => '1' # Build machines have go 1.5.x, use vendor directory
+    'GO15VENDOREXPERIMENT' => '1', # Build machines have go 1.5.x, use vendor directory
+    'PREFIX' => "#{install_dir}/embedded",
+    'DOCKER_BUILDTAGS' => 'include_gcs'
   }
   registry_source_dir = "#{Omnibus::Config.source_dir}/registry"
   cwd = "#{registry_source_dir}/src/github.com/docker/distribution"
 
@@ -37,7 +39,7 @@
   }
   registry_source_dir = "#{Omnibus::Config.source_dir}/registry"
   cwd = "#{registry_source_dir}/src/github.com/docker/distribution"
 
-  make "build PREFIX=#{install_dir}/embedded", env: env, cwd: cwd
-  make "binaries PREFIX=#{install_dir}/embedded", env: env, cwd: cwd
+  make "build", env: env, cwd: cwd
+  make "binaries", env: env, cwd: cwd
 end