diff --git a/firmware/fw_dynamic.S b/firmware/fw_dynamic.S
index 2b601967..7ff1c6a3 100644
--- a/firmware/fw_dynamic.S
+++ b/firmware/fw_dynamic.S
@@ -129,7 +129,7 @@ fw_options:
 	REG_L	a0, (a0)
 	ret
 
-	.section .entry, "ax", %progbits
+	.section .data
 	.align 3
 _dynamic_next_arg1:
 	RISCV_PTR 0x0
diff --git a/firmware/fw_jump.S b/firmware/fw_jump.S
index 5b24f8b7..ac74dc64 100644
--- a/firmware/fw_jump.S
+++ b/firmware/fw_jump.S
@@ -90,7 +90,7 @@ fw_options:
 #error "Must define FW_JUMP_ADDR"
 #endif
 
-	.section .entry, "ax", %progbits
+	.section .rodata
 	.align 3
 _jump_addr:
 	RISCV_PTR FW_JUMP_ADDR
diff --git a/firmware/payloads/test_head.S b/firmware/payloads/test_head.S
index 4852f715..7a2ac126 100644
--- a/firmware/payloads/test_head.S
+++ b/firmware/payloads/test_head.S
@@ -78,7 +78,7 @@ _start_hang:
 	wfi
 	j	_start_hang
 
-	.section .entry, "ax", %progbits
+	.section .data
 	.align	3
 _hart_lottery:
 	RISCV_PTR	0