diff --git a/lib/publish-gh-pages.js b/lib/publish-gh-pages.js
index 6ea086faaed3..b41ec75192af 100755
--- a/lib/publish-gh-pages.js
+++ b/lib/publish-gh-pages.js
@@ -21,13 +21,13 @@ const GIT_USER = process.env.GIT_USER;
 const CURRENT_BRANCH =
   process.env.CIRCLE_BRANCH || shell.exec('git rev-parse --abbrev-ref HEAD');
 const ORGANIZATION_NAME =
-  siteConfig.organizationName ||
   process.env.ORGANIZATION_NAME ||
-  process.env.CIRCLE_PROJECT_USERNAME;
+  process.env.CIRCLE_PROJECT_USERNAME ||
+  siteConfig.organizationName;
 const PROJECT_NAME =
-  siteConfig.projectName ||
   process.env.PROJECT_NAME ||
-  process.env.CIRCLE_PROJECT_REPONAME;
+  process.env.CIRCLE_PROJECT_REPONAME ||
+  siteConfig.projectName;
 const IS_PULL_REQUEST =
   process.env.CI_PULL_REQUEST || process.env.CIRCLE_PULL_REQUEST;
 const USE_SSH = process.env.USE_SSH;