diff --git a/build/uuid-redirects.json b/build/uuid-redirects.json
index bb57935bbf9..5f94c4f3348 100644
--- a/build/uuid-redirects.json
+++ b/build/uuid-redirects.json
@@ -617,6 +617,7 @@
     "Compendium.pf2e.spell-effects.Item.u0AznkjTZAVnCMNp": "Compendium.pf2e.spell-effects.Item.Spell Effect: Evolution Surge",
     "Compendium.pf2e.spell-effects.Item.Um25D1qLtZWOSBny": "Compendium.pf2e.spell-effects.Item.Spell Effect: Shifting Form",
     "Compendium.pf2e.spell-effects.Item.v051JKN0Dj3ve5cF": "Compendium.pf2e.spell-effects.Item.Spell Effect: Sweet Dream",
+    "Compendium.pf2e.spell-effects.Item.V7jAnItnVqtfCAKt": "Compendium.pf2e.spell-effects.Item.Spell Effect: Dragon Wings",
     "Compendium.pf2e.spell-effects.Item.W0PjCMyGOpKAuyKX": "Compendium.pf2e.spell-effects.Item.Spell Effect: Weapon Surge",
     "Compendium.pf2e.spell-effects.Item.w9HpSwBLByNyRXvi": "Compendium.pf2e.spell-effects.Item.Spell Effect: Blessing of Defiance",
     "Compendium.pf2e.spell-effects.Item.wqh8D9kHGItZBvtQ": "Compendium.pf2e.spell-effects.Item.Spell Effect: Mantle of the Frozen Heart",
diff --git a/packs/fists-of-the-ruby-phoenix-bestiary/yabin-the-just-level-13.json b/packs/fists-of-the-ruby-phoenix-bestiary/yabin-the-just-level-13.json
index f94a2525b34..fc26c195e5a 100644
--- a/packs/fists-of-the-ruby-phoenix-bestiary/yabin-the-just-level-13.json
+++ b/packs/fists-of-the-ruby-phoenix-bestiary/yabin-the-just-level-13.json
@@ -651,7 +651,7 @@
             "type": "spell"
         },
         {
-            "_id": "dJFsJViYziNLzxiA",
+            "_id": "to1OOEfhkeYyx4FP",
             "_stats": {
                 "compendiumSource": "Compendium.pf2e.spells-srd.Item.HWJODX2zPg5cg34F"
             },
@@ -667,7 +667,7 @@
                 "damage": {},
                 "defense": null,
                 "description": {
-                    "value": "<p>Leathery wings sprout from your back, giving you a fly Speed of 60 feet or your Speed, whichever is faster. When this spell's duration would end, if you're still flying, you float to the ground, as @UUID[Compendium.pf2e.spells-srd.Item.Gentle Landing].</p>\n<p>You can increase the Focus Point cost by 1 to gain the effects of @UUID[Compendium.pf2e.spells-srd.Item.Flurry of Claws] as long as the wings last.</p>\n<hr />\n<p><strong>Heightened (8th)</strong> The duration increases to 10 minutes.</p>\n<p>@UUID[Compendium.pf2e.spell-effects.Item.Spell Effect: Dragon Wings (60 Feet)]</p>\n<p>@UUID[Compendium.pf2e.spell-effects.Item.Spell Effect: Dragon Wings (Own Speed)]</p>"
+                    "value": "<p>Leathery wings sprout from your back, giving you a fly Speed of 60 feet or your Speed, whichever is faster. If you're still flying when this spell's duration would end, you float to the ground, as with the effects of @UUID[Compendium.pf2e.spells-srd.Item.Gentle Landing].</p><hr /><p><strong>Heightened (8th)</strong> The duration increases to 10 minutes.</p>\n<p>@UUID[Compendium.pf2e.spell-effects.Item.Spell Effect: Dragon Wings]</p>"
                 },
                 "duration": {
                     "sustained": false,
@@ -680,9 +680,9 @@
                     "value": "ZnwQXnAfjZCA7iwf"
                 },
                 "publication": {
-                    "license": "OGL",
-                    "remaster": false,
-                    "title": "Pathfinder Core Rulebook"
+                    "license": "ORC",
+                    "remaster": true,
+                    "title": "Pathfinder Player Core 2"
                 },
                 "range": {
                     "value": ""
diff --git a/packs/kingmaker-bestiary/phomandala.json b/packs/kingmaker-bestiary/phomandala.json
index edef8e0f899..690ea44e1b9 100644
--- a/packs/kingmaker-bestiary/phomandala.json
+++ b/packs/kingmaker-bestiary/phomandala.json
@@ -1384,7 +1384,7 @@
             "type": "spell"
         },
         {
-            "_id": "ddoFF2lIQxYtb6Xu",
+            "_id": "5892OuvllKOy6apd",
             "_stats": {
                 "compendiumSource": "Compendium.pf2e.spells-srd.Item.HWJODX2zPg5cg34F"
             },
@@ -1400,7 +1400,7 @@
                 "damage": {},
                 "defense": null,
                 "description": {
-                    "value": "<p>Leathery wings sprout from your back, giving you a fly Speed of 60 feet or your Speed, whichever is faster. When this spell's duration would end, if you're still flying, you float to the ground, as @UUID[Compendium.pf2e.spells-srd.Item.Gentle Landing].</p>\n<p>You can increase the Focus Point cost by 1 to gain the effects of @UUID[Compendium.pf2e.spells-srd.Item.Flurry of Claws] as long as the wings last.</p>\n<hr />\n<p><strong>Heightened (8th)</strong> The duration increases to 10 minutes.</p>\n<p>@UUID[Compendium.pf2e.spell-effects.Item.Spell Effect: Dragon Wings (60 Feet)]</p>\n<p>@UUID[Compendium.pf2e.spell-effects.Item.Spell Effect: Dragon Wings (Own Speed)]</p>"
+                    "value": "<p>Leathery wings sprout from your back, giving you a fly Speed of 60 feet or your Speed, whichever is faster. If you're still flying when this spell's duration would end, you float to the ground, as with the effects of @UUID[Compendium.pf2e.spells-srd.Item.Gentle Landing].</p><hr /><p><strong>Heightened (8th)</strong> The duration increases to 10 minutes.</p>\n<p>@UUID[Compendium.pf2e.spell-effects.Item.Spell Effect: Dragon Wings]</p>"
                 },
                 "duration": {
                     "sustained": false,
@@ -1413,9 +1413,9 @@
                     "value": "DxTspLZpQI4zVPoa"
                 },
                 "publication": {
-                    "license": "OGL",
-                    "remaster": false,
-                    "title": "Pathfinder Core Rulebook"
+                    "license": "ORC",
+                    "remaster": true,
+                    "title": "Pathfinder Player Core 2"
                 },
                 "range": {
                     "value": ""
diff --git a/packs/spell-effects/spell-effect-dragon-wings-60-feet.json b/packs/spell-effects/spell-effect-dragon-wings-60-feet.json
deleted file mode 100644
index 3cd42c86eaf..00000000000
--- a/packs/spell-effects/spell-effect-dragon-wings-60-feet.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "_id": "V7jAnItnVqtfCAKt",
-    "img": "icons/creatures/abilities/wing-batlike-red-pink.webp",
-    "name": "Spell Effect: Dragon Wings (60 Feet)",
-    "system": {
-        "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Dragon Wings]</p>\n<p>You gain a 60 foot fly Speed.</p>"
-        },
-        "duration": {
-            "expiry": "turn-start",
-            "sustained": false,
-            "unit": "minutes",
-            "value": 1
-        },
-        "level": {
-            "value": 5
-        },
-        "publication": {
-            "license": "ORC",
-            "remaster": true,
-            "title": "Pathfinder Player Core 2"
-        },
-        "rules": [
-            {
-                "key": "BaseSpeed",
-                "selector": "fly",
-                "value": 60
-            }
-        ],
-        "start": {
-            "initiative": null,
-            "value": 0
-        },
-        "tokenIcon": {
-            "show": true
-        },
-        "traits": {
-            "rarity": "common",
-            "value": []
-        }
-    },
-    "type": "effect"
-}
diff --git a/packs/spell-effects/spell-effect-dragon-wings-own-speed.json b/packs/spell-effects/spell-effect-dragon-wings.json
similarity index 86%
rename from packs/spell-effects/spell-effect-dragon-wings-own-speed.json
rename to packs/spell-effects/spell-effect-dragon-wings.json
index 9a0ef370f45..8d192db23d9 100644
--- a/packs/spell-effects/spell-effect-dragon-wings-own-speed.json
+++ b/packs/spell-effects/spell-effect-dragon-wings.json
@@ -1,10 +1,10 @@
 {
     "_id": "jy4edd6pvJvJgOSP",
     "img": "icons/creatures/abilities/wing-batlike-red-pink.webp",
-    "name": "Spell Effect: Dragon Wings (Own Speed)",
+    "name": "Spell Effect: Dragon Wings",
     "system": {
         "description": {
-            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Dragon Wings]</p>\n<p>You gain a fly Speed equal to your Speed.</p>"
+            "value": "<p>Granted by @UUID[Compendium.pf2e.spells-srd.Item.Dragon Wings]</p>\n<p>You gain a fly Speed equal to your Speed or 60 feet, whichever is greater.</p>"
         },
         "duration": {
             "expiry": "turn-start",
@@ -24,7 +24,7 @@
             {
                 "key": "BaseSpeed",
                 "selector": "fly",
-                "value": "@actor.attributes.speed.total"
+                "value": "max(60,@actor.attributes.speed.total)"
             }
         ],
         "start": {
diff --git a/packs/spells/dragon-wings.json b/packs/spells/dragon-wings.json
index a5992a1098b..59b77a2cf08 100644
--- a/packs/spells/dragon-wings.json
+++ b/packs/spells/dragon-wings.json
@@ -11,7 +11,7 @@
         "damage": {},
         "defense": null,
         "description": {
-            "value": "<p>Leathery wings sprout from your back, giving you a fly Speed of 60 feet or your Speed, whichever is faster. If you're still flying when this spell's duration would end, you float to the ground, as with the effects of @UUID[Compendium.pf2e.spells-srd.Item.Gentle Landing].</p><hr /><p><strong>Heightened (8th)</strong> The duration increases to 10 minutes.</p>\n<p>@UUID[Compendium.pf2e.spell-effects.Item.Spell Effect: Dragon Wings (60 Feet)]</p>\n<p>@UUID[Compendium.pf2e.spell-effects.Item.Spell Effect: Dragon Wings (Own Speed)]</p>"
+            "value": "<p>Leathery wings sprout from your back, giving you a fly Speed of 60 feet or your Speed, whichever is faster. If you're still flying when this spell's duration would end, you float to the ground, as with the effects of @UUID[Compendium.pf2e.spells-srd.Item.Gentle Landing].</p><hr /><p><strong>Heightened (8th)</strong> The duration increases to 10 minutes.</p>\n<p>@UUID[Compendium.pf2e.spell-effects.Item.Spell Effect: Dragon Wings]</p>"
         },
         "duration": {
             "sustained": false,