diff --git a/features/bicycle/safety.feature b/features/bicycle/safety.feature
index ca4bd5845..4966270eb 100644
--- a/features/bicycle/safety.feature
+++ b/features/bicycle/safety.feature
@@ -10,17 +10,17 @@ Feature: Bicycle - Adds penalties to unsafe roads
 
     Scenario: Bike - Apply penalties to ways without cycleways
         Then routability should be
-            | highway       | cycleway | forw       | backw      | forw_rate | backw_rate |
-            | motorway      |          |            |            |           |            |
-            | primary       |          | 15 km/h    | 15 km/h    | 2.9       | 2.9        |
-            | secondary     |          | 15 km/h    | 15 km/h    | 2.9       | 2.9        |
-            | tertiary      |          | 15 km/h    | 15 km/h    | 2.9       | 2.9        |
-            | primary_link  |          | 15 km/h    | 15 km/h    | 2.9       | 2.9        |
-            | secondary_link|          | 15 km/h    | 15 km/h    | 2.9       | 2.9        |
-            | tertiary_link |          | 15 km/h    | 15 km/h    | 2.9       | 2.9        |
-            | residential   |          | 15 km/h    | 15 km/h    | 4.2       | 4.2        |
-            | cycleway      |          | 15 km/h    | 15 km/h    | 4.2       | 4.2        |
-            | footway       |          | 6 km/h +-1 | 6 km/h +-1 | 1.7       | 1.7        |
+            | highway        | cycleway | forw       | backw      | forw_rate | backw_rate |
+            | motorway       |          |            |            |           |            |
+            | primary        |          | 15 km/h    | 15 km/h    |       2.9 |        2.9 |
+            | secondary      |          | 15 km/h    | 15 km/h    |       3.1 |        3.1 |
+            | tertiary       |          | 15 km/h    | 15 km/h    |       3.3 |        3.3 |
+            | primary_link   |          | 15 km/h    | 15 km/h    |       2.9 |        2.9 |
+            | secondary_link |          | 15 km/h    | 15 km/h    |       3.1 |        3.1 |
+            | tertiary_link  |          | 15 km/h    | 15 km/h    |       3.3 |        3.3 |
+            | residential    |          | 15 km/h    | 15 km/h    |       4.2 |        4.2 |
+            | cycleway       |          | 15 km/h    | 15 km/h    |       4.2 |        4.2 |
+            | footway        |          | 6 km/h +-1 | 6 km/h +-1 |       1.7 |        1.7 |
 
     Scenario: Bike - Apply no penalties to ways with cycleways
         Then routability should be
@@ -53,41 +53,41 @@ Feature: Bicycle - Adds penalties to unsafe roads
             | highway        | cycleway:right | cycleway:left | forw        | backw       | forw_rate | backw_rate |
             | motorway       | track          |               | 15 km/h     |             |       4.2 |            |
             | primary        | track          |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
-            | secondary      | track          |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
-            | tertiary       | track          |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
+            | secondary      | track          |               | 15 km/h     | 15 km/h     |       4.2 |        3.1 |
+            | tertiary       | track          |               | 15 km/h     | 15 km/h     |       4.2 |        3.3 |
             | primary_link   | track          |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
-            | secondary_link | track          |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
-            | tertiary_link  | track          |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
+            | secondary_link | track          |               | 15 km/h     | 15 km/h     |       4.2 |        3.1 |
+            | tertiary_link  | track          |               | 15 km/h     | 15 km/h     |       4.2 |        3.3 |
             | residential    | track          |               | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
             | cycleway       | track          |               | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
             | footway        | track          |               | 15 km/h     | 6 km/h +-1  |       4.2 |        1.7 |
             | motorway       |                | track         |             | 15 km/h     |           |        4.2 |
             | primary        |                | track         | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
-            | secondary      |                | track         | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
-            | tertiary       |                | track         | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
+            | secondary      |                | track         | 15 km/h     | 15 km/h     |       3.1 |        4.2 |
+            | tertiary       |                | track         | 15 km/h     | 15 km/h     |       3.3 |        4.2 |
             | primary_link   |                | track         | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
-            | secondary_link |                | track         | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
-            | tertiary_link  |                | track         | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
+            | secondary_link |                | track         | 15 km/h     | 15 km/h     |       3.1 |        4.2 |
+            | tertiary_link  |                | track         | 15 km/h     | 15 km/h     |       3.3 |        4.2 |
             | residential    |                | track         | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
             | cycleway       |                | track         | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
             | footway        |                | track         | 6 km/h +-1  | 15 km/h     |       1.7 |        4.2 |
             | motorway       | lane           |               | 15 km/h     |             |       4.2 |            |
             | primary        | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
-            | secondary      | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
-            | tertiary       | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
+            | secondary      | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        3.1 |
+            | tertiary       | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        3.3 |
             | primary_link   | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
-            | secondary_link | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
-            | tertiary_link  | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        2.9 |
+            | secondary_link | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        3.1 |
+            | tertiary_link  | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        3.3 |
             | residential    | lane           |               | 15 km/h +-1 | 15 km/h +-1 |       4.2 |        4.2 |
             | cycleway       | lane           |               | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
             | footway        | lane           |               | 15 km/h     | 6 km/h +-1  |       4.2 |        1.7 |
             | motorway       |                | lane          |             | 15 km/h     |           |        4.2 |
             | primary        |                | lane          | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
-            | secondary      |                | lane          | 15 km/h +-1 | 15 km/h +-1 |       2.9 |        4.2 |
-            | tertiary       |                | lane          | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
+            | secondary      |                | lane          | 15 km/h +-1 | 15 km/h +-1 |       3.1 |        4.2 |
+            | tertiary       |                | lane          | 15 km/h     | 15 km/h     |       3.3 |        4.2 |
             | primary_link   |                | lane          | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
-            | secondary_link |                | lane          | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
-            | tertiary_link  |                | lane          | 15 km/h     | 15 km/h     |       2.9 |        4.2 |
+            | secondary_link |                | lane          | 15 km/h     | 15 km/h     |       3.1 |        4.2 |
+            | tertiary_link  |                | lane          | 15 km/h     | 15 km/h     |       3.3 |        4.2 |
             | residential    |                | lane          | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
             | cycleway       |                | lane          | 15 km/h     | 15 km/h     |       4.2 |        4.2 |
             | footway        |                | lane          | 6 km/h +-1  | 15 km/h     |       1.7 |        4.2 |
@@ -99,7 +99,7 @@ Feature: Bicycle - Adds penalties to unsafe roads
 
     Scenario: Bike - Don't apply penalties for all kind of cycleways
         Then routability should be
-            | highway       | cycleway    | forw       | backw      | forw_rate | backw_rate |
-            | tertiary      | shared_lane | 15 km/h    | 15 km/h    | 4.2       | 4.2        |
-            | tertiary      | lane        | 15 km/h    | 15 km/h    | 4.2       | 4.2        |
-            | tertiary      | opposite    | 15 km/h    | 15 km/h    | 2.9       | 4.2        |
+            | highway  | cycleway    | forw    | backw   | forw_rate | backw_rate |
+            | tertiary | shared_lane | 15 km/h | 15 km/h |       4.2 |        4.2 |
+            | tertiary | lane        | 15 km/h | 15 km/h |       4.2 |        4.2 |
+            | tertiary | opposite    | 15 km/h | 15 km/h |       3.3 |        4.2 |
diff --git a/profiles/bicycle.lua b/profiles/bicycle.lua
index fe1e87e96..faa3a3920 100644
--- a/profiles/bicycle.lua
+++ b/profiles/bicycle.lua
@@ -98,11 +98,11 @@ local profile = {
   -- only used for cyclability metric
   unsafe_highway_list = {
     primary = 0.7,
-    secondary = 0.7,
-    tertiary = 0.7,
+    secondary = 0.75,
+    tertiary = 0.8,
     primary_link = 0.7,
-    secondary_link = 0.7,
-    tertiary_link = 0.7,
+    secondary_link = 0.75,
+    tertiary_link = 0.8,
   },
 
   service_penalties = {