diff --git a/integration-tests/cli/help.test.js b/integration-tests/cli/help.test.js
index 8219516316..001c379ade 100644
--- a/integration-tests/cli/help.test.js
+++ b/integration-tests/cli/help.test.js
@@ -32,7 +32,7 @@ test('--help should return help on stdout and zero exit code', async function (t
     '--engine-wasm <engine-wasm>                             The JS engine Wasm file path',
     '--module-mode                            [experimental] Run all sources as native modules,',
     'with full error stack support.',
-    '--enable-experimental-aot                               Enable experimental AOT compilation for performance',
+    '--enable-aot                                            Enable AOT compilation for performance',
     '--enable-experimental-high-resolution-time-methods      Enable experimental high-resolution fastly.now() method',
     '--enable-experimental-top-level-await                   Enable experimental top level await',
     'ARGS:',
@@ -61,7 +61,7 @@ test('-h should return help on stdout and zero exit code', async function (t) {
     '--engine-wasm <engine-wasm>                             The JS engine Wasm file path',
     '--module-mode                            [experimental] Run all sources as native modules,',
     'with full error stack support.',
-    '--enable-experimental-aot                               Enable experimental AOT compilation for performance',
+    '--enable-aot                                            Enable AOT compilation for performance',
     '--enable-experimental-high-resolution-time-methods      Enable experimental high-resolution fastly.now() method',
     '--enable-experimental-top-level-await                   Enable experimental top level await',
     'ARGS:',
diff --git a/integration-tests/js-compute/test.js b/integration-tests/js-compute/test.js
index b4c5e8f3ed..a2b1516ec2 100755
--- a/integration-tests/js-compute/test.js
+++ b/integration-tests/js-compute/test.js
@@ -85,7 +85,7 @@ const config = TOML.parse(
 config.name = serviceName;
 if (aot) {
   const buildArgs = config.scripts.build.split(' ');
-  buildArgs.splice(-1, null, '--enable-experimental-aot');
+  buildArgs.splice(-1, null, '--enable-aot');
   config.scripts.build = buildArgs.join(' ');
 }
 if (debugBuild) {
diff --git a/src/parseInputs.js b/src/parseInputs.js
index 609a10d547..c5e674196d 100644
--- a/src/parseInputs.js
+++ b/src/parseInputs.js
@@ -39,7 +39,15 @@ export async function parseInputs(cliInputs) {
         bundle = true;
         break;
       }
+      case '--enable-aot': {
+        enableAOT = true;
+        break;
+      }
       case '--enable-experimental-aot': {
+        console.error(
+          'Warning: --enable-experimental-aot flag is now --enable-aot. The old flag continues\n' +
+            'to work for now, but please update your build invocation!',
+        );
         enableAOT = true;
         break;
       }
diff --git a/src/printHelp.js b/src/printHelp.js
index 0ee51b0495..3e35cb6b3b 100644
--- a/src/printHelp.js
+++ b/src/printHelp.js
@@ -16,7 +16,7 @@ OPTIONS:
     --engine-wasm <engine-wasm>                             The JS engine Wasm file path
     --module-mode                            [experimental] Run all sources as native modules,
                                                             with full error stack support.
-    --enable-experimental-aot                               Enable experimental AOT compilation for performance
+    --enable-aot                                            Enable AOT compilation for performance
     --enable-experimental-high-resolution-time-methods      Enable experimental high-resolution fastly.now() method
     --enable-experimental-top-level-await                   Enable experimental top level await