diff --git a/.papr.sh b/.papr.sh
index 97952ac32..8054abfd4 100755
--- a/.papr.sh
+++ b/.papr.sh
@@ -3,7 +3,7 @@ set -xeuo pipefail
 
 export GOPATH=$HOME/gopath
 export PATH=$HOME/gopath/bin:$PATH
-export GOSRC=$HOME/gopath/src/github.com/projectatomic/buildah
+export GOSRC=$HOME/gopath/src/github.com/containers/buildah
 
 (mkdir -p $GOSRC && cd /code && cp -r . $GOSRC)
 
diff --git a/.papr.yml b/.papr.yml
index 3a1433236..95201c8eb 100644
--- a/.papr.yml
+++ b/.papr.yml
@@ -72,7 +72,7 @@ pulls: true
 
 env:
     GOPATH: /go
-    GOSRC: /go/src/github.com/projectatomic
+    GOSRC: /go/src/github.com/containers
 
 tests:
     - mkdir -p $GOSRC && ln -s /var/tmp/checkout $GOSRC/buildah
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 565bb67bb..9cacbc84d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,4 @@
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 # Changelog
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a20e662b3..7dc301a55 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,4 +1,4 @@
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 # Contributing to Buildah
 
@@ -16,7 +16,7 @@ that we follow.
 ## Reporting Issues
 
 Before reporting an issue, check our backlog of
-[open issues](https://github.com/projectatomic/buildah/issues)
+[open issues](https://github.com/containers/buildah/issues)
 to see if someone else has already reported it. If so, feel free to add
 your scenario, or additional information, to the discussion. Or simply
 "subscribe" to it to be notified when it is updated.
@@ -123,9 +123,9 @@ IRC group on `irc.freenode.net` called `buildah`
 that has been setup.
 
 For discussions around issues/bugs and features, you can use the github
-[issues](https://github.com/projectatomic/buildah/issues)
+[issues](https://github.com/containers/buildah/issues)
 and
-[PRs](https://github.com/projectatomic/buildah/pulls)
+[PRs](https://github.com/containers/buildah/pulls)
 tracking system.
 
 ## Becoming a Maintainer
diff --git a/Makefile b/Makefile
index 0b4646e52..924589082 100644
--- a/Makefile
+++ b/Makefile
@@ -36,10 +36,10 @@ docs: ## build the docs on the host
 	$(MAKE) -C docs
 
 # For vendoring to work right, the checkout directory must be such that our top
-# level is at $GOPATH/src/github.com/projectatomic/buildah.
+# level is at $GOPATH/src/github.com/containers/buildah.
 .PHONY: gopath
 gopath:
-	test $(shell pwd) = $(shell cd ../../../../src/github.com/projectatomic/buildah ; pwd)
+	test $(shell pwd) = $(shell cd ../../../../src/github.com/containers/buildah ; pwd)
 
 # We use https://github.com/lk4d4/vndr to manage dependencies.
 .PHONY: deps
diff --git a/README.md b/README.md
index 0d3d19ee3..b04957591 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 # [Buildah](https://www.youtube.com/embed/YVk5NgSiUw8) - a tool that facilitates building [Open Container Initiative (OCI)](https://www.opencontainers.org/) container images
 
-[![Go Report Card](https://goreportcard.com/badge/github.com/projectatomic/buildah)](https://goreportcard.com/report/github.com/projectatomic/buildah)
-[![Travis](https://travis-ci.org/projectatomic/buildah.svg?branch=master)](https://travis-ci.org/projectatomic/buildah)
+[![Go Report Card](https://goreportcard.com/badge/github.com/containers/buildah)](https://goreportcard.com/report/github.com/containers/buildah)
+[![Travis](https://travis-ci.org/containers/buildah.svg?branch=master)](https://travis-ci.org/containers/buildah)
 
 The Buildah package provides a command line tool that can be used to
 * create a working container, either from scratch or using an image as a starting point
@@ -35,7 +35,7 @@ The Buildah package provides a command line tool that can be used to
 
 Buildah and Podman are two complementary Open-source projects that are available on
 most Linux platforms and both projects reside at [GitHub.com](https://github.com)
-with Buildah [here](https://github.com/projectatomic/buildah) and
+with Buildah [here](https://github.com/containers/buildah) and
 Podman [here](https://github.com/containers/libpod).  Both Buildah and Podman are
 command line tools that work on OCI images and containers.  The two projects
 differentiate in their specialization.
@@ -61,7 +61,7 @@ storage differences, you can not see Podman containers from within Buildah or vi
 In short Buildah is an efficient way to create OCI images  while Podman allows
 you to manage and maintain those images and containers in a production environment using
 familiar container cli commands.  For more details, see the 
-[Container Tools Guide](https://github.com/projectatomic/buildah/tree/master/docs/containertools).
+[Container Tools Guide](https://github.com/containers/buildah/tree/master/docs/containertools).
 
 ## Example
 
diff --git a/add.go b/add.go
index 27c07c323..b1747db94 100644
--- a/add.go
+++ b/add.go
@@ -11,12 +11,12 @@ import (
 	"syscall"
 	"time"
 
+	"github.com/containers/buildah/util"
 	"github.com/containers/libpod/pkg/chrootuser"
 	"github.com/containers/storage/pkg/archive"
 	"github.com/containers/storage/pkg/idtools"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/bind/mount.go b/bind/mount.go
index 695bde554..e1ae323b9 100644
--- a/bind/mount.go
+++ b/bind/mount.go
@@ -8,11 +8,11 @@ import (
 	"path/filepath"
 	"syscall"
 
+	"github.com/containers/buildah/util"
 	"github.com/containers/storage/pkg/idtools"
 	"github.com/containers/storage/pkg/mount"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )
diff --git a/bind/util.go b/bind/util.go
index 4408c53bb..93ba4e2b7 100644
--- a/bind/util.go
+++ b/bind/util.go
@@ -1,8 +1,8 @@
 package bind
 
 import (
+	"github.com/containers/buildah/util"
 	"github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/projectatomic/buildah/util"
 )
 
 const (
diff --git a/buildah.go b/buildah.go
index 60688b372..7891810a2 100644
--- a/buildah.go
+++ b/buildah.go
@@ -9,13 +9,13 @@ import (
 	"os"
 	"path/filepath"
 
+	"github.com/containers/buildah/docker"
+	"github.com/containers/buildah/util"
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/ioutils"
 	"github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/docker"
-	"github.com/projectatomic/buildah/util"
 )
 
 const (
diff --git a/chroot/run.go b/chroot/run.go
index c8aec181a..58b7a883c 100644
--- a/chroot/run.go
+++ b/chroot/run.go
@@ -17,15 +17,15 @@ import (
 	"syscall"
 	"unsafe"
 
+	"github.com/containers/buildah/bind"
+	"github.com/containers/buildah/unshare"
+	"github.com/containers/buildah/util"
 	"github.com/containers/storage/pkg/ioutils"
 	"github.com/containers/storage/pkg/mount"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/opencontainers/runc/libcontainer/apparmor"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/bind"
-	"github.com/projectatomic/buildah/unshare"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"github.com/syndtr/gocapability/capability"
 	"golang.org/x/crypto/ssh/terminal"
diff --git a/chroot/run_test.go b/chroot/run_test.go
index 2d1899cab..84500ae19 100644
--- a/chroot/run_test.go
+++ b/chroot/run_test.go
@@ -14,11 +14,11 @@ import (
 	"syscall"
 	"testing"
 
+	"github.com/containers/buildah/tests/testreport/types"
+	"github.com/containers/buildah/util"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/opencontainers/runtime-tools/generate"
-	"github.com/projectatomic/buildah/tests/testreport/types"
-	"github.com/projectatomic/buildah/util"
 )
 
 const (
diff --git a/cmd/buildah/addcopy.go b/cmd/buildah/addcopy.go
index bc046b342..bd9e1ef11 100644
--- a/cmd/buildah/addcopy.go
+++ b/cmd/buildah/addcopy.go
@@ -3,11 +3,11 @@ package main
 import (
 	"fmt"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/bud.go b/cmd/buildah/bud.go
index 4edaea740..7de24bc3c 100644
--- a/cmd/buildah/bud.go
+++ b/cmd/buildah/bud.go
@@ -6,10 +6,10 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/containers/buildah/imagebuildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/imagebuildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/buildah/commit.go b/cmd/buildah/commit.go
index 868189f3c..22401cd2f 100644
--- a/cmd/buildah/commit.go
+++ b/cmd/buildah/commit.go
@@ -5,14 +5,14 @@ import (
 	"os"
 	"time"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/buildah/util"
 	"github.com/containers/image/storage"
 	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/storage/pkg/archive"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/common.go b/cmd/buildah/common.go
index eab245e29..b00a44ad4 100644
--- a/cmd/buildah/common.go
+++ b/cmd/buildah/common.go
@@ -6,13 +6,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/buildah"
+	"github.com/containers/buildah/util"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
 	digest "github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	"github.com/projectatomic/buildah/util"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/common_test.go b/cmd/buildah/common_test.go
index de237f575..89f418736 100644
--- a/cmd/buildah/common_test.go
+++ b/cmd/buildah/common_test.go
@@ -6,10 +6,10 @@ import (
 	"os/user"
 	"testing"
 
+	"github.com/containers/buildah"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
-	"github.com/projectatomic/buildah"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/buildah/config.go b/cmd/buildah/config.go
index c6455f68e..869738b70 100644
--- a/cmd/buildah/config.go
+++ b/cmd/buildah/config.go
@@ -4,11 +4,11 @@ import (
 	"encoding/json"
 	"strings"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/mattn/go-shellwords"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/buildah/containers.go b/cmd/buildah/containers.go
index 195ab9d6a..c67b22436 100644
--- a/cmd/buildah/containers.go
+++ b/cmd/buildah/containers.go
@@ -8,10 +8,10 @@ import (
 	"strings"
 	"text/template"
 
+	"github.com/containers/buildah"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/from.go b/cmd/buildah/from.go
index 7a5ea19a8..2ef2b91ce 100644
--- a/cmd/buildah/from.go
+++ b/cmd/buildah/from.go
@@ -6,11 +6,11 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	util "github.com/containers/buildah/util"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	util "github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/buildah/images.go b/cmd/buildah/images.go
index a589c57de..48b9e31e5 100644
--- a/cmd/buildah/images.go
+++ b/cmd/buildah/images.go
@@ -11,11 +11,11 @@ import (
 
 	"encoding/json"
 
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	is "github.com/containers/image/storage"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/buildah/images_test.go b/cmd/buildah/images_test.go
index 904f62922..0f954b211 100644
--- a/cmd/buildah/images_test.go
+++ b/cmd/buildah/images_test.go
@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/containers/buildah/util"
 	is "github.com/containers/image/storage"
 	"github.com/containers/storage"
-	"github.com/projectatomic/buildah/util"
 )
 
 func TestTemplateOutputValidTemplate(t *testing.T) {
diff --git a/cmd/buildah/inspect.go b/cmd/buildah/inspect.go
index 56d801299..6f0fb0c14 100644
--- a/cmd/buildah/inspect.go
+++ b/cmd/buildah/inspect.go
@@ -7,10 +7,10 @@ import (
 	"regexp"
 	"text/template"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/urfave/cli"
 	"golang.org/x/crypto/ssh/terminal"
 )
diff --git a/cmd/buildah/main.go b/cmd/buildah/main.go
index bdda9685b..52043a307 100644
--- a/cmd/buildah/main.go
+++ b/cmd/buildah/main.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"os"
 
+	"github.com/containers/buildah"
 	"github.com/containers/storage"
 	ispecs "github.com/opencontainers/image-spec/specs-go"
 	rspecs "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/projectatomic/buildah"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/buildah/mount.go b/cmd/buildah/mount.go
index b1e2259e9..aa6450576 100644
--- a/cmd/buildah/mount.go
+++ b/cmd/buildah/mount.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/pkg/errors"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/pull.go b/cmd/buildah/pull.go
index da6d14fd6..deeb7eca0 100644
--- a/cmd/buildah/pull.go
+++ b/cmd/buildah/pull.go
@@ -5,12 +5,12 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	util "github.com/containers/buildah/util"
 	is "github.com/containers/image/storage"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	util "github.com/projectatomic/buildah/util"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/push.go b/cmd/buildah/push.go
index 98319ce7f..7f926bd9a 100644
--- a/cmd/buildah/push.go
+++ b/cmd/buildah/push.go
@@ -5,16 +5,16 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/buildah/util"
 	"github.com/containers/image/manifest"
 	"github.com/containers/image/transports"
 	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/storage/pkg/archive"
 	imgspecv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/buildah/rename.go b/cmd/buildah/rename.go
index 7d2ec149f..38d9ae623 100644
--- a/cmd/buildah/rename.go
+++ b/cmd/buildah/rename.go
@@ -1,8 +1,8 @@
 package main
 
 import (
+	"github.com/containers/buildah"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/rm.go b/cmd/buildah/rm.go
index 1ad924fc2..259cb1442 100644
--- a/cmd/buildah/rm.go
+++ b/cmd/buildah/rm.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"os"
 
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/buildah/util"
 	"github.com/pkg/errors"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/rmi.go b/cmd/buildah/rmi.go
index dd613f42d..03b4e6075 100644
--- a/cmd/buildah/rmi.go
+++ b/cmd/buildah/rmi.go
@@ -5,15 +5,15 @@ import (
 	"fmt"
 	"os"
 
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/buildah/util"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/transports"
 	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/buildah/run.go b/cmd/buildah/run.go
index a86601482..45cae49e5 100644
--- a/cmd/buildah/run.go
+++ b/cmd/buildah/run.go
@@ -6,12 +6,12 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/containers/buildah"
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/buildah/util"
 	specs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 )
diff --git a/cmd/buildah/tag.go b/cmd/buildah/tag.go
index cb4e41a9a..202b0fc4f 100644
--- a/cmd/buildah/tag.go
+++ b/cmd/buildah/tag.go
@@ -1,9 +1,9 @@
 package main
 
 import (
+	"github.com/containers/buildah/pkg/parse"
+	"github.com/containers/buildah/util"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/pkg/parse"
-	"github.com/projectatomic/buildah/util"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/umount.go b/cmd/buildah/umount.go
index dc7025512..b9b251b90 100644
--- a/cmd/buildah/umount.go
+++ b/cmd/buildah/umount.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"os"
 
+	buildahcli "github.com/containers/buildah/pkg/cli"
+	"github.com/containers/buildah/pkg/parse"
 	"github.com/pkg/errors"
-	buildahcli "github.com/projectatomic/buildah/pkg/cli"
-	"github.com/projectatomic/buildah/pkg/parse"
 	"github.com/urfave/cli"
 )
 
diff --git a/cmd/buildah/unshare.go b/cmd/buildah/unshare.go
index b495de26e..e7c5623ce 100644
--- a/cmd/buildah/unshare.go
+++ b/cmd/buildah/unshare.go
@@ -11,10 +11,10 @@ import (
 	"strconv"
 	"syscall"
 
+	"github.com/containers/buildah/unshare"
+	"github.com/containers/buildah/util"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/unshare"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"github.com/syndtr/gocapability/capability"
 	"github.com/urfave/cli"
diff --git a/cmd/buildah/version.go b/cmd/buildah/version.go
index a10e1fa78..76b260b91 100644
--- a/cmd/buildah/version.go
+++ b/cmd/buildah/version.go
@@ -7,10 +7,10 @@ import (
 	"time"
 
 	cniversion "github.com/containernetworking/cni/pkg/version"
+	"github.com/containers/buildah"
 	ispecs "github.com/opencontainers/image-spec/specs-go"
 	rspecs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
 	"github.com/urfave/cli"
 )
 
diff --git a/commit.go b/commit.go
index 2d49832a7..f89930399 100644
--- a/commit.go
+++ b/commit.go
@@ -7,6 +7,7 @@ import (
 	"io/ioutil"
 	"time"
 
+	"github.com/containers/buildah/util"
 	cp "github.com/containers/image/copy"
 	"github.com/containers/image/signature"
 	is "github.com/containers/image/storage"
@@ -15,7 +16,6 @@ import (
 	"github.com/containers/storage"
 	"github.com/containers/storage/pkg/archive"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/config.go b/config.go
index 2f4d8319a..f6a742d59 100644
--- a/config.go
+++ b/config.go
@@ -8,13 +8,13 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/buildah/docker"
 	"github.com/containers/image/manifest"
 	"github.com/containers/image/transports"
 	"github.com/containers/image/types"
 	"github.com/containers/storage/pkg/stringid"
 	ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/docker"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/contrib/docker/Dockerfile b/contrib/docker/Dockerfile
index b70936762..4729529d7 100644
--- a/contrib/docker/Dockerfile
+++ b/contrib/docker/Dockerfile
@@ -1,8 +1,8 @@
 FROM fedora
 RUN dnf -y update && dnf -y clean all
 RUN dnf -y install btrfs-progs-devel containers-common device-mapper-devel golang go-md2man gpgme-devel libassuan-devel libseccomp-devel make net-tools ostree-devel runc shadow-utils && dnf -y clean all
-COPY . /go/src/github.com/projectatomic/buildah
-RUN env GOPATH=/go make -C /go/src/github.com/projectatomic/buildah clean all install
+COPY . /go/src/github.com/containers/buildah
+RUN env GOPATH=/go make -C /go/src/github.com/containers/buildah clean all install
 RUN sed -i -r -e 's,driver = ".*",driver = "vfs",g' /etc/containers/storage.conf
 ENV BUILDAH_ISOLATION chroot
 WORKDIR /root
diff --git a/contrib/rpm/buildah.spec b/contrib/rpm/buildah.spec
index b70d98b0d..5784af761 100644
--- a/contrib/rpm/buildah.spec
+++ b/contrib/rpm/buildah.spec
@@ -16,9 +16,9 @@
 
 %global provider        github
 %global provider_tld    com
-%global project         projectatomic
+%global project         containers
 %global repo            buildah
-# https://github.com/projectatomic/buildah
+# https://github.com/containers/buildah
 %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo}
 %global import_path     %{provider_prefix}
 %global commit         REPLACEWITHCOMMITID
diff --git a/demos/README.md b/demos/README.md
index ee1b27e25..d958310b8 100644
--- a/demos/README.md
+++ b/demos/README.md
@@ -1,4 +1,4 @@
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 # Buildah Demos
 
diff --git a/developmentplan.md b/developmentplan.md
index 5d00cbfb4..0eb08c0f1 100644
--- a/developmentplan.md
+++ b/developmentplan.md
@@ -1,4 +1,4 @@
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 # Development Plan
 
@@ -10,4 +10,4 @@
 
  * Buildah `buildah bud` command's goal is to have feature parity with other OCI image and container build systems.
 
- * Addressing issues from the community as reported in the [Issues](https://github.com/projectatomic/buildah/issues) page.
+ * Addressing issues from the community as reported in the [Issues](https://github.com/containers/buildah/issues) page.
diff --git a/docs/buildah-add.md b/docs/buildah-add.md
index 255deb716..5e5386cd1 100644
--- a/docs/buildah-add.md
+++ b/docs/buildah-add.md
@@ -35,7 +35,7 @@ buildah add containerID '/home/myuser/myfiles.tar' '/tmp'
 
 buildah add containerID '/tmp/workingdir' '/tmp/workingdir'
 
-buildah add containerID 'https://github.com/projectatomic/buildah/blob/master/README.md' '/tmp'
+buildah add containerID 'https://github.com/containers/buildah/blob/master/README.md' '/tmp'
 
 buildah add containerID 'passwd' 'certs.d' /etc
 
diff --git a/docs/buildah-copy.md b/docs/buildah-copy.md
index 832f7019e..e37348b2d 100644
--- a/docs/buildah-copy.md
+++ b/docs/buildah-copy.md
@@ -33,7 +33,7 @@ buildah copy containerID '/home/myuser/myfiles.tar' '/tmp'
 
 buildah copy containerID '/tmp/workingdir' '/tmp/workingdir'
 
-buildah copy containerID 'https://github.com/projectatomic/buildah' '/tmp'
+buildah copy containerID 'https://github.com/containers/buildah' '/tmp'
 
 buildah copy containerID 'passwd' 'certs.d' /etc
 
diff --git a/docs/cni-examples/README.md b/docs/cni-examples/README.md
index f97adc62f..f9b293b1b 100644
--- a/docs/cni-examples/README.md
+++ b/docs/cni-examples/README.md
@@ -1,4 +1,4 @@
-When [buildah](https://github.com/projectatomic/buildah)'s `buildah run`
+When [buildah](https://github.com/containers/buildah)'s `buildah run`
 command is used, or when  `buildah build-using-dockerfile` needs to handle a
 `RUN` instruction, the processes which `buildah` starts are run in their own
 network namespace unless the `--network=host` option is used.
diff --git a/docs/containertools/README.md b/docs/containertools/README.md
index 44b00a57c..8878c1e14 100644
--- a/docs/containertools/README.md
+++ b/docs/containertools/README.md
@@ -10,7 +10,7 @@ on how they interact amongst each other.
 
 The tools are:  
 
-* [Buildah](https://github.com/projectatomic/buildah)
+* [Buildah](https://github.com/containers/buildah)
 * [CRI-O](https://github.com/kubernetes-sigs/cri-o)
 * [Podman](https://github.com/containers/libpod)
 * [Skopeo](https://github.com/containers/skopeo)
@@ -56,7 +56,7 @@ for authentication.
 
 Buildah and Podman are two complementary Open-source projects that are available on
 most Linux platforms and both projects reside at [GitHub.com](https://github.com)
-with Buildah [here](https://github.com/projectatomic/buildah) and
+with Buildah [here](https://github.com/containers/buildah) and
 Podman [here](https://github.com/containers/libpod).  Both Buildah and Podman are
 command line tools that work on OCI images and containers.  The two projects
 differentiate in their specialization.
diff --git a/docs/release-announcements/v0.12.md b/docs/release-announcements/v0.12.md
index 994d3db68..d21341a6a 100644
--- a/docs/release-announcements/v0.12.md
+++ b/docs/release-announcements/v0.12.md
@@ -1,8 +1,8 @@
 # Buildah Alpha version 0.12 Release Announcement
 
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
-We're pleased to announce the release of Buildah Alpha version 0.12 on both Fedora 26 and Fedora 27. As always, the latest Buildah can also be acquired from [GitHub](https://github.com/projectatomic/buildah) for any other Linux distribution.
+We're pleased to announce the release of Buildah Alpha version 0.12 on both Fedora 26 and Fedora 27. As always, the latest Buildah can also be acquired from [GitHub](https://github.com/containers/buildah) for any other Linux distribution.
 
 The Buildah project has been building some steam over the past several weeks, welcoming several new contributors to the mix, launching new functionality and creating a number of improvements and bug fixes. The major highlights for this release are:
 
@@ -27,6 +27,6 @@ The Buildah project has been building some steam over the past several weeks, we
 
 If you haven’t yet,  install Buildah from the Fedora repository and give it a spin.  We’re betting you'll find it’s an easy and quick way to build containers in your environment without a daemon being involved!
 
-If you haven't joined our community yet, don't wait any longer!  Come join us in [GitHub](https://github.com/projectatomic/buildah), where Open Source communities live.
+If you haven't joined our community yet, don't wait any longer!  Come join us in [GitHub](https://github.com/containers/buildah), where Open Source communities live.
 
 **Buildah == Simplicity**
diff --git a/docs/release-announcements/v0.16.md b/docs/release-announcements/v0.16.md
index 0f743794c..bcc899127 100644
--- a/docs/release-announcements/v0.16.md
+++ b/docs/release-announcements/v0.16.md
@@ -1,6 +1,6 @@
 # Buildah Alpha version 0.16 Release Announcement
 
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 We're pleased to announce the release of Buildah Alpha version 0.16 which is now available from GitHub for any Linux distro.  We will be shipping this release on Fedora, CentOS and Ubuntu in the near future.
 
diff --git a/docs/release-announcements/v1.1.md b/docs/release-announcements/v1.1.md
index c33ff57c7..510045c7c 100644
--- a/docs/release-announcements/v1.1.md
+++ b/docs/release-announcements/v1.1.md
@@ -1,6 +1,6 @@
 # Buildah version 1.1 Release Announcement
 
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 We're pleased to announce the release of Buildah version 1.1 which is now available from GitHub for any Linux distro.  We are shipping this release on Fedora, RHEL 7, CentOS and Ubuntu in the near future.
 
diff --git a/docs/release-announcements/v1.2.md b/docs/release-announcements/v1.2.md
index 027e961b7..1c58bd921 100644
--- a/docs/release-announcements/v1.2.md
+++ b/docs/release-announcements/v1.2.md
@@ -1,6 +1,6 @@
 # Buildah version 1.2 Release Announcement
 
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 We're pleased to announce the release of Buildah version 1.2 which is now available from GitHub for any Linux distro.  We are shipping this release on Fedora, RHEL 7, CentOS and Ubuntu in the near future.  
 
diff --git a/docs/release-announcements/v1.3.md b/docs/release-announcements/v1.3.md
index 0096d1cf9..569f99f68 100644
--- a/docs/release-announcements/v1.3.md
+++ b/docs/release-announcements/v1.3.md
@@ -1,6 +1,6 @@
 # Buildah version 1.3 Release Announcement
 
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 We're pleased to announce the release of Buildah version 1.3 which is now available from GitHub for any Linux distro.  We are shipping this release on Fedora, RHEL 7, CentOS, openSUSE and Ubuntu in the near future.
 
diff --git a/docs/tutorials/01-intro.md b/docs/tutorials/01-intro.md
index c4fcb50a0..7663ee22f 100644
--- a/docs/tutorials/01-intro.md
+++ b/docs/tutorials/01-intro.md
@@ -1,4 +1,4 @@
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 # Buildah Tutorial 1
 ## Building OCI container images
@@ -256,6 +256,6 @@ Why not try and modify the Dockerfile. Do not install httpd, but instead ADD the
 
 Well done. You have learned a lot about Buildah using this short tutorial. Hopefully you followed along with the examples and found them to be sufficient. Be sure to look at Buildah's man pages to see the other useful commands you can use. Have fun playing.
 
-If you have any suggestions or issues please post them at the [ProjectAtomic Buildah Issues page](https://github.com/projectatomic/buildah/issues).
+If you have any suggestions or issues please post them at the [Buildah Issues page](https://github.com/containers/buildah/issues).
 
-For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/projectatomic/buildah).
+For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/containers/buildah).
diff --git a/docs/tutorials/02-registries-repositories.md b/docs/tutorials/02-registries-repositories.md
index 46bc054ce..1722d931a 100644
--- a/docs/tutorials/02-registries-repositories.md
+++ b/docs/tutorials/02-registries-repositories.md
@@ -1,11 +1,11 @@
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 # Buildah Tutorial 2
 ## Using Buildah with container registries
 
 The purpose of this tutorial is to demonstrate how Buildah can be used to move OCI compliant images in and out of private or public registries. 
 
-In the [first tutorial](https://github.com/projectatomic/buildah/blob/master/docs/tutorials/01-intro.md) we built an image from scratch that we called `fedora-bashecho` and we pushed it to a local Docker repository using the `docker-daemon` protocol. We are going to use the same image to push to a private Docker registry.
+In the [first tutorial](https://github.com/containers/buildah/blob/master/docs/tutorials/01-intro.md) we built an image from scratch that we called `fedora-bashecho` and we pushed it to a local Docker repository using the `docker-daemon` protocol. We are going to use the same image to push to a private Docker registry.
 
 First we must pull down a registry. As a shortcut we will save the container name that is returned from the `buildah from` command, into a bash variable called `registry`. This is just like we did in Tutorial 1:
 
@@ -31,7 +31,7 @@ Let's push our image to the private registry. By default, Buildah is set up to e
 
     # buildah push --tls-verify=false fedora-bashecho docker://localhost:5000/ipbabble/fedora-bashecho:latest
 
-[Skopeo](https://github.com/projectatomic/skopeo) is a ProjectAtomic tool that was created to inspect images in registries without having to pull the image from the registry. It has grown to have many other uses. We will verify that the image has been stored by using Skopeo to inspect the image in the registry:
+[Skopeo](https://github.com/containers/skopeo) is a containers tool that was created to inspect images in registries without having to pull the image from the registry. It has grown to have many other uses. We will verify that the image has been stored by using Skopeo to inspect the image in the registry:
  
     # skopeo inspect --tls-verify=false docker://localhost:5000/ipbabble/fedora-bashecho:latest
     {
@@ -129,6 +129,6 @@ Now check that image is in the local containers-storage:
     
 Success!
 
-If you have any suggestions or issues please post them at the [ProjectAtomic Buildah Issues page](https://github.com/projectatomic/buildah/issues).
+If you have any suggestions or issues please post them at the [Containers Buildah Issues page](https://github.com/containers/buildah/issues).
 
-For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/projectatomic/buildah).
+For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/containers/buildah).
diff --git a/docs/tutorials/03-on-build.md b/docs/tutorials/03-on-build.md
index 2f6c92f1c..005f54ba0 100644
--- a/docs/tutorials/03-on-build.md
+++ b/docs/tutorials/03-on-build.md
@@ -182,9 +182,9 @@ Again these aren't the most extensive examples, but they both illustrate how a m
 
 Well done. You have learned about Buildah's ONBUILD functionality using this short tutorial. Hopefully you followed along with the examples and found them to be sufficient. Be sure to look at Buildah's man pages to see the other useful commands you can use. Have fun playing.
 
-If you have any suggestions or issues please post them at the [ProjectAtomic Buildah Issues page](https://github.com/projectatomic/buildah/issues).
+If you have any suggestions or issues please post them at the [Buildah Issues page](https://github.com/containers/buildah/issues).
 
-For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/projectatomic/buildah).
+For more information on Buildah and how you might contribute please visit the [Buildah home page on Github](https://github.com/containers/buildah).
 
 [GitHub]: https://github.com/containers/libpod/
 [image specification]: https://github.com/opencontainers/runtime-spec
diff --git a/hack/spc_build.sh b/hack/spc_build.sh
index 92bfe94c4..102fd8558 100755
--- a/hack/spc_build.sh
+++ b/hack/spc_build.sh
@@ -31,8 +31,8 @@ dnf -y install autoconf automake btrfs-progs-devel \
 echo "Cleanup buildah repo and build again in fedora..."
 make clean
 mv vendor src
-mkdir -p $(pwd)/_build/src/github.com/projectatomic
-ln -s $(pwd) $(pwd)/_build/src/github.com/projectatomic/buildah
+mkdir -p $(pwd)/_build/src/github.com/containers
+ln -s $(pwd) $(pwd)/_build/src/github.com/containers/buildah
 make GOPATH=$(pwd)/_build:$(pwd) all TAGS="seccomp containers_image_ostree_stub"
 GOPATH=$(pwd)/_build:$(pwd) go test -c -tags "seccomp `./btrfs_tag.sh` `./btrfs_installed_tag.sh` `./libdm_tag.sh` `./ostree_tag.sh` `./selinux_tag.sh`" ./cmd/buildah
 tmp=$(mktemp -d); mkdir $tmp/root $tmp/runroot; PATH="$PATH" ./buildah.test -test.v -root $tmp/root -runroot $tmp/runroot -storage-driver vfs -signature-policy $(pwd)/tests/policy.json -registries-conf $(pwd)/tests/registries.conf
diff --git a/image.go b/image.go
index b94720f59..df50d95bd 100644
--- a/image.go
+++ b/image.go
@@ -11,6 +11,7 @@ import (
 	"path/filepath"
 	"time"
 
+	"github.com/containers/buildah/docker"
 	"github.com/containers/image/docker/reference"
 	"github.com/containers/image/image"
 	"github.com/containers/image/manifest"
@@ -23,7 +24,6 @@ import (
 	specs "github.com/opencontainers/image-spec/specs-go"
 	"github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/docker"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/imagebuildah/build.go b/imagebuildah/build.go
index 08d0f6268..4bcd38c05 100644
--- a/imagebuildah/build.go
+++ b/imagebuildah/build.go
@@ -14,6 +14,8 @@ import (
 	"strings"
 	"time"
 
+	"github.com/containers/buildah"
+	"github.com/containers/buildah/util"
 	cp "github.com/containers/image/copy"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/transports"
@@ -28,8 +30,6 @@ import (
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/openshift/imagebuilder"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/imagebuildah/util.go b/imagebuildah/util.go
index b437ea1cb..35dc5438a 100644
--- a/imagebuildah/util.go
+++ b/imagebuildah/util.go
@@ -10,9 +10,9 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/containers/buildah"
 	"github.com/containers/storage/pkg/chrootarchive"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/import.go b/import.go
index 31288334a..f5f156be2 100644
--- a/import.go
+++ b/import.go
@@ -3,13 +3,13 @@ package buildah
 import (
 	"context"
 
+	"github.com/containers/buildah/docker"
+	"github.com/containers/buildah/util"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
 	"github.com/opencontainers/go-digest"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/docker"
-	"github.com/projectatomic/buildah/util"
 )
 
 func importBuilderDataFromImage(ctx context.Context, store storage.Store, systemContext *types.SystemContext, imageID, containerName, containerID string) (*Builder, error) {
diff --git a/install.md b/install.md
index c53de56fc..c03868859 100644
--- a/install.md
+++ b/install.md
@@ -1,4 +1,4 @@
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 # Installation Instructions
 
@@ -46,7 +46,7 @@ The CNI library needs to be configured so that it will know which plugins to
 call to set up namespaces.  Usually, this configuration takes the form of one
 or more configuration files in the `/etc/cni/net.d` directory.  A set of example
 configuration files is included in the
-[`docs/cni-examples`](https://github.com/projectatomic/buildah/tree/master/docs/cni-examples)
+[`docs/cni-examples`](https://github.com/containers/buildah/tree/master/docs/cni-examples)
 directory of this source tree.
 
 ## Package Installation
@@ -102,8 +102,8 @@ Then to install Buildah on Fedora follow the steps in this example:
   mkdir ~/buildah
   cd ~/buildah
   export GOPATH=`pwd`
-  git clone https://github.com/projectatomic/buildah ./src/github.com/projectatomic/buildah
-  cd ./src/github.com/projectatomic/buildah
+  git clone https://github.com/containers/buildah ./src/github.com/containers/buildah
+  cd ./src/github.com/containers/buildah
   make
   sudo make install
   buildah --help
@@ -177,8 +177,8 @@ Then to install Buildah on Ubuntu follow the steps in this example:
   mkdir ~/buildah
   cd ~/buildah
   export GOPATH=`pwd`
-  git clone https://github.com/projectatomic/buildah ./src/github.com/projectatomic/buildah
-  cd ./src/github.com/projectatomic/buildah
+  git clone https://github.com/containers/buildah ./src/github.com/containers/buildah
+  cd ./src/github.com/containers/buildah
   PATH=/usr/lib/go-1.8/bin:$PATH make runc all TAGS="apparmor seccomp"
   sudo make install install.runc
   buildah --help
@@ -268,7 +268,7 @@ containers.  This file is usually provided by the containers-common package.
 
 The link above takes you to the seccomp.json
 
-### [policy.json](https://github.com/projectatomic/skopeo/blob/master/default-policy.json)
+### [policy.json](https://github.com/containers/skopeo/blob/master/default-policy.json)
 
 `/etc/containers/policy.json`
 
diff --git a/new.go b/new.go
index 0eb8d8e42..b0b655da9 100644
--- a/new.go
+++ b/new.go
@@ -6,6 +6,7 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/buildah/util"
 	"github.com/containers/image/pkg/sysregistries"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/transports"
@@ -17,7 +18,6 @@ import (
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/openshift/imagebuilder"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/pkg/cli/common.go b/pkg/cli/common.go
index a438daf6a..94b92e1eb 100644
--- a/pkg/cli/common.go
+++ b/pkg/cli/common.go
@@ -9,10 +9,10 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/buildah"
+	"github.com/containers/buildah/util"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
-	"github.com/projectatomic/buildah/util"
 	"github.com/urfave/cli"
 )
 
diff --git a/pkg/parse/parse.go b/pkg/parse/parse.go
index 2dff18818..d206508b4 100644
--- a/pkg/parse/parse.go
+++ b/pkg/parse/parse.go
@@ -15,12 +15,12 @@ import (
 	"strings"
 	"unicode"
 
+	"github.com/containers/buildah"
 	"github.com/containers/image/types"
 	"github.com/containers/storage/pkg/idtools"
 	"github.com/docker/go-units"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
 	"github.com/sirupsen/logrus"
 	"github.com/urfave/cli"
 	"golang.org/x/crypto/ssh/terminal"
diff --git a/pull.go b/pull.go
index 1d2bb7f87..c2fc6637f 100644
--- a/pull.go
+++ b/pull.go
@@ -5,6 +5,7 @@ import (
 	"io"
 	"strings"
 
+	"github.com/containers/buildah/util"
 	cp "github.com/containers/image/copy"
 	"github.com/containers/image/docker/reference"
 	tarfile "github.com/containers/image/docker/tarfile"
@@ -17,7 +18,6 @@ import (
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/run.go b/run.go
index 2ce5add39..3d9b909ae 100644
--- a/run.go
+++ b/run.go
@@ -19,6 +19,9 @@ import (
 	"time"
 
 	"github.com/containernetworking/cni/libcni"
+	"github.com/containers/buildah/bind"
+	"github.com/containers/buildah/chroot"
+	"github.com/containers/buildah/util"
 	"github.com/containers/libpod/pkg/secrets"
 	"github.com/containers/storage/pkg/idtools"
 	"github.com/containers/storage/pkg/ioutils"
@@ -29,9 +32,6 @@ import (
 	"github.com/opencontainers/runtime-tools/generate"
 	"github.com/opencontainers/selinux/go-selinux/label"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/bind"
-	"github.com/projectatomic/buildah/chroot"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/crypto/ssh/terminal"
 	"golang.org/x/sys/unix"
diff --git a/tests/bud.bats b/tests/bud.bats
index 81e11bfb5..a61c61c09 100644
--- a/tests/bud.bats
+++ b/tests/bud.bats
@@ -661,7 +661,7 @@ load helpers
 
 @test "bud with Dockerfile from valid URL" {
   target=url-image
-  url=https://raw.githubusercontent.com/projectatomic/buildah/master/tests/bud/from-scratch/Dockerfile
+  url=https://raw.githubusercontent.com/containers/buildah/master/tests/bud/from-scratch/Dockerfile
   run buildah bud --signature-policy ${TESTSDIR}/policy.json -t ${target} ${url}
   [ "$status" -eq 0 ]
   cid=$(buildah from ${target})
@@ -671,7 +671,7 @@ load helpers
 
 @test "bud with Dockerfile from invalid URL" {
   target=url-image
-  url=https://raw.githubusercontent.com/projectatomic/buildah/master/tests/bud/from-scratch/Dockerfile.bogus
+  url=https://raw.githubusercontent.com/containers/buildah/master/tests/bud/from-scratch/Dockerfile.bogus
   run buildah bud --signature-policy ${TESTSDIR}/policy.json -t ${target} ${url}
   [ "$status" -eq 1 ]
 }
diff --git a/tests/bud/use-layers/Dockerfile b/tests/bud/use-layers/Dockerfile
index 65d83197b..9b900365c 100644
--- a/tests/bud/use-layers/Dockerfile
+++ b/tests/bud/use-layers/Dockerfile
@@ -2,5 +2,5 @@ FROM alpine
 RUN mkdir /hello
 VOLUME /var/lib/testdata
 RUN touch file.txt
-ADD https://github.com/projectatomic/buildah/blob/master/README.md /tmp/
+ADD https://github.com/containers/buildah/blob/master/README.md /tmp/
 ENV foo=bar
diff --git a/tests/conformance/README.md b/tests/conformance/README.md
index f6c10b655..5d4feccae 100644
--- a/tests/conformance/README.md
+++ b/tests/conformance/README.md
@@ -1,4 +1,4 @@
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 # Buildah/Docker Conformance Test Suite
 
@@ -16,7 +16,7 @@ The dependencies for comformance testing include two parts:
 
 ### Install Buildah
 
-Install Buildah using dnf, yum or apt-get, based on your distribution.  Buildah can also be cloned and installed from [GitHub](https://github.com/projectatomic/buildah/blob/master/install.md).
+Install Buildah using dnf, yum or apt-get, based on your distribution.  Buildah can also be cloned and installed from [GitHub](https://github.com/containers/buildah/blob/master/install.md).
  
 ### Install Docker CE
 
diff --git a/tests/e2e/buildah_suite_test.go b/tests/e2e/buildah_suite_test.go
index 8b1d4f33e..ba63438a9 100644
--- a/tests/e2e/buildah_suite_test.go
+++ b/tests/e2e/buildah_suite_test.go
@@ -12,6 +12,7 @@ import (
 
 	"encoding/json"
 
+	"github.com/containers/buildah"
 	"github.com/containers/image/copy"
 	"github.com/containers/image/signature"
 	"github.com/containers/image/storage"
@@ -23,7 +24,6 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/onsi/gomega/gexec"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah"
 )
 
 var (
diff --git a/tests/from.bats b/tests/from.bats
index cbbd4f9af..908f36cfb 100644
--- a/tests/from.bats
+++ b/tests/from.bats
@@ -136,7 +136,7 @@ load helpers
   buildah rm ${cid}
   buildah rmi scratch2 scratch3
 
-  # Github https://github.com/projectatomic/buildah/issues/396#issuecomment-360949396
+  # Github https://github.com/containers/buildah/issues/396#issuecomment-360949396
   cid=$(buildah from --pull=true --signature-policy ${TESTSDIR}/policy.json alpine)
   buildah rm $cid
   buildah tag alpine alpine2
diff --git a/tests/imgtype/imgtype.go b/tests/imgtype/imgtype.go
index 7ac477131..26e63a87a 100644
--- a/tests/imgtype/imgtype.go
+++ b/tests/imgtype/imgtype.go
@@ -8,15 +8,15 @@ import (
 	"os"
 	"strings"
 
+	"github.com/containers/buildah"
+	"github.com/containers/buildah/docker"
+	"github.com/containers/buildah/util"
 	"github.com/containers/image/manifest"
 	is "github.com/containers/image/storage"
 	"github.com/containers/image/transports/alltransports"
 	"github.com/containers/image/types"
 	"github.com/containers/storage"
 	"github.com/opencontainers/image-spec/specs-go/v1"
-	"github.com/projectatomic/buildah"
-	"github.com/projectatomic/buildah/docker"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/tests/test_buildah_build_rpm.sh b/tests/test_buildah_build_rpm.sh
index 5b677bcdd..ed7a3818f 100755
--- a/tests/test_buildah_build_rpm.sh
+++ b/tests/test_buildah_build_rpm.sh
@@ -30,7 +30,7 @@ ${PACKAGER} install -y buildah
 # Clone buildah from GitHub.com
 ########
 cd $SBOX
-git clone https://github.com/projectatomic/buildah.git
+git clone https://github.com/containers/buildah.git
 cd $GITROOT
 
 ########
diff --git a/tests/testreport/testreport.go b/tests/testreport/testreport.go
index e37e1adba..bb52e59ba 100644
--- a/tests/testreport/testreport.go
+++ b/tests/testreport/testreport.go
@@ -11,10 +11,10 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/containers/buildah/tests/testreport/types"
 	"github.com/containers/storage/pkg/mount"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/tests/testreport/types"
 	"github.com/sirupsen/logrus"
 	"github.com/syndtr/gocapability/capability"
 	"golang.org/x/crypto/ssh/terminal"
diff --git a/troubleshooting.md b/troubleshooting.md
index 66806b472..16df576a5 100644
--- a/troubleshooting.md
+++ b/troubleshooting.md
@@ -1,4 +1,4 @@
-![buildah logo](https://cdn.rawgit.com/projectatomic/buildah/master/logos/buildah-logo_large.png)
+![buildah logo](https://cdn.rawgit.com/containers/buildah/master/logos/buildah-logo_large.png)
 
 # Troubleshooting
 
diff --git a/unshare/unshare.go b/unshare/unshare.go
index 4eea74956..d89dfc053 100644
--- a/unshare/unshare.go
+++ b/unshare/unshare.go
@@ -13,10 +13,10 @@ import (
 	"strings"
 	"syscall"
 
+	"github.com/containers/buildah/util"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/pkg/errors"
-	"github.com/projectatomic/buildah/util"
 )
 
 // Cmd wraps an exec.Cmd created by the reexec package in unshare(), and
diff --git a/unshare/unshare_test.go b/unshare/unshare_test.go
index 39233b7b9..c7870bb98 100644
--- a/unshare/unshare_test.go
+++ b/unshare/unshare_test.go
@@ -12,9 +12,9 @@ import (
 	"syscall"
 	"testing"
 
+	"github.com/containers/buildah/util"
 	"github.com/containers/storage/pkg/reexec"
 	"github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/projectatomic/buildah/util"
 	"github.com/sirupsen/logrus"
 	"golang.org/x/sys/unix"
 )