diff --git a/Dockerfile b/Dockerfile
index 9d47d6f8..23b714e4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ WORKDIR /src
 
 FROM gobase AS buildx-version
 RUN --mount=target=. \
-  PKG=github.com/tonistiigi/buildx VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags) REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi); \
+  PKG=github.com/docker/buildx VERSION=$(git describe --match 'v[0-9]*' --dirty='.m' --always --tags) REVISION=$(git rev-parse HEAD)$(if ! git diff --no-ext-diff --quiet --exit-code; then echo .m; fi); \
   echo "-X ${PKG}/version.Version=${VERSION} -X ${PKG}/version.Revision=${REVISION} -X ${PKG}/version.Package=${PKG}" | tee /tmp/.ldflags; \
   echo -n "${VERSION}" | tee /tmp/.version;
 
diff --git a/README.md b/README.md
index 2bc4d166..e90b7274 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ https://download.docker.com/mac/static/nightly/
 
 ### Binary release
 
-Download the latest binary release from https://github.com/tonistiigi/buildx/releases/latest and copy it to `~/.docker/cli-plugins` folder with name `docker-buildx`.
+Download the latest binary release from https://github.com/docker/buildx/releases/latest and copy it to `~/.docker/cli-plugins` folder with name `docker-buildx`.
 
 
 After installing you can run `docker buildx` to see the new commands.
@@ -64,7 +64,7 @@ After installing you can run `docker buildx` to see the new commands.
 
 ### with Docker 18.09+
 ```
-$ git clone git://github.com/tonistiigi/buildx && cd buildx
+$ git clone git://github.com/docker/buildx && cd buildx
 $ make install
 ```
 
@@ -72,7 +72,7 @@ $ make install
 ```
 $ export DOCKER_BUILDKIT=1
 $ # choose a platform that matches your architecture
-$ docker build --target=binaries --platform=[darwin,windows,linux,linux/arm64] -o . git://github.com/tonistiigi/buildx
+$ docker build --target=binaries --platform=[darwin,windows,linux,linux/arm64] -o . git://github.com/docker/buildx
 $ mv buildx ~/.docker/cli-plugins/docker-buildx
 ```
 
diff --git a/bake/bake.go b/bake/bake.go
index 3cb886a1..632fa068 100644
--- a/bake/bake.go
+++ b/bake/bake.go
@@ -5,10 +5,10 @@ import (
 	"io/ioutil"
 	"strings"
 
+	"github.com/docker/buildx/build"
+	"github.com/docker/buildx/util/platformutil"
 	"github.com/moby/buildkit/session/auth/authprovider"
 	"github.com/pkg/errors"
-	"github.com/tonistiigi/buildx/build"
-	"github.com/tonistiigi/buildx/util/platformutil"
 )
 
 func ReadTargets(ctx context.Context, files, targets, overrides []string) (map[string]Target, error) {
diff --git a/build/build.go b/build/build.go
index 83a76603..e81e5a91 100644
--- a/build/build.go
+++ b/build/build.go
@@ -14,6 +14,9 @@ import (
 
 	"github.com/containerd/containerd/images"
 	"github.com/containerd/containerd/platforms"
+	"github.com/docker/buildx/driver"
+	"github.com/docker/buildx/util/imagetools"
+	"github.com/docker/buildx/util/progress"
 	clitypes "github.com/docker/cli/cli/config/types"
 	"github.com/docker/distribution/reference"
 	dockerclient "github.com/docker/docker/client"
@@ -25,9 +28,6 @@ import (
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
-	"github.com/tonistiigi/buildx/driver"
-	"github.com/tonistiigi/buildx/util/imagetools"
-	"github.com/tonistiigi/buildx/util/progress"
 	"golang.org/x/sync/errgroup"
 )
 
diff --git a/cmd/buildx/main.go b/cmd/buildx/main.go
index 59db8655..eec91019 100644
--- a/cmd/buildx/main.go
+++ b/cmd/buildx/main.go
@@ -4,16 +4,16 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/docker/buildx/commands"
+	"github.com/docker/buildx/version"
 	"github.com/docker/cli/cli-plugins/manager"
 	"github.com/docker/cli/cli-plugins/plugin"
 	"github.com/docker/cli/cli/command"
 	cliflags "github.com/docker/cli/cli/flags"
 	"github.com/spf13/cobra"
-	"github.com/tonistiigi/buildx/commands"
-	"github.com/tonistiigi/buildx/version"
 
-	_ "github.com/tonistiigi/buildx/driver/docker"
-	_ "github.com/tonistiigi/buildx/driver/docker-container"
+	_ "github.com/docker/buildx/driver/docker"
+	_ "github.com/docker/buildx/driver/docker-container"
 )
 
 func main() {
diff --git a/commands/bake.go b/commands/bake.go
index 666cbced..c87ce2dd 100644
--- a/commands/bake.go
+++ b/commands/bake.go
@@ -5,11 +5,11 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/docker/buildx/bake"
 	"github.com/docker/cli/cli/command"
 	"github.com/moby/buildkit/util/appcontext"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/tonistiigi/buildx/bake"
 )
 
 type bakeOptions struct {
diff --git a/commands/build.go b/commands/build.go
index bf82a705..3ca62b44 100644
--- a/commands/build.go
+++ b/commands/build.go
@@ -5,6 +5,9 @@ import (
 	"os"
 	"strings"
 
+	"github.com/docker/buildx/build"
+	"github.com/docker/buildx/util/platformutil"
+	"github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/moby/buildkit/client"
@@ -13,9 +16,6 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/tonistiigi/buildx/build"
-	"github.com/tonistiigi/buildx/util/platformutil"
-	"github.com/tonistiigi/buildx/util/progress"
 )
 
 type buildOptions struct {
diff --git a/commands/create.go b/commands/create.go
index 49d5ce38..113f20a0 100644
--- a/commands/create.go
+++ b/commands/create.go
@@ -4,14 +4,14 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/docker/buildx/driver"
+	"github.com/docker/buildx/store"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/moby/buildkit/util/appcontext"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	"github.com/tonistiigi/buildx/driver"
-	"github.com/tonistiigi/buildx/store"
 )
 
 type createOptions struct {
diff --git a/commands/imagetools/create.go b/commands/imagetools/create.go
index be651794..479cd1cc 100644
--- a/commands/imagetools/create.go
+++ b/commands/imagetools/create.go
@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"strings"
 
+	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/distribution/reference"
 	"github.com/moby/buildkit/util/appcontext"
@@ -13,7 +14,6 @@ import (
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
-	"github.com/tonistiigi/buildx/util/imagetools"
 	"golang.org/x/sync/errgroup"
 )
 
diff --git a/commands/imagetools/inspect.go b/commands/imagetools/inspect.go
index 55843e5d..6ee673e8 100644
--- a/commands/imagetools/inspect.go
+++ b/commands/imagetools/inspect.go
@@ -5,12 +5,12 @@ import (
 	"os"
 
 	"github.com/containerd/containerd/images"
+	"github.com/docker/buildx/util/imagetools"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/moby/buildkit/util/appcontext"
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/spf13/cobra"
-	"github.com/tonistiigi/buildx/util/imagetools"
 )
 
 type inspectOptions struct {
diff --git a/commands/inspect.go b/commands/inspect.go
index a4ab7d2b..3d2fe745 100644
--- a/commands/inspect.go
+++ b/commands/inspect.go
@@ -8,16 +8,16 @@ import (
 	"text/tabwriter"
 	"time"
 
+	"github.com/docker/buildx/build"
+	"github.com/docker/buildx/driver"
+	"github.com/docker/buildx/store"
+	"github.com/docker/buildx/util/platformutil"
+	"github.com/docker/buildx/util/progress"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/moby/buildkit/util/appcontext"
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/spf13/cobra"
-	"github.com/tonistiigi/buildx/build"
-	"github.com/tonistiigi/buildx/driver"
-	"github.com/tonistiigi/buildx/store"
-	"github.com/tonistiigi/buildx/util/platformutil"
-	"github.com/tonistiigi/buildx/util/progress"
 	"golang.org/x/sync/errgroup"
 )
 
diff --git a/commands/ls.go b/commands/ls.go
index 08df4354..6a8be393 100644
--- a/commands/ls.go
+++ b/commands/ls.go
@@ -9,12 +9,12 @@ import (
 	"text/tabwriter"
 	"time"
 
+	"github.com/docker/buildx/store"
+	"github.com/docker/buildx/util/platformutil"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/moby/buildkit/util/appcontext"
 	"github.com/spf13/cobra"
-	"github.com/tonistiigi/buildx/store"
-	"github.com/tonistiigi/buildx/util/platformutil"
 	"golang.org/x/sync/errgroup"
 )
 
diff --git a/commands/rm.go b/commands/rm.go
index 1d49fbd6..33a5eb37 100644
--- a/commands/rm.go
+++ b/commands/rm.go
@@ -3,11 +3,11 @@ package commands
 import (
 	"context"
 
+	"github.com/docker/buildx/store"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/moby/buildkit/util/appcontext"
 	"github.com/spf13/cobra"
-	"github.com/tonistiigi/buildx/store"
 )
 
 type rmOptions struct {
diff --git a/commands/root.go b/commands/root.go
index 4b0b6ef8..8b830960 100644
--- a/commands/root.go
+++ b/commands/root.go
@@ -1,10 +1,10 @@
 package commands
 
 import (
+	imagetoolscmd "github.com/docker/buildx/commands/imagetools"
 	"github.com/docker/cli/cli-plugins/plugin"
 	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
-	imagetoolscmd "github.com/tonistiigi/buildx/commands/imagetools"
 )
 
 func NewRootCmd(name string, isPlugin bool, dockerCli command.Cli) *cobra.Command {
diff --git a/commands/util.go b/commands/util.go
index 97109c89..0f326e51 100644
--- a/commands/util.go
+++ b/commands/util.go
@@ -5,15 +5,15 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/docker/buildx/build"
+	"github.com/docker/buildx/driver"
+	"github.com/docker/buildx/store"
+	"github.com/docker/buildx/util/platformutil"
 	"github.com/docker/cli/cli/command"
 	"github.com/docker/cli/cli/context/docker"
 	dopts "github.com/docker/cli/opts"
 	dockerclient "github.com/docker/docker/client"
 	"github.com/pkg/errors"
-	"github.com/tonistiigi/buildx/build"
-	"github.com/tonistiigi/buildx/driver"
-	"github.com/tonistiigi/buildx/store"
-	"github.com/tonistiigi/buildx/util/platformutil"
 	"golang.org/x/sync/errgroup"
 )
 
diff --git a/commands/version.go b/commands/version.go
index ad2d0cd5..5310b992 100644
--- a/commands/version.go
+++ b/commands/version.go
@@ -3,10 +3,10 @@ package commands
 import (
 	"fmt"
 
+	"github.com/docker/buildx/version"
 	"github.com/docker/cli/cli"
 	"github.com/docker/cli/cli/command"
 	"github.com/spf13/cobra"
-	"github.com/tonistiigi/buildx/version"
 )
 
 func runVersion(dockerCli command.Cli) error {
diff --git a/driver/docker-container/driver.go b/driver/docker-container/driver.go
index 585de499..af47d520 100644
--- a/driver/docker-container/driver.go
+++ b/driver/docker-container/driver.go
@@ -8,6 +8,8 @@ import (
 	"os"
 	"time"
 
+	"github.com/docker/buildx/driver"
+	"github.com/docker/buildx/util/progress"
 	"github.com/docker/docker/api/types"
 	dockertypes "github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
@@ -16,8 +18,6 @@ import (
 	"github.com/docker/docker/pkg/stdcopy"
 	"github.com/moby/buildkit/client"
 	"github.com/pkg/errors"
-	"github.com/tonistiigi/buildx/driver"
-	"github.com/tonistiigi/buildx/util/progress"
 )
 
 var buildkitImage = "moby/buildkit:master" // TODO: make this verified and configuratble
diff --git a/driver/docker-container/factory.go b/driver/docker-container/factory.go
index e3c9c99f..16b7c15c 100644
--- a/driver/docker-container/factory.go
+++ b/driver/docker-container/factory.go
@@ -3,9 +3,9 @@ package docker
 import (
 	"context"
 
+	"github.com/docker/buildx/driver"
 	dockerclient "github.com/docker/docker/client"
 	"github.com/pkg/errors"
-	"github.com/tonistiigi/buildx/driver"
 )
 
 const prioritySupported = 30
diff --git a/driver/docker/driver.go b/driver/docker/driver.go
index 9f64e986..35854bff 100644
--- a/driver/docker/driver.go
+++ b/driver/docker/driver.go
@@ -5,10 +5,10 @@ import (
 	"net"
 	"time"
 
+	"github.com/docker/buildx/driver"
+	"github.com/docker/buildx/util/progress"
 	"github.com/moby/buildkit/client"
 	"github.com/pkg/errors"
-	"github.com/tonistiigi/buildx/driver"
-	"github.com/tonistiigi/buildx/util/progress"
 )
 
 type Driver struct {
diff --git a/driver/docker/factory.go b/driver/docker/factory.go
index 34a028b1..697f2cd5 100644
--- a/driver/docker/factory.go
+++ b/driver/docker/factory.go
@@ -3,9 +3,9 @@ package docker
 import (
 	"context"
 
+	"github.com/docker/buildx/driver"
 	dockerclient "github.com/docker/docker/client"
 	"github.com/pkg/errors"
-	"github.com/tonistiigi/buildx/driver"
 )
 
 const prioritySupported = 10
diff --git a/driver/driver.go b/driver/driver.go
index a9faf799..6d73cff4 100644
--- a/driver/driver.go
+++ b/driver/driver.go
@@ -3,9 +3,9 @@ package driver
 import (
 	"context"
 
+	"github.com/docker/buildx/util/progress"
 	"github.com/moby/buildkit/client"
 	"github.com/pkg/errors"
-	"github.com/tonistiigi/buildx/util/progress"
 )
 
 var ErrNotRunning = errors.Errorf("driver not running")
diff --git a/go.mod b/go.mod
index 10e63b44..af0aa2ce 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/tonistiigi/buildx
+module github.com/docker/buildx
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
diff --git a/hack/dockerfiles/lint.Dockerfile b/hack/dockerfiles/lint.Dockerfile
index 73e6d384..dbd0bb13 100644
--- a/hack/dockerfiles/lint.Dockerfile
+++ b/hack/dockerfiles/lint.Dockerfile
@@ -5,6 +5,6 @@ RUN  apk add --no-cache git
 RUN  go get -u gopkg.in/alecthomas/gometalinter.v1 \
   && mv /go/bin/gometalinter.v1 /go/bin/gometalinter \
   && gometalinter --install
-WORKDIR /go/src/github.com/tonistiigi/buildx
-RUN --mount=target=/go/src/github.com/tonistiigi/buildx \
+WORKDIR /go/src/github.com/docker/buildx
+RUN --mount=target=/go/src/github.com/docker/buildx \
 	gometalinter --config=gometalinter.json ./...
diff --git a/store/nodegroup.go b/store/nodegroup.go
index 3cb2c5b4..3a1604ef 100644
--- a/store/nodegroup.go
+++ b/store/nodegroup.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 
 	"github.com/containerd/containerd/platforms"
+	"github.com/docker/buildx/util/platformutil"
 	specs "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/tonistiigi/buildx/util/platformutil"
 )
 
 type NodeGroup struct {
diff --git a/store/nodegroup_test.go b/store/nodegroup_test.go
index 6dbf7172..f4f7eb35 100644
--- a/store/nodegroup_test.go
+++ b/store/nodegroup_test.go
@@ -3,8 +3,8 @@ package store
 import (
 	"testing"
 
+	"github.com/docker/buildx/util/platformutil"
 	"github.com/stretchr/testify/require"
-	"github.com/tonistiigi/buildx/util/platformutil"
 )
 
 func TestNodeGroupUpdate(t *testing.T) {
diff --git a/version/version.go b/version/version.go
index 1493be7e..1d236e5e 100644
--- a/version/version.go
+++ b/version/version.go
@@ -2,7 +2,7 @@ package version
 
 var (
 	// Package is filled at linking time
-	Package = "github.com/tonistiigi/buildx"
+	Package = "github.com/docker/buildx"
 
 	// Version holds the complete version number. Filled in at linking time.
 	Version = "0.0.0+unknown"