diff --git a/bundled-schema/DefaultScenarios.sql b/bundled-schema/DefaultScenarios.sql
deleted file mode 100644
index d3eb2899a..000000000
--- a/bundled-schema/DefaultScenarios.sql
+++ /dev/null
@@ -1,120 +0,0 @@
-BEGIN;
-
-INSERT INTO public.scenario_counter
-(scenario_id, category_id)
-VALUES
-    (0,0),
-    (1,0),
-    (2,0),
-    (3,0),
-    (4,0),
-    (5,0),
-    (6,0),
-    (7,0),
-    (8,0),
-    (9,0),
-    (10,0),
-    (11,0),
-    (12,0),
-    (13,0),
-    (14,0),
-    (15,0),
-    (16,0),
-    (17,0),
-    (18,0),
-    (19,0),
-    (0,1),
-    (1,1),
-    (2,1),
-    (3,1),
-    (4,1),
-    (5,1),
-    (6,1),
-    (7,1),
-    (8,1),
-    (9,1),
-    (10,1),
-    (11,1),
-    (12,1),
-    (13,1),
-    (16,1),
-    (17,1),
-    (19,1),
-    (21,1),
-    (22,1),
-    (23,1),
-    (27,1),
-    (28,1),
-    (29,1),
-    (30,1),
-    (31,1),
-    (32,1),
-    (33,1),
-    (34,1),
-    (35,1),
-    (36,1),
-    (37,1),
-    (38,1),
-    (39,1),
-    (41,1),
-    (42,1),
-    (43,1),
-    (46,1),
-    (47,1),
-    (48,1),
-    (49,1),
-    (58,1),
-    (59,1),
-    (60,1),
-    (61,1),
-    (62,1),
-    (63,1),
-    (64,1),
-    (65,1),
-    (66,1),
-    (67,1),
-    (68,1),
-    (69,1),
-    (70,1),
-    (77,1),
-    (79,1),
-    (81,1),
-    (82,1),
-    (83,1),
-    (84,1),
-    (85,1),
-    (86,1),
-    (87,1),
-    (88,1),
-    (89,1),
-    (90,1),
-    (92,1),
-    (93,1),
-    (13,1),
-    (14,1),
-    (15,1),
-    (18,1),
-    (20,1),
-    (24,1),
-    (25,1),
-    (26,1),
-    (40,1),
-    (50,1),
-    (51,1),
-    (52,1),
-    (53,1),
-    (54,1),
-    (55,1),
-    (56,1),
-    (57,1),
-    (71,1),
-    (72,1),
-    (73,1),
-    (74,1),
-    (75,1),
-    (76,1),
-    (78,1),
-    (80,1),
-    (91,1);
-
-END;
\ No newline at end of file
diff --git a/bundled-schema/ScenarioDefaults.sql b/bundled-schema/ScenarioDefaults.sql
new file mode 100644
index 000000000..ec7b3d99e
--- /dev/null
+++ b/bundled-schema/ScenarioDefaults.sql
@@ -0,0 +1,178 @@
+BEGIN;
+
+INSERT INTO public.scenario_counter
+(scenario_id, category_id)
+VALUES
+    (17,0),
+    (93,1),
+    (92,1),
+    (81,1),
+    (91,1),
+    (90,1),
+    (89,1),
+    (88,1),
+    (87,1),
+    (86,1),
+    (85,1),
+    (84,1),
+    (83,1),
+    (82,1),
+    (87,3),
+    (88,3),
+    (89,3),
+    (90,3),
+    (91,3),
+    (92,3),
+    (83,3),
+    (86,3),
+    (60,3),
+    (58,3),
+    (59,3),
+    (27,3),
+    (25,3),
+    (26,3),
+    (23,3),
+    (2,3),
+    (3,3),
+    (4,3),
+    (31,3),
+    (32,3),
+    (33,3),
+    (34,3),
+    (35,3),
+    (36,3),
+    (37,3),
+    (40,3),
+    (38,3),
+    (39,3),
+    (48,3),
+    (12,3),
+    (13,3),
+    (30,3),
+    (29,3),
+    (46,3),
+    (0,4),
+    (1,4),
+    (2,4),
+    (3,4),
+    (4,4),
+    (5,4),
+    (6,4),
+    (7,4),
+    (8,4),
+    (9,4),
+    (10,4),
+    (11,4),
+    (12,4),
+    (13,4),
+    (14,4),
+    (50,5),
+    (51,5),
+    (52,5),
+    (53,5),
+    (54,5),
+    (55,5),
+    (56,5),
+    (58,5),
+    (63,5),
+    (64,5),
+    (65,5),
+    (67,5),
+    (71,5),
+    (75,5),
+    (61,5),
+    (68,5),
+    (66,5),
+    (76,5),
+    (70,5),
+    (77,5),
+    (72,5),
+    (74,5),
+    (73,5),
+    (78,5),
+    (69,5),
+    (62,5),
+    (79,5),
+    (0,6),
+    (1,6),
+    (2,6),
+    (3,6),
+    (4,6),
+    (5,6),
+    (6,6),
+    (7,6),
+    (8,6),
+    (9,6),
+    (17,6),
+    (10,6),
+    (11,6),
+    (12,6),
+    (13,6),
+    (14,6),
+    (15,6),
+    (16,6),
+    (50,7),
+    (53,7),
+    (62,7),
+    (52,7),
+    (56,7),
+    (51,7),
+    (49,7),
+    (54,7),
+    (57,7),
+    (55,7),
+    (61,7),
+    (58,7),
+    (60,7),
+    (59,7),
+    (42,7),
+    (48,7),
+    (40,7),
+    (39,7),
+    (43,7),
+    (46,7),
+    (41,7),
+    (44,7),
+    (45,7),
+    (47,7),
+    (37,7),
+    (34,7),
+    (33,7),
+    (32,7),
+    (28,7),
+    (26,7),
+    (36,7),
+    (38,7),
+    (35,7),
+    (27,7),
+    (30,7),
+    (31,7),
+    (29,7),
+    (24,7),
+    (23,7),
+    (22,7),
+    (21,7),
+    (25,7),
+    (20,7),
+    (7,7),
+    (9,7),
+    (13,7),
+    (16,7),
+    (12,7),
+    (14,7),
+    (15,7),
+    (19,7),
+    (10,7),
+    (8,7),
+    (11,7),
+    (18,7),
+    (17,7),
+    (6,7),
+    (5,7),
+    (4,7),
+    (3,7),
+    (2,7),
+    (1,7),
+    (0,7);
+
+END;
\ No newline at end of file
diff --git a/patch-schema/scenarios-counter.sql b/patch-schema/07-scenarios-counter.sql
similarity index 100%
rename from patch-schema/scenarios-counter.sql
rename to patch-schema/07-scenarios-counter.sql