diff --git a/debian/patches/0500-set-webpack-root.patch b/debian/patches/nodejs/0010-set-webpack-root.patch
similarity index 100%
rename from debian/patches/0500-set-webpack-root.patch
rename to debian/patches/nodejs/0010-set-webpack-root.patch
diff --git a/debian/patches/0510-remove-dev-dependencies.patch b/debian/patches/nodejs/0020-remove-dev-dependencies.patch
similarity index 100%
rename from debian/patches/0510-remove-dev-dependencies.patch
rename to debian/patches/nodejs/0020-remove-dev-dependencies.patch
diff --git a/debian/patches/0710-use-yarnpkg.patch b/debian/patches/nodejs/0030-use-yarnpkg.patch
similarity index 100%
rename from debian/patches/0710-use-yarnpkg.patch
rename to debian/patches/nodejs/0030-use-yarnpkg.patch
diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/nodejs/0040-use-packaged-modules.patch
similarity index 100%
rename from debian/patches/0740-use-packaged-modules.patch
rename to debian/patches/nodejs/0040-use-packaged-modules.patch
diff --git a/debian/patches/0750-use-matching-monaco-editor-webpack-plugin.patch b/debian/patches/nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch
similarity index 100%
rename from debian/patches/0750-use-matching-monaco-editor-webpack-plugin.patch
rename to debian/patches/nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch
diff --git a/debian/patches/series b/debian/patches/series
index 4c4c1e8165..533777f86f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,16 +12,16 @@ Gemfile/0130-remove-capybara-screenshot.patch
 Gemfile/0140-remove-guard-rspec.patch
 Gemfile/0150-relax-graphlient.patch
 Gemfile/0160-relax-rexml.patch
-0500-set-webpack-root.patch
-0510-remove-dev-dependencies.patch
-0610-source-init-functions.patch
-0630-fix-mail-room-path.patch
-0660-fix-gitlab-yml-path.patch
-0690-debian-usage-ping.patch
-0700-add-salsa-link-to-help.patch
-0710-use-yarnpkg.patch
-0740-use-packaged-modules.patch
-0750-use-matching-monaco-editor-webpack-plugin.patch
-0750-fix-relative-paths.patch
-0770-remove-capybara-screenshot-rspec.patch
-0800-search-binaries-in-path.patch
+nodejs/0010-set-webpack-root.patch
+nodejs/0020-remove-dev-dependencies.patch
+nodejs/0030-use-yarnpkg.patch
+nodejs/0040-use-packaged-modules.patch
+nodejs/0050-use-matching-monaco-editor-webpack-plugin.patch
+tweaks/0010-source-init-functions.patch
+tweaks/0020-fix-mail-room-path.patch
+tweaks/0030-fix-gitlab-yml-path.patch
+tweaks/0040-debian-usage-ping.patch
+tweaks/0050-add-salsa-link-to-help.patch
+tweaks/0060-fix-relative-paths.patch
+tweaks/0070-remove-capybara-screenshot-rspec.patch
+tweaks/0080-search-binaries-in-path.patch
diff --git a/debian/patches/0610-source-init-functions.patch b/debian/patches/tweaks/0010-source-init-functions.patch
similarity index 100%
rename from debian/patches/0610-source-init-functions.patch
rename to debian/patches/tweaks/0010-source-init-functions.patch
diff --git a/debian/patches/0630-fix-mail-room-path.patch b/debian/patches/tweaks/0020-fix-mail-room-path.patch
similarity index 100%
rename from debian/patches/0630-fix-mail-room-path.patch
rename to debian/patches/tweaks/0020-fix-mail-room-path.patch
diff --git a/debian/patches/0660-fix-gitlab-yml-path.patch b/debian/patches/tweaks/0030-fix-gitlab-yml-path.patch
similarity index 100%
rename from debian/patches/0660-fix-gitlab-yml-path.patch
rename to debian/patches/tweaks/0030-fix-gitlab-yml-path.patch
diff --git a/debian/patches/0690-debian-usage-ping.patch b/debian/patches/tweaks/0040-debian-usage-ping.patch
similarity index 100%
rename from debian/patches/0690-debian-usage-ping.patch
rename to debian/patches/tweaks/0040-debian-usage-ping.patch
diff --git a/debian/patches/0700-add-salsa-link-to-help.patch b/debian/patches/tweaks/0050-add-salsa-link-to-help.patch
similarity index 100%
rename from debian/patches/0700-add-salsa-link-to-help.patch
rename to debian/patches/tweaks/0050-add-salsa-link-to-help.patch
diff --git a/debian/patches/0750-fix-relative-paths.patch b/debian/patches/tweaks/0060-fix-relative-paths.patch
similarity index 100%
rename from debian/patches/0750-fix-relative-paths.patch
rename to debian/patches/tweaks/0060-fix-relative-paths.patch
diff --git a/debian/patches/0770-remove-capybara-screenshot-rspec.patch b/debian/patches/tweaks/0070-remove-capybara-screenshot-rspec.patch
similarity index 100%
rename from debian/patches/0770-remove-capybara-screenshot-rspec.patch
rename to debian/patches/tweaks/0070-remove-capybara-screenshot-rspec.patch
diff --git a/debian/patches/0800-search-binaries-in-path.patch b/debian/patches/tweaks/0080-search-binaries-in-path.patch
similarity index 100%
rename from debian/patches/0800-search-binaries-in-path.patch
rename to debian/patches/tweaks/0080-search-binaries-in-path.patch