diff --git a/lang/en.json b/lang/en.json
index 28c240b0..8aa8a49b 100755
--- a/lang/en.json
+++ b/lang/en.json
@@ -1243,10 +1243,10 @@
             },
             "Tiers": {
                 "singular": "Tier",
-                "tier1": "Tier 1",
-                "tier2": "Tier 2",
-                "tier3": "Tier 3",
-                "tier4": "Tier 4"
+                "1": "Tier 1",
+                "2": "Tier 2",
+                "3": "Tier 3",
+                "4": "Tier 4"
             },
             "Trait": {
                 "single": "Trait",
diff --git a/module/applications/dialogs/beastformDialog.mjs b/module/applications/dialogs/beastformDialog.mjs
index 8e0b1f25..78354f82 100644
--- a/module/applications/dialogs/beastformDialog.mjs
+++ b/module/applications/dialogs/beastformDialog.mjs
@@ -103,7 +103,7 @@ export default class BeastformDialog extends HandlebarsApplicationMixin(Applicat
         const compendiumBeastforms = await game.packs.get(`daggerheart.beastforms`)?.getDocuments();
         context.beastformTiers = [...(compendiumBeastforms ? compendiumBeastforms : []), ...game.items].reduce(
             (acc, x) => {
-                const tier = CONFIG.DH.GENERAL.tiersAlternate[x.system.tier];
+                const tier = CONFIG.DH.GENERAL.tiers[x.system.tier];
                 if (x.type !== 'beastform' || tier.id > this.configData.tierLimit) return acc;
 
                 if (!acc[tier.id]) acc[tier.id] = { label: game.i18n.localize(tier.label), values: {} };
diff --git a/module/applications/sheets-configs/action-config.mjs b/module/applications/sheets-configs/action-config.mjs
index e1a62e0d..df992245 100644
--- a/module/applications/sheets-configs/action-config.mjs
+++ b/module/applications/sheets-configs/action-config.mjs
@@ -114,7 +114,7 @@ export default class DHActionConfig extends DaggerheartSheet(ApplicationV2) {
 
         const settingsTiers = game.settings.get(CONFIG.DH.id, CONFIG.DH.SETTINGS.gameSettings.LevelTiers).tiers;
         context.tierOptions = [
-            { key: 1, label: game.i18n.localize('DAGGERHEART.GENERAL.Tiers.tier1') },
+            { key: 1, label: game.i18n.localize('DAGGERHEART.GENERAL.Tiers.1') },
             ...Object.values(settingsTiers).map(x => ({ key: x.tier, label: x.name }))
         ];
 
diff --git a/module/config/generalConfig.mjs b/module/config/generalConfig.mjs
index 98e5aab8..51e39b85 100644
--- a/module/config/generalConfig.mjs
+++ b/module/config/generalConfig.mjs
@@ -258,44 +258,21 @@ export const deathMoves = {
 };
 
 export const tiers = {
-    tier1: {
-        id: 'tier1',
-        label: 'DAGGERHEART.GENERAL.Tiers.tier1',
-        value: 1
-    },
-    tier2: {
-        id: 'tier2',
-        label: 'DAGGERHEART.GENERAL.Tiers.tier2',
-        value: 2
-    },
-    tier3: {
-        id: 'tier3',
-        label: 'DAGGERHEART.GENERAL.Tiers.tier3',
-        value: 3
-    },
-    tier4: {
-        id: 'tier4',
-        label: 'DAGGERHEART.GENERAL.Tiers.tier4',
-        value: 4
-    }
-};
-
-export const tiersAlternate = {
     1: {
         id: 1,
-        label: 'DAGGERHEART.GENERAL.Tiers.tier1'
+        label: 'DAGGERHEART.GENERAL.Tiers.1'
     },
     2: {
         id: 2,
-        label: 'DAGGERHEART.GENERAL.Tiers.tier2'
+        label: 'DAGGERHEART.GENERAL.Tiers.2'
     },
     3: {
         id: 3,
-        label: 'DAGGERHEART.GENERAL.Tiers.tier3'
+        label: 'DAGGERHEART.GENERAL.Tiers.3'
     },
     4: {
         id: 4,
-        label: 'DAGGERHEART.GENERAL.Tiers.tier4'
+        label: 'DAGGERHEART.GENERAL.Tiers.4'
     }
 };
 
diff --git a/module/data/actor/adversary.mjs b/module/data/actor/adversary.mjs
index 00a19d05..83275e90 100644
--- a/module/data/actor/adversary.mjs
+++ b/module/data/actor/adversary.mjs
@@ -18,10 +18,11 @@ export default class DhpAdversary extends BaseDataActor {
         const fields = foundry.data.fields;
         return {
             ...super.defineSchema(),
-            tier: new fields.StringField({
+            tier: new fields.NumberField({
                 required: true,
+                integer: true,
                 choices: CONFIG.DH.GENERAL.tiers,
-                initial: CONFIG.DH.GENERAL.tiers.tier1.id
+                initial: CONFIG.DH.GENERAL.tiers[1].id
             }),
             type: new fields.StringField({
                 required: true,
diff --git a/module/data/actor/environment.mjs b/module/data/actor/environment.mjs
index 2db1f039..e9a484b3 100644
--- a/module/data/actor/environment.mjs
+++ b/module/data/actor/environment.mjs
@@ -18,10 +18,11 @@ export default class DhEnvironment extends BaseDataActor {
         const fields = foundry.data.fields;
         return {
             ...super.defineSchema(),
-            tier: new fields.StringField({
+            tier: new fields.NumberField({
                 required: true,
+                integer: true,
                 choices: CONFIG.DH.GENERAL.tiers,
-                initial: CONFIG.DH.GENERAL.tiers.tier1.id
+                initial: CONFIG.DH.GENERAL.tiers[1].id
             }),
             type: new fields.StringField({ choices: CONFIG.DH.ACTOR.environmentTypes }),
             impulses: new fields.StringField(),
diff --git a/module/data/item/beastform.mjs b/module/data/item/beastform.mjs
index e6db8406..226504df 100644
--- a/module/data/item/beastform.mjs
+++ b/module/data/item/beastform.mjs
@@ -27,8 +27,8 @@ export default class DHBeastform extends BaseDataItem {
             tier: new fields.NumberField({
                 required: true,
                 integer: true,
-                choices: CONFIG.DH.GENERAL.tiersAlternate,
-                initial: CONFIG.DH.GENERAL.tiersAlternate[1].id
+                choices: CONFIG.DH.GENERAL.tiers,
+                initial: CONFIG.DH.GENERAL.tiers[1].id
             }),
             tokenImg: new fields.FilePathField({
                 initial: 'icons/svg/mystery-man.svg',
@@ -59,7 +59,7 @@ export default class DHBeastform extends BaseDataItem {
             evolved: new fields.SchemaField({
                 maximumTier: new fields.NumberField({
                     integer: true,
-                    choices: CONFIG.DH.GENERAL.tiersAlternate
+                    choices: CONFIG.DH.GENERAL.tiers
                 }),
                 mainTraitBonus: new fields.NumberField({
                     required: true,
@@ -71,7 +71,7 @@ export default class DHBeastform extends BaseDataItem {
             hybrid: new fields.SchemaField({
                 maximumTier: new fields.NumberField({
                     integer: true,
-                    choices: CONFIG.DH.GENERAL.tiersAlternate,
+                    choices: CONFIG.DH.GENERAL.tiers,
                     label: 'DAGGERHEART.ITEMS.Beastform.FIELDS.evolved.maximumTier.label'
                 }),
                 beastformOptions: new fields.NumberField({ required: true, integer: true, initial: 2, min: 2 }),