diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77f6cf2829..8deba4b0b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -17,6 +17,8 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🧹 Chores
 
+- Deprecate `--skip-credentials-check` flag because it doesn't do anything and is no longer needed.([#442](https://github.com/expo/eas-cli/pull/442) by [@brentvatne](https://github.com/brentvatne))
+
 ## [0.17.0](https://github.com/expo/eas-cli/releases/tag/v0.17.0) - 2021-06-02
 
 ### 🐛 Bug fixes
diff --git a/packages/eas-cli/src/build/android/build.ts b/packages/eas-cli/src/build/android/build.ts
index d55707d226..1d8f910425 100644
--- a/packages/eas-cli/src/build/android/build.ts
+++ b/packages/eas-cli/src/build/android/build.ts
@@ -136,7 +136,6 @@ async function ensureAndroidCredentialsAsync(
         projectName: ctx.commandCtx.projectName,
         androidApplicationIdentifier,
       },
-      skipCredentialsCheck: ctx.commandCtx.skipCredentialsCheck,
     }
   );
   const { credentialsSource } = ctx.buildProfile;
diff --git a/packages/eas-cli/src/build/context.ts b/packages/eas-cli/src/build/context.ts
index 9b52953a0f..296a8a7248 100644
--- a/packages/eas-cli/src/build/context.ts
+++ b/packages/eas-cli/src/build/context.ts
@@ -21,7 +21,6 @@ export interface CommandContext {
   nonInteractive: boolean;
   local: boolean;
   clearCache: boolean;
-  skipCredentialsCheck: boolean;
   skipProjectConfiguration: boolean;
   waitForBuildEnd: boolean;
 }
@@ -35,7 +34,6 @@ export async function createCommandContextAsync({
   nonInteractive = false,
   local,
   clearCache = false,
-  skipCredentialsCheck = false,
   skipProjectConfiguration = false,
   waitForBuildEnd,
 }: {
@@ -47,7 +45,6 @@ export async function createCommandContextAsync({
   nonInteractive: boolean;
   local: boolean;
   clearCache: boolean;
-  skipCredentialsCheck: boolean;
   skipProjectConfiguration: boolean;
   waitForBuildEnd: boolean;
 }): Promise<CommandContext> {
@@ -67,7 +64,6 @@ export async function createCommandContextAsync({
     nonInteractive,
     local,
     clearCache,
-    skipCredentialsCheck,
     skipProjectConfiguration,
     waitForBuildEnd,
   };
diff --git a/packages/eas-cli/src/commands/build/index.ts b/packages/eas-cli/src/commands/build/index.ts
index 97f3949f02..e2510de69d 100644
--- a/packages/eas-cli/src/commands/build/index.ts
+++ b/packages/eas-cli/src/commands/build/index.ts
@@ -25,7 +25,7 @@ export default class Build extends EasCommand {
     platform: flags.enum({ char: 'p', options: ['android', 'ios', 'all'] }),
     'skip-credentials-check': flags.boolean({
       default: false,
-      description: 'Skip validation of build credentials',
+      hidden: true,
     }),
     'skip-project-configuration': flags.boolean({
       default: false,
@@ -64,6 +64,14 @@ export default class Build extends EasCommand {
     const platform =
       (flags.platform as RequestedPlatform | undefined) ?? (await promptForPlatformAsync());
 
+    if (flags['skip-credentials-check']) {
+      Log.warnDeprecatedFlag(
+        'skip-credentials-check',
+        'Build credential validation is always skipped with the --non-interactive flag. You can also skip interactively.'
+      );
+      Log.newLine();
+    }
+
     const projectDir = (await findProjectRootAsync()) ?? process.cwd();
     let { exp } = getConfig(projectDir, { skipSDKVersionRequirement: true });
     const projectId = await getProjectIdAsync(exp);
@@ -89,7 +97,6 @@ export default class Build extends EasCommand {
       projectId,
       nonInteractive,
       clearCache: flags['clear-cache'],
-      skipCredentialsCheck: flags['skip-credentials-check'],
       local: flags.local,
       skipProjectConfiguration: flags['skip-project-configuration'],
       waitForBuildEnd: flags.wait,
diff --git a/packages/eas-cli/src/credentials/android/AndroidCredentialsProvider.ts b/packages/eas-cli/src/credentials/android/AndroidCredentialsProvider.ts
index 0bee27b4d4..c137f1c37d 100644
--- a/packages/eas-cli/src/credentials/android/AndroidCredentialsProvider.ts
+++ b/packages/eas-cli/src/credentials/android/AndroidCredentialsProvider.ts
@@ -15,7 +15,6 @@ export interface AndroidCredentials {
 
 interface Options {
   app: AppLookupParams;
-  skipCredentialsCheck?: boolean;
 }
 
 export default class AndroidCredentialsProvider {
diff --git a/packages/eas-cli/src/log.ts b/packages/eas-cli/src/log.ts
index bdb97a8e24..eaed64da31 100644
--- a/packages/eas-cli/src/log.ts
+++ b/packages/eas-cli/src/log.ts
@@ -35,6 +35,10 @@ export default class Log {
     Log.consoleLog(...Log.withTextColor(args, chalk.gray));
   }
 
+  public static warnDeprecatedFlag(flag: string, message: string) {
+    Log.warn(`› ${chalk.bold('--' + flag)} flag is deprecated. ${message}`);
+  }
+
   public static succeed(message: string) {
     ora().succeed(message);
   }