diff --git a/.circleci/config.yml b/.circleci/config.yml
index ea2f58ede..37a984d5d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,14 +20,14 @@ jobs:
   test:
     docker:
       - image: circleci/golang:1.10
-    working_directory: /go/src/github.com/circleci/circleci-cli
+    working_directory: /go/src/github.com/CircleCI-Public/circleci-cli
     steps:
       - checkout
       - run: make test
   coverage:
     docker:
       - image: circleci/golang:1.10
-    working_directory: /go/src/github.com/circleci/circleci-cli
+    working_directory: /go/src/github.com/CircleCI-Public/circleci-cli
     steps:
       - checkout
       - run: make cover
@@ -52,7 +52,7 @@ jobs:
   lint:
     docker:
       - image: circleci/golang:1.10
-    working_directory: /go/src/github.com/circleci/circleci-cli
+    working_directory: /go/src/github.com/CircleCI/circleci-cli
     steps:
       - checkout
       - restore_cache:
@@ -74,7 +74,7 @@ jobs:
     environment:
       GORELEASER_URL:  https://github.com/goreleaser/goreleaser/releases/download/v0.77.1/goreleaser_amd64.deb
 
-    working_directory: /go/src/github.com/circleci/circleci-cli
+    working_directory: /go/src/github.com/CircleCI/circleci-cli
     steps:
       - checkout
       - restore_cache:
diff --git a/Makefile b/Makefile
index c6a9019c9..ef62acb69 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@ GOFILES = $(shell find . -name '*.go' -not -path './vendor/*')
 
 OS = $(shell uname)
 
-CLIPATH=github.com/circleci/circleci-cli
+CLIPATH=github.com/CircleCI-Public/circleci-cli
 
 EXECUTABLE=circleci-cli
 BUILD_DIR=build
diff --git a/client/client.go b/client/client.go
index b88d6c381..42cc31f5c 100644
--- a/client/client.go
+++ b/client/client.go
@@ -3,7 +3,7 @@ package client
 import (
 	"context"
 
-	"github.com/circleci/circleci-cli/logger"
+	"github.com/CircleCI-Public/circleci-cli/logger"
 	"github.com/machinebox/graphql"
 )
 
diff --git a/cmd/cmd_suite_test.go b/cmd/cmd_suite_test.go
index 593f57238..4c2a4f02d 100644
--- a/cmd/cmd_suite_test.go
+++ b/cmd/cmd_suite_test.go
@@ -12,7 +12,7 @@ var pathCLI string
 
 var _ = BeforeSuite(func() {
 	var err error
-	pathCLI, err = gexec.Build("github.com/circleci/circleci-cli")
+	pathCLI, err = gexec.Build("github.com/CircleCI-Public/circleci-cli")
 	Ω(err).ShouldNot(HaveOccurred())
 })
 
diff --git a/cmd/collapse.go b/cmd/collapse.go
index b3c4eef09..cb7c625b5 100644
--- a/cmd/collapse.go
+++ b/cmd/collapse.go
@@ -3,7 +3,7 @@ package cmd
 import (
 	"regexp"
 
-	"github.com/circleci/circleci-cli/filetree"
+	"github.com/CircleCI-Public/circleci-cli/filetree"
 	"github.com/spf13/cobra"
 	yaml "gopkg.in/yaml.v2"
 )
diff --git a/cmd/query.go b/cmd/query.go
index 65cc5c8bb..0ecbb4b2c 100644
--- a/cmd/query.go
+++ b/cmd/query.go
@@ -4,7 +4,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/circleci/circleci-cli/client"
+	"github.com/CircleCI-Public/circleci-cli/client"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
diff --git a/cmd/root.go b/cmd/root.go
index 3b0e5f096..eaf11bb32 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -4,8 +4,8 @@ import (
 	"os"
 	"path"
 
-	"github.com/circleci/circleci-cli/logger"
-	"github.com/circleci/circleci-cli/settings"
+	"github.com/CircleCI-Public/circleci-cli/logger"
+	"github.com/CircleCI-Public/circleci-cli/settings"
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
diff --git a/filetree/filetree_test.go b/filetree/filetree_test.go
index f7910b8ad..fc3d4deda 100644
--- a/filetree/filetree_test.go
+++ b/filetree/filetree_test.go
@@ -11,7 +11,7 @@ import (
 	. "github.com/onsi/gomega"
 	yaml "gopkg.in/yaml.v2"
 
-	"github.com/circleci/circleci-cli/filetree"
+	"github.com/CircleCI-Public/circleci-cli/filetree"
 )
 
 var _ = Describe("filetree", func() {
diff --git a/main.go b/main.go
index 10948c3af..8948a918d 100644
--- a/main.go
+++ b/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/circleci/circleci-cli/cmd"
+	"github.com/CircleCI-Public/circleci-cli/cmd"
 )
 
 func main() {