diff --git a/.github/workflows/reusable-build-test-config.yml b/.github/workflows/reusable-build-test-config.yml
index 48f522955a..84a34f5e39 100644
--- a/.github/workflows/reusable-build-test-config.yml
+++ b/.github/workflows/reusable-build-test-config.yml
@@ -61,6 +61,10 @@ on:
         description: "The Codecov token to use for uploading coverage reports."
         required: true
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   build-and-test:
     name: ${{ inputs.config_name }}
@@ -107,7 +111,6 @@ jobs:
           log_verbosity: ${{ runner.os == 'Windows' && 'quiet' || 'verbose' }}
 
       - name: Configure CMake
-        shell: bash
         working-directory: ${{ inputs.build_dir }}
         env:
           BUILD_TYPE: ${{ inputs.build_type }}
@@ -120,7 +123,6 @@ jobs:
             ${{ inputs.cmake_args }}
 
       - name: Build the binary
-        shell: bash
         working-directory: ${{ inputs.build_dir }}
         env:
           BUILD_NPROC: ${{ steps.nproc.outputs.nproc }}
@@ -147,7 +149,6 @@ jobs:
       - name: Check linking (Linux)
         if: ${{ runner.os == 'Linux' }}
         working-directory: ${{ inputs.build_dir }}
-        shell: bash
         run: |
           ldd ./rippled
           if [ "$(ldd ./rippled | grep -E '(libstdc\+\+|libgcc)' | wc -l)" -eq 0 ]; then
@@ -160,7 +161,6 @@ jobs:
       - name: Verify presence of instrumentation (Linux)
         if: ${{ runner.os == 'Linux' && env.ENABLED_VOIDSTAR == 'true' }}
         working-directory: ${{ inputs.build_dir }}
-        shell: bash
         run: |
           ./rippled --version | grep libvoidstar
 
@@ -173,7 +173,6 @@ jobs:
           PARALLELISM: ${{ runner.os == 'Windows' && '1' || steps.nproc.outputs.nproc }}
           # ASAN_OPTIONS: suppressions=${GITHUB_WORKSPACE}/external/asan_suppressions.txt
           # TSAN_OPTIONS: suppressions=${GITHUB_WORKSPACE}/external/tsan_suppressions.txt
-        shell: bash
         run: |
           ctest \
             --output-on-failure \
@@ -183,7 +182,6 @@ jobs:
       - name: Run the embedded tests
         if: ${{ !inputs.build_only }}
         working-directory: ${{ runner.os == 'Windows' && format('{0}/{1}', inputs.build_dir, inputs.build_type) || inputs.build_dir }}
-        shell: bash
         env:
           BUILD_NPROC: ${{ steps.nproc.outputs.nproc }}
         run: |
@@ -191,7 +189,6 @@ jobs:
 
       - name: Debug failure (Linux)
         if: ${{ failure() && runner.os == 'Linux' && !inputs.build_only }}
-        shell: bash
         run: |
           echo "IPv4 local port range:"
           cat /proc/sys/net/ipv4/ip_local_port_range
@@ -204,7 +201,6 @@ jobs:
         env:
           BUILD_NPROC: ${{ steps.nproc.outputs.nproc }}
           BUILD_TYPE: ${{ inputs.build_type }}
-        shell: bash
         run: |
           cmake \
             --build . \
diff --git a/.github/workflows/reusable-strategy-matrix.yml b/.github/workflows/reusable-strategy-matrix.yml
index 129f65938b..c975347307 100644
--- a/.github/workflows/reusable-strategy-matrix.yml
+++ b/.github/workflows/reusable-strategy-matrix.yml
@@ -18,6 +18,10 @@ on:
         description: "The generated strategy matrix."
         value: ${{ jobs.generate-matrix.outputs.matrix }}
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   generate-matrix:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/upload-conan-deps.yml b/.github/workflows/upload-conan-deps.yml
index 4e81914976..853b0f0dac 100644
--- a/.github/workflows/upload-conan-deps.yml
+++ b/.github/workflows/upload-conan-deps.yml
@@ -40,6 +40,10 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
+defaults:
+  run:
+    shell: bash
+
 jobs:
   # Generate the strategy matrix to be used by the following job.
   generate-matrix:
diff --git a/include/xrpl/protocol/Feature.h b/include/xrpl/protocol/Feature.h
index 42f2db41f2..193f0665dc 100644
--- a/include/xrpl/protocol/Feature.h
+++ b/include/xrpl/protocol/Feature.h
@@ -78,12 +78,15 @@ namespace detail {
 #undef XRPL_FEATURE
 #pragma push_macro("XRPL_FIX")
 #undef XRPL_FIX
-#pragma push_macro("XRPL_RETIRE")
-#undef XRPL_RETIRE
+#pragma push_macro("XRPL_RETIRE_FEATURE")
+#undef XRPL_RETIRE_FEATURE
+#pragma push_macro("XRPL_RETIRE_FIX")
+#undef XRPL_RETIRE_FIX
 
 #define XRPL_FEATURE(name, supported, vote) +1
 #define XRPL_FIX(name, supported, vote) +1
-#define XRPL_RETIRE(name) +1
+#define XRPL_RETIRE_FEATURE(name) +1
+#define XRPL_RETIRE_FIX(name) +1
 
 // This value SHOULD be equal to the number of amendments registered in
 // Feature.cpp. Because it's only used to reserve storage, and determine how
@@ -94,8 +97,10 @@ static constexpr std::size_t numFeatures =
 #include <xrpl/protocol/detail/features.macro>
     );
 
-#undef XRPL_RETIRE
-#pragma pop_macro("XRPL_RETIRE")
+#undef XRPL_RETIRE_FEATURE
+#pragma pop_macro("XRPL_RETIRE_FEATURE")
+#undef XRPL_RETIRE_FIX
+#pragma pop_macro("XRPL_RETIRE_FIX")
 #undef XRPL_FIX
 #pragma pop_macro("XRPL_FIX")
 #undef XRPL_FEATURE
@@ -339,17 +344,22 @@ foreachFeature(FeatureBitset bs, F&& f)
 #undef XRPL_FEATURE
 #pragma push_macro("XRPL_FIX")
 #undef XRPL_FIX
-#pragma push_macro("XRPL_RETIRE")
-#undef XRPL_RETIRE
+#pragma push_macro("XRPL_RETIRE_FEATURE")
+#undef XRPL_RETIRE_FEATURE
+#pragma push_macro("XRPL_RETIRE_FIX")
+#undef XRPL_RETIRE_FIX
 
 #define XRPL_FEATURE(name, supported, vote) extern uint256 const feature##name;
 #define XRPL_FIX(name, supported, vote) extern uint256 const fix##name;
-#define XRPL_RETIRE(name)
+#define XRPL_RETIRE_FEATURE(name)
+#define XRPL_RETIRE_FIX(name)
 
 #include <xrpl/protocol/detail/features.macro>
 
-#undef XRPL_RETIRE
-#pragma pop_macro("XRPL_RETIRE")
+#undef XRPL_RETIRE_FEATURE
+#pragma pop_macro("XRPL_RETIRE_FEATURE")
+#undef XRPL_RETIRE_FIX
+#pragma pop_macro("XRPL_RETIRE_FIX")
 #undef XRPL_FIX
 #pragma pop_macro("XRPL_FIX")
 #undef XRPL_FEATURE
diff --git a/include/xrpl/protocol/detail/features.macro b/include/xrpl/protocol/detail/features.macro
index 076307ff36..f38793cb9e 100644
--- a/include/xrpl/protocol/detail/features.macro
+++ b/include/xrpl/protocol/detail/features.macro
@@ -4,8 +4,11 @@
 #if !defined(XRPL_FIX)
 #error "undefined macro: XRPL_FIX"
 #endif
-#if !defined(XRPL_RETIRE)
-#error "undefined macro: XRPL_RETIRE"
+#if !defined(XRPL_RETIRE_FEATURE)
+#error "undefined macro: XRPL_RETIRE_FEATURE"
+#endif
+#if !defined(XRPL_RETIRE_FIX)
+#error "undefined macro: XRPL_RETIRE_FIX"
 #endif
 
 // Add new amendments to the top of this list.
@@ -90,45 +93,46 @@ XRPL_FEATURE(CryptoConditionsSuite, Supported::yes, VoteBehavior::Obsolete)
 // All known amendments and amendments that may appear in a validated ledger
 // must be registered either here or above with the "active" amendments
 //
-// Please keep this list sorted alphabetically for convenience.
-XRPL_RETIRE(fix1201)
-XRPL_RETIRE(fix1368)
-XRPL_RETIRE(fix1373)
-XRPL_RETIRE(fix1512)
-XRPL_RETIRE(fix1513)
-XRPL_RETIRE(fix1515)
-XRPL_RETIRE(fix1523)
-XRPL_RETIRE(fix1528)
-XRPL_RETIRE(fix1543)
-XRPL_RETIRE(fix1571)
-XRPL_RETIRE(fix1578)
-XRPL_RETIRE(fix1623)
-XRPL_RETIRE(fix1781)
-XRPL_RETIRE(fixAmendmentMajorityCalc)
-XRPL_RETIRE(fixCheckThreading)
-XRPL_RETIRE(fixMasterKeyAsRegularKey)
-XRPL_RETIRE(fixNonFungibleTokensV1_2)
-XRPL_RETIRE(fixNFTokenRemint)
-XRPL_RETIRE(fixPayChanRecipientOwnerDir)
-XRPL_RETIRE(fixQualityUpperBound)
-XRPL_RETIRE(fixReducedOffersV1)
-XRPL_RETIRE(fixRmSmallIncreasedQOffers)
-XRPL_RETIRE(fixSTAmountCanonicalize)
-XRPL_RETIRE(fixTakerDryOfferRemoval)
-XRPL_RETIRE(fixTrustLinesToSelf)
-XRPL_RETIRE(CheckCashMakesTrustLine)
-XRPL_RETIRE(CryptoConditions)
-XRPL_RETIRE(DepositAuth)
-XRPL_RETIRE(DepositPreauth)
-XRPL_RETIRE(Escrow)
-XRPL_RETIRE(EnforceInvariants)
-XRPL_RETIRE(FeeEscalation)
-XRPL_RETIRE(FlowCross)
-XRPL_RETIRE(HardenedValidations)
-XRPL_RETIRE(ImmediateOfferKilled)
-XRPL_RETIRE(MultiSign)
-XRPL_RETIRE(NonFungibleTokensV1_1)
-XRPL_RETIRE(PayChan)
-XRPL_RETIRE(SortedDirectories)
-XRPL_RETIRE(TickSize)
-XRPL_RETIRE(TrustSetAuth)
+// Please keep both lists sorted alphabetically for convenience.
+XRPL_RETIRE_FIX(1201)
+XRPL_RETIRE_FIX(1368)
+XRPL_RETIRE_FIX(1373)
+XRPL_RETIRE_FIX(1512)
+XRPL_RETIRE_FIX(1513)
+XRPL_RETIRE_FIX(1515)
+XRPL_RETIRE_FIX(1523)
+XRPL_RETIRE_FIX(1528)
+XRPL_RETIRE_FIX(1543)
+XRPL_RETIRE_FIX(1571)
+XRPL_RETIRE_FIX(1578)
+XRPL_RETIRE_FIX(1623)
+XRPL_RETIRE_FIX(1781)
+XRPL_RETIRE_FIX(AmendmentMajorityCalc)
+XRPL_RETIRE_FIX(CheckThreading)
+XRPL_RETIRE_FIX(MasterKeyAsRegularKey)
+XRPL_RETIRE_FIX(NonFungibleTokensV1_2)
+XRPL_RETIRE_FIX(NFTokenRemint)
+XRPL_RETIRE_FIX(PayChanRecipientOwnerDir)
+XRPL_RETIRE_FIX(QualityUpperBound)
+XRPL_RETIRE_FIX(ReducedOffersV1)
+XRPL_RETIRE_FIX(RmSmallIncreasedQOffers)
+XRPL_RETIRE_FIX(STAmountCanonicalize)
+XRPL_RETIRE_FIX(TakerDryOfferRemoval)
+XRPL_RETIRE_FIX(TrustLinesToSelf)
+
+XRPL_RETIRE_FEATURE(CheckCashMakesTrustLine)
+XRPL_RETIRE_FEATURE(CryptoConditions)
+XRPL_RETIRE_FEATURE(DepositAuth)
+XRPL_RETIRE_FEATURE(DepositPreauth)
+XRPL_RETIRE_FEATURE(Escrow)
+XRPL_RETIRE_FEATURE(EnforceInvariants)
+XRPL_RETIRE_FEATURE(FeeEscalation)
+XRPL_RETIRE_FEATURE(FlowCross)
+XRPL_RETIRE_FEATURE(HardenedValidations)
+XRPL_RETIRE_FEATURE(ImmediateOfferKilled)
+XRPL_RETIRE_FEATURE(MultiSign)
+XRPL_RETIRE_FEATURE(NonFungibleTokensV1_1)
+XRPL_RETIRE_FEATURE(PayChan)
+XRPL_RETIRE_FEATURE(SortedDirectories)
+XRPL_RETIRE_FEATURE(TickSize)
+XRPL_RETIRE_FEATURE(TrustSetAuth)
diff --git a/src/libxrpl/protocol/Feature.cpp b/src/libxrpl/protocol/Feature.cpp
index 8d09378fc7..10c42ccb8a 100644
--- a/src/libxrpl/protocol/Feature.cpp
+++ b/src/libxrpl/protocol/Feature.cpp
@@ -411,8 +411,10 @@ featureToName(uint256 const& f)
 #undef XRPL_FEATURE
 #pragma push_macro("XRPL_FIX")
 #undef XRPL_FIX
-#pragma push_macro("XRPL_RETIRE")
-#undef XRPL_RETIRE
+#pragma push_macro("XRPL_RETIRE_FEATURE")
+#undef XRPL_RETIRE_FEATURE
+#pragma push_macro("XRPL_RETIRE_FIX")
+#undef XRPL_RETIRE_FIX
 
 #define XRPL_FEATURE(name, supported, vote) \
     uint256 const feature##name = registerFeature(#name, supported, vote);
@@ -420,16 +422,23 @@ featureToName(uint256 const& f)
     uint256 const fix##name = registerFeature("fix" #name, supported, vote);
 
 // clang-format off
-#define XRPL_RETIRE(name)                                       \
-    [[deprecated("The referenced amendment has been retired")]] \
-    [[maybe_unused]]                                            \
-    uint256 const retired##name = retireFeature(#name);
+#define XRPL_RETIRE_FEATURE(name)                                       \
+    [[deprecated("The referenced feature amendment has been retired")]] \
+    [[maybe_unused]]                                                    \
+    uint256 const retiredFeature##name = retireFeature(#name);
+
+#define XRPL_RETIRE_FIX(name)                                           \
+    [[deprecated("The referenced fix amendment has been retired")]]     \
+    [[maybe_unused]]                                                    \
+    uint256 const retiredFix##name = retireFeature("fix" #name);
 // clang-format on
 
 #include <xrpl/protocol/detail/features.macro>
 
-#undef XRPL_RETIRE
-#pragma pop_macro("XRPL_RETIRE")
+#undef XRPL_RETIRE_FEATURE
+#pragma pop_macro("XRPL_RETIRE_FEATURE")
+#undef XRPL_RETIRE_FIX
+#pragma pop_macro("XRPL_RETIRE_FIX")
 #undef XRPL_FIX
 #pragma pop_macro("XRPL_FIX")
 #undef XRPL_FEATURE