diff --git a/eslint/babel-eslint-shared-fixtures/config/babel.config.decorators-legacy.js b/eslint/babel-eslint-shared-fixtures/config/babel.config.decorators-legacy.js
index dbad846412e6..216a0eed4d80 100644
--- a/eslint/babel-eslint-shared-fixtures/config/babel.config.decorators-legacy.js
+++ b/eslint/babel-eslint-shared-fixtures/config/babel.config.decorators-legacy.js
@@ -2,5 +2,5 @@
 
 module.exports = {
   presets: [["@babel/preset-env", { forceAllTransforms: true }]],
-  plugins: [["@babel/plugin-proposal-decorators", { legacy: true }]],
+  plugins: [["@babel/plugin-proposal-decorators", { version: "legacy" }]],
 };
diff --git a/eslint/babel-eslint-shared-fixtures/config/babel.config.js b/eslint/babel-eslint-shared-fixtures/config/babel.config.js
index 2e64c5214c20..426de60b219f 100644
--- a/eslint/babel-eslint-shared-fixtures/config/babel.config.js
+++ b/eslint/babel-eslint-shared-fixtures/config/babel.config.js
@@ -9,7 +9,7 @@ module.exports = {
   plugins: [
     "@babel/plugin-syntax-export-default-from",
     "@babel/plugin-proposal-class-properties",
-    ["@babel/plugin-proposal-decorators", { decoratorsBeforeExport: false }],
+    ["@babel/plugin-proposal-decorators", { version: "2021-12" }],
     ["@babel/plugin-proposal-pipeline-operator", { proposal: "minimal" }],
     "@babel/plugin-proposal-private-methods",
     "@babel/plugin-proposal-do-expressions",
diff --git a/packages/babel-core/test/fixtures/option-manager/presets/es2015_default_function.js b/packages/babel-core/test/fixtures/option-manager/presets/es2015_default_function.js
index a58f2d700df9..04d8c5d688de 100644
--- a/packages/babel-core/test/fixtures/option-manager/presets/es2015_default_function.js
+++ b/packages/babel-core/test/fixtures/option-manager/presets/es2015_default_function.js
@@ -15,7 +15,7 @@ exports.default = function () {
     plugins: [
       [
         require('../../../../../babel-plugin-syntax-decorators'),
-        { legacy: true }
+        { version: 'legacy' },
       ],
     ]
   };
diff --git a/packages/babel-core/test/fixtures/option-manager/presets/es2015_default_object.js b/packages/babel-core/test/fixtures/option-manager/presets/es2015_default_object.js
index cd1208bf358b..159eeb2ad406 100644
--- a/packages/babel-core/test/fixtures/option-manager/presets/es2015_default_object.js
+++ b/packages/babel-core/test/fixtures/option-manager/presets/es2015_default_object.js
@@ -12,7 +12,7 @@ module.exports = function() {
     plugins: [
       [
         require('../../../../../babel-plugin-syntax-decorators'),
-        { legacy: true }
+        { version: 'legacy' }
       ],
     ]
   };
diff --git a/packages/babel-core/test/fixtures/option-manager/presets/es5_function.js b/packages/babel-core/test/fixtures/option-manager/presets/es5_function.js
index 539c58e1646a..a6e38f7d7c39 100644
--- a/packages/babel-core/test/fixtures/option-manager/presets/es5_function.js
+++ b/packages/babel-core/test/fixtures/option-manager/presets/es5_function.js
@@ -3,7 +3,7 @@ module.exports = function () {
     plugins: [
       [
         require('../../../../../babel-plugin-syntax-decorators'),
-        { legacy: true }
+        { version: 'legacy' },
       ],
     ]
   };
diff --git a/packages/babel-core/test/fixtures/option-manager/presets/es5_object.js b/packages/babel-core/test/fixtures/option-manager/presets/es5_object.js
index 30c4d017c4eb..677744af9bba 100644
--- a/packages/babel-core/test/fixtures/option-manager/presets/es5_object.js
+++ b/packages/babel-core/test/fixtures/option-manager/presets/es5_object.js
@@ -3,7 +3,7 @@ module.exports = function() {
     plugins: [
       [
         require('../../../../../babel-plugin-syntax-decorators'),
-        { legacy: true }
+        { version: 'legacy' }
       ],
     ]
   };
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/exec.ts b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/2018-12-ignore-abstract-methods/exec.ts
similarity index 100%
rename from packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/exec.ts
rename to packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/2018-12-ignore-abstract-methods/exec.ts
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/input.ts b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/2018-12-ignore-abstract-methods/input.ts
similarity index 100%
rename from packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/input.ts
rename to packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/2018-12-ignore-abstract-methods/input.ts
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/options.json b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/2018-12-ignore-abstract-methods/options.json
similarity index 84%
rename from packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/options.json
rename to packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/2018-12-ignore-abstract-methods/options.json
index 1783c7d93113..8f2ceedbdf82 100644
--- a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/options.json
+++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/2018-12-ignore-abstract-methods/options.json
@@ -1,4 +1,5 @@
 {
+  "BABEL_8_BREAKING": false,
   "presets": [["typescript"]],
   "plugins": [
     ["proposal-decorators", { "decoratorsBeforeExport": true }],
diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/2018-12-ignore-abstract-methods/output.js
similarity index 100%
rename from packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/output.js
rename to packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/2018-12-ignore-abstract-methods/output.js
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2018-09-transformation/async-generator-method/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2018-09-transformation/async-generator-method/options.json
index 57fadf095498..f9c4ee8bb7f5 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/2018-09-transformation/async-generator-method/options.json
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/2018-09-transformation/async-generator-method/options.json
@@ -1,6 +1,6 @@
 {
   "plugins": [
-    ["proposal-decorators", { "decoratorsBeforeExport": false }],
+    ["proposal-decorators", { "decoratorsBeforeExport": true }],
     "proposal-class-properties"
   ]
 }
diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/2018-09-transformation/class-decorators-yield-await/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/2018-09-transformation/class-decorators-yield-await/options.json
index 57fadf095498..f9c4ee8bb7f5 100644
--- a/packages/babel-plugin-proposal-decorators/test/fixtures/2018-09-transformation/class-decorators-yield-await/options.json
+++ b/packages/babel-plugin-proposal-decorators/test/fixtures/2018-09-transformation/class-decorators-yield-await/options.json
@@ -1,6 +1,6 @@
 {
   "plugins": [
-    ["proposal-decorators", { "decoratorsBeforeExport": false }],
+    ["proposal-decorators", { "decoratorsBeforeExport": true }],
     "proposal-class-properties"
   ]
 }
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-at/class-decorator/options.json b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-at/class-decorator/options.json
index d9bc8f93e7d4..dbe394c78668 100644
--- a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-at/class-decorator/options.json
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-at/class-decorator/options.json
@@ -1,6 +1,8 @@
 {
   "plugins": [
     ["proposal-pipeline-operator", { "proposal": "hack", "topicToken": "@@" }],
-    ["proposal-decorators", { "decoratorsBeforeExport": false }]
+    ["proposal-decorators", { "version": "2021-12" }],
+    "proposal-class-static-block",
+    "proposal-class-properties"
   ]
 }
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-at/class-decorator/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-at/class-decorator/output.js
index 3d2b64ddf390..490ebb4246a4 100644
--- a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-at/class-decorator/output.js
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-at/class-decorator/output.js
@@ -1,25 +1,16 @@
+var _initClass, _decorated_class, _class;
+
 const expectedValue = 42;
 
 function decorator(target) {
   target.decoratorValue = expectedValue;
 }
 
-const result = babelHelpers.decorate([decorator], function (_initialize) {
-  "use strict";
-
-  class _class {
-    constructor() {
-      _initialize(this);
-
-      this.value = expectedValue;
-    }
-
+const result = ((_class = class {
+  constructor() {
+    this.value = expectedValue;
   }
 
-  return {
-    F: _class,
-    d: []
-  };
-});
+}, [_decorated_class, _initClass] = babelHelpers.applyDecs(_class, [], [decorator]), _initClass()), _decorated_class);
 expect(result.decoratorValue).toBe(expectedValue);
 expect(new result().value).toBe(expectedValue);
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-caret/class-decorator/options.json b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-caret/class-decorator/options.json
index 15526f1d0636..da98f89f4ef9 100644
--- a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-caret/class-decorator/options.json
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-caret/class-decorator/options.json
@@ -1,6 +1,8 @@
 {
   "plugins": [
     ["proposal-pipeline-operator", { "proposal": "hack", "topicToken": "^^" }],
-    ["proposal-decorators", { "decoratorsBeforeExport": false }]
+    ["proposal-decorators", { "version": "2021-12" }],
+    "proposal-class-static-block",
+    "proposal-class-properties"
   ]
 }
diff --git a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-caret/class-decorator/output.js b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-caret/class-decorator/output.js
index 3d2b64ddf390..490ebb4246a4 100644
--- a/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-caret/class-decorator/output.js
+++ b/packages/babel-plugin-proposal-pipeline-operator/test/fixtures/hack-double-caret/class-decorator/output.js
@@ -1,25 +1,16 @@
+var _initClass, _decorated_class, _class;
+
 const expectedValue = 42;
 
 function decorator(target) {
   target.decoratorValue = expectedValue;
 }
 
-const result = babelHelpers.decorate([decorator], function (_initialize) {
-  "use strict";
-
-  class _class {
-    constructor() {
-      _initialize(this);
-
-      this.value = expectedValue;
-    }
-
+const result = ((_class = class {
+  constructor() {
+    this.value = expectedValue;
   }
 
-  return {
-    F: _class,
-    d: []
-  };
-});
+}, [_decorated_class, _initClass] = babelHelpers.applyDecs(_class, [], [decorator]), _initClass()), _decorated_class);
 expect(result.decoratorValue).toBe(expectedValue);
 expect(new result().value).toBe(expectedValue);
diff --git a/packages/babel-standalone/test/babel.js b/packages/babel-standalone/test/babel.js
index 8af895cc4149..d438d43c5980 100644
--- a/packages/babel-standalone/test/babel.js
+++ b/packages/babel-standalone/test/babel.js
@@ -238,7 +238,7 @@ const require = createRequire(import.meta.url);
       it("#11628 - supports stage-0 passing importAssertionsVersion to stage-1", () => {
         expect(() =>
           Babel.transform("const getMessage = () => 'Hello World'", {
-            presets: [["stage-0", { decoratorsBeforeExport: false }]],
+            presets: [["stage-0", { decoratorsLegacy: true }]],
           }),
         ).not.toThrow();
       });
diff --git a/packages/babel-standalone/test/preset-stage-1.test.js b/packages/babel-standalone/test/preset-stage-1.test.js
index b40159b77035..86f39129ce2a 100644
--- a/packages/babel-standalone/test/preset-stage-1.test.js
+++ b/packages/babel-standalone/test/preset-stage-1.test.js
@@ -11,7 +11,7 @@ const require = createRequire(import.meta.url);
 
     it("should parser decimal literal", () => {
       const output = Babel.transform("0.3m", {
-        presets: [["stage-1", { decoratorsBeforeExport: true }]],
+        presets: [["stage-1", { decoratorsLegacy: true }]],
       }).code;
       expect(output).toBe("0.3m;");
     });
@@ -23,7 +23,7 @@ const require = createRequire(import.meta.url);
             "stage-1",
             {
               pipelineProposal: "hack",
-              decoratorsBeforeExport: true,
+              decoratorsLegacy: true,
             },
           ],
         ],
@@ -40,7 +40,7 @@ const require = createRequire(import.meta.url);
               pipelineProposal: "hack",
               pipelineTopicToken: "#",
               recordAndTupleSyntax: "bar",
-              decoratorsBeforeExport: true,
+              decoratorsLegacy: true,
             },
           ],
         ],