diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
index bc23ef0198..2be894ac03 100644
--- a/src/core/devices/nm-device.c
+++ b/src/core/devices/nm-device.c
@@ -139,8 +139,6 @@ typedef enum {
      * their relative order matters: higher numbers in this enum means more
      * important (and during merge overwrites other settings). */
 
-    L3_CONFIG_DATA_TYPE_MANUALIP,
-
     L3_CONFIG_DATA_TYPE_LL_4,
     L3_CONFIG_DATA_TYPE_LL_6,
 
@@ -183,6 +181,8 @@ typedef enum {
         _t;                                        \
     })
 
+    L3_CONFIG_DATA_TYPE_MANUALIP,
+
     _L3_CONFIG_DATA_TYPE_NUM,
     _L3_CONFIG_DATA_TYPE_NONE,
     _L3_CONFIG_DATA_TYPE_ACD_ONLY,
diff --git a/src/core/nm-l3cfg.h b/src/core/nm-l3cfg.h
index d994efde32..a7d89a2618 100644
--- a/src/core/nm-l3cfg.h
+++ b/src/core/nm-l3cfg.h
@@ -6,8 +6,8 @@
 #include "libnm-platform/nmp-object.h"
 #include "nm-l3-config-data.h"
 
-#define NM_L3CFG_CONFIG_PRIORITY_IPV4LL 1
-#define NM_L3CFG_CONFIG_PRIORITY_IPV6LL 1
+#define NM_L3CFG_CONFIG_PRIORITY_IPV4LL 0
+#define NM_L3CFG_CONFIG_PRIORITY_IPV6LL 0
 #define NM_ACD_TIMEOUT_RFC5227_MSEC     9000u
 
 #define NM_TYPE_L3CFG            (nm_l3cfg_get_type())