diff --git a/.github/workflows/ember-version-enforcement.yml b/.github/workflows/ember-version-enforcement.yml
index 9a7515e1e26..4d49a20cf29 100644
--- a/.github/workflows/ember-version-enforcement.yml
+++ b/.github/workflows/ember-version-enforcement.yml
@@ -32,14 +32,14 @@ jobs:
           node -e '
             const version = require("ember-source/package.json").version;
             console.log("Ember version is", version);
-            if(version.split(".")[0] !== "3"){
-              console.log(`Ember has unexpectedly been upgraded to version ${version}. If this is intentional, remove this github workflow.`);
+            if(version.split(".")[0] !== "5"){
+              console.log(`Ember has unexpectedly been downgraded to version ${version}. If this is intentional, remove this github workflow.`);
               process.exit(1);
             }
           '
-      - name: Upgrade ember
+      - name: Downgrade ember
         run: |
-          script/switch_ember_version 5
+          script/switch_ember_version 3
           cd app/assets/javascripts/discourse
           yarn install
       - name: "Check upgraded version"
@@ -48,19 +48,19 @@ jobs:
           node -e '
             const version = require("ember-source/package.json").version;
             console.log("Ember version is", version);
-            if(version.split(".")[0] !== "5"){
-              console.log(`Expected Ember 5, but found ${version}`);
+            if(version.split(".")[0] !== "3"){
+              console.log(`Expected Ember 3, but found ${version}`);
               process.exit(1);
             }
           '
-      - name: "Revert ember upgrade"
+      - name: "Revert ember downgrade"
         run: |
-          script/switch_ember_version 3
+          script/switch_ember_version 5
       - name: "Ensure no diff"
         run: |
           if [ ! -z "$(git status --porcelain)" ]; then
             echo "Working directory was not clean after upgrading/downgrading ember. Perhaps a lockfile is out-of-date. Run this command to re-sync:"
-            echo "  script/regen_ember_5_lockfile"
+            echo "  script/regen_ember_3_lockfile"
             echo
             echo "Current diff:"
             echo "---------------------------------------------"
diff --git a/.github/workflows/ember-version-lockfiles.yml b/.github/workflows/ember-version-lockfiles.yml
index 7e0bbb48c4a..393e23e810f 100644
--- a/.github/workflows/ember-version-lockfiles.yml
+++ b/.github/workflows/ember-version-lockfiles.yml
@@ -20,11 +20,11 @@ jobs:
         run: |
           # Dependabot gets confused by the symlinks and dumps the updated lockfile in the root of the repo.
           # Let's move it back to the correct location.
-          if [[ -f yarn-ember3.lock ]]; then
-            mv yarn-ember3.lock app/assets/javascripts/yarn-ember3.lock
+          if [[ -f yarn-ember5.lock ]]; then
+            mv yarn-ember5.lock app/assets/javascripts/yarn-ember5.lock
           fi
-      - name: Update ember5 lockfile
-        run: script/regen_ember_5_lockfile
+      - name: Update ember3 lockfile
+        run: script/regen_ember_3_lockfile
       - name: Push changes
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 2e288de468f..1d946224168 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -109,10 +109,6 @@ jobs:
           path: ${{ steps.yarn-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-cachev2
 
-      - name: Upgrade Ember
-        if: matrix.updated_ember == true
-        run: script/switch_ember_version 5
-
       - name: Yarn install
         run: yarn install --frozen-lockfile
 
@@ -369,9 +365,9 @@ jobs:
           path: ${{ steps.yarn-cache-dir.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-cachev2
 
-      - name: Upgrade Ember
-        if: matrix.updated_ember == true
-        run: script/switch_ember_version 5
+      - name: Downgrade Ember
+        if: matrix.updated_ember == false
+        run: script/switch_ember_version 3
 
       - name: Yarn install
         working-directory: ./app/assets/javascripts/discourse
diff --git a/app/assets/javascripts/package.json b/app/assets/javascripts/package.json
index 8be34de0780..895ae195036 120000
--- a/app/assets/javascripts/package.json
+++ b/app/assets/javascripts/package.json
@@ -1 +1 @@
-package-ember3.json
\ No newline at end of file
+package-ember5.json
\ No newline at end of file
diff --git a/app/assets/javascripts/yarn.lock b/app/assets/javascripts/yarn.lock
index dc5a2ab4567..2911a503b09 120000
--- a/app/assets/javascripts/yarn.lock
+++ b/app/assets/javascripts/yarn.lock
@@ -1 +1 @@
-yarn-ember3.lock
\ No newline at end of file
+yarn-ember5.lock
\ No newline at end of file
diff --git a/bin/ember-cli b/bin/ember-cli
index c0d78350f01..f568eba8eb0 100755
--- a/bin/ember-cli
+++ b/bin/ember-cli
@@ -62,7 +62,7 @@ end
 
 system(
   "script/switch_ember_version",
-  ENV["EMBER_VERSION"] || "3",
+  ENV["EMBER_VERSION"] || "5",
   exception: true,
   chdir: RAILS_ROOT,
 )
diff --git a/lib/tasks/assets.rake b/lib/tasks/assets.rake
index 2e77fb6302d..9608297789d 100644
--- a/lib/tasks/assets.rake
+++ b/lib/tasks/assets.rake
@@ -8,12 +8,12 @@ end
 
 task "assets:precompile:build" do
   if ENV["SKIP_EMBER_CLI_COMPILE"] != "1"
-    ember_version = ENV["EMBER_VERSION"] || "3"
+    ember_version = ENV["EMBER_VERSION"] || "5"
 
     raise "Unknown ember version '#{ember_version}'" if !%w[3 5].include?(ember_version)
 
-    if ENV["EMBER_VERSION"] == "5"
-      puts "Upgrading to Ember 5..."
+    if ember_version == "3"
+      puts "Downgrading to Ember 3..."
       system("script/switch_ember_version", ember_version, exception: true, chdir: Rails.root)
       system("yarn install", exception: true, chdir: "app/assets/javascripts/discourse")
     end
diff --git a/script/regen_ember_5_lockfile b/script/regen_ember_3_lockfile
similarity index 79%
rename from script/regen_ember_5_lockfile
rename to script/regen_ember_3_lockfile
index bf68fd5d7ae..b6507d5ba26 100755
--- a/script/regen_ember_5_lockfile
+++ b/script/regen_ember_3_lockfile
@@ -5,12 +5,12 @@ require "fileutils"
 
 # rubocop:disable Discourse/NoChdir
 Dir.chdir("#{__dir__}/../app/assets/javascripts") do
-  FileUtils.rm("yarn-ember5.lock")
-  FileUtils.cp("yarn-ember3.lock", "yarn-ember5.lock")
+  FileUtils.rm("yarn-ember3.lock")
+  FileUtils.cp("yarn-ember5.lock", "yarn-ember3.lock")
 
-  system("#{__dir__}/switch_ember_version", "5", exception: true)
+  system("#{__dir__}/switch_ember_version", "3", exception: true)
 
   system "yarn install", exception: true
 
-  system("#{__dir__}/switch_ember_version", "3", exception: true)
+  system("#{__dir__}/switch_ember_version", "5", exception: true)
 end