diff --git a/config.yaml b/config.yaml
index 450f47b..155aab8 100644
--- a/config.yaml
+++ b/config.yaml
@@ -57,10 +57,23 @@ actions:
         find: '%global grub_modules  " all_video boot blscfg blsuki            \\\'
         replace: '%global grub_modules  " all_video boot blscfg blsuki btrfs      \\\'
         count: 1
+      - target: "grub-cc.macros"
+        find: |
+            %global cc_modules " backtrace chain tpm "
+        replace: |
+            %ifarch riscv64
+            # AlmaLinux: the backtrace module has no riscv64 backend, so backtrace.mod
+            # is not built for riscv64-efi. Drop it from the CC image module set.
+            %global cc_modules " chain tpm "
+            %else
+            %global cc_modules " backtrace chain tpm "
+            %endif
+        count: 1
 
   - modify_release:
     - suffix: ".alma.1"
       enabled: true
+      auto_increment: true
 
   - changelog_entry:
       - name: "Eduard Abdullin"
@@ -68,3 +81,4 @@ actions:
         line:
           - "Debrand for AlmaLinux"
           - "Build btrfs module"
+          - "Drop backtrace module from riscv64-efi CC image"