diff --git a/debian.master/abi/riscv64/ignore b/debian.master/abi/riscv64/ignore
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/debian.master/abi/riscv64/ignore
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/debian.master/abi/riscv64/ignore.modules b/debian.master/abi/riscv64/ignore.modules
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/debian.master/abi/riscv64/ignore.modules
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/debian.master/abi/riscv64/ignore.retpoline b/debian.master/abi/riscv64/ignore.retpoline
deleted file mode 100644
index d00491fd7e5b..000000000000
--- a/debian.master/abi/riscv64/ignore.retpoline
+++ /dev/null
@@ -1 +0,0 @@
-1
diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
index b6cc05fa6156..ca144cfac896 100644
--- a/debian.master/control.d/vars.generic
+++ b/debian.master/control.d/vars.generic
@@ -1,4 +1,4 @@
-arch="amd64 armhf arm64 ppc64el riscv64 s390x"
+arch="amd64 armhf arm64 ppc64el s390x"
 supported="Generic"
 target="Geared toward desktop and server systems."
 desc="=HUMAN= SMP"
diff --git a/debian.master/rules.d/riscv64.mk b/debian.master/rules.d/riscv64.mk
index 2c09b9ddc7a5..89ffb836ad8b 100644
--- a/debian.master/rules.d/riscv64.mk
+++ b/debian.master/rules.d/riscv64.mk
@@ -1,18 +1,18 @@
-human_arch	= RISC-V
-build_arch	= riscv
-defconfig	= defconfig
-flavours	= generic
-build_image	= Image
-kernel_file	= arch/$(build_arch)/boot/Image
-install_file	= vmlinuz
+human_arch     = RISC-V
+build_arch     = riscv
+defconfig      = defconfig
+flavours       = generic
+build_image    = Image
+kernel_file    = arch/$(build_arch)/boot/Image
+install_file   = vmlinuz
 
-vdso		= vdso_install
-no_dumpfile	= true
+vdso           = vdso_install
+no_dumpfile    = true
 
-do_extras_package	= true
-do_tools_usbip		= true
-do_tools_cpupower	= true
-do_tools_perf		= true
-do_tools_perf_jvmti	= true
-do_tools_bpftool	= true
-do_dtbs			= true
+do_extras_package      = false
+do_tools_usbip         = false
+do_tools_cpupower      = false
+do_tools_perf          = false
+do_tools_perf_jvmti    = false
+do_tools_bpftool       = false
+do_dtbs                = false
diff --git a/debian/control.d/linux-libc-dev.stub b/debian/control.d/linux-libc-dev.stub
index fb045233d401..47ef2e1b521c 100644
--- a/debian/control.d/linux-libc-dev.stub
+++ b/debian/control.d/linux-libc-dev.stub
@@ -1,5 +1,5 @@
 Package: linux-libc-dev
-Architecture: amd64 armhf arm64 i386 ppc64el riscv64 s390x
+Architecture: amd64 armhf arm64 i386 ppc64el s390x
 Depends: ${misc:Depends}
 Conflicts: linux-kernel-headers
 Replaces: linux-kernel-headers