diff --git a/lib/updatehub/updatehub.c b/lib/updatehub/updatehub.c
index 80c852a2403..fa4aac8643e 100644
--- a/lib/updatehub/updatehub.c
+++ b/lib/updatehub/updatehub.c
@@ -802,6 +802,6 @@ void updatehub_autohandler(void)
 	static struct k_delayed_work work;
 
 	k_delayed_work_init(&work, autohandler);
-	k_delayed_work_submit(&work, 0);
+	k_delayed_work_submit(&work, K_NO_WAIT);
 }
 
diff --git a/samples/bluetooth/eddystone/src/main.c b/samples/bluetooth/eddystone/src/main.c
index 78cfcdbc01b..0338f52ce1e 100644
--- a/samples/bluetooth/eddystone/src/main.c
+++ b/samples/bluetooth/eddystone/src/main.c
@@ -663,7 +663,7 @@ static void disconnected(struct bt_conn *conn, u8_t reason)
 	printk("Disconnected (reason 0x%02x)\n", reason);
 
 	if (!slot->connectable) {
-		k_delayed_work_submit(&idle_work, 0);
+		k_delayed_work_submit(&idle_work, K_NO_WAIT);
 	}
 }
 
diff --git a/samples/net/dns_resolve/src/main.c b/samples/net/dns_resolve/src/main.c
index 325c348d1cd..9763b2b5b52 100644
--- a/samples/net/dns_resolve/src/main.c
+++ b/samples/net/dns_resolve/src/main.c
@@ -193,11 +193,11 @@ static void ipv4_addr_add_handler(struct net_mgmt_event_callback *cb,
 	 * So run it from work queue instead.
 	 */
 	k_delayed_work_init(&ipv4_timer, do_ipv4_lookup);
-	k_delayed_work_submit(&ipv4_timer, 0);
+	k_delayed_work_submit(&ipv4_timer, K_NO_WAIT);
 
 #if defined(CONFIG_MDNS_RESOLVER)
 	k_delayed_work_init(&mdns_ipv4_timer, do_mdns_ipv4_lookup);
-	k_delayed_work_submit(&mdns_ipv4_timer, 0);
+	k_delayed_work_submit(&mdns_ipv4_timer, K_NO_WAIT);
 #endif
 }
 
@@ -281,7 +281,7 @@ static void setup_ipv4(struct net_if *iface)
 
 #if defined(CONFIG_MDNS_RESOLVER) && defined(CONFIG_NET_IPV4)
 	k_delayed_work_init(&mdns_ipv4_timer, do_mdns_ipv4_lookup);
-	k_delayed_work_submit(&mdns_ipv4_timer, 0);
+	k_delayed_work_submit(&mdns_ipv4_timer, K_NO_WAIT);
 #endif
 }
 
@@ -321,7 +321,7 @@ static void setup_ipv6(struct net_if *iface)
 
 #if defined(CONFIG_MDNS_RESOLVER) && defined(CONFIG_NET_IPV6)
 	k_delayed_work_init(&mdns_ipv6_timer, do_mdns_ipv6_lookup);
-	k_delayed_work_submit(&mdns_ipv6_timer, 0);
+	k_delayed_work_submit(&mdns_ipv6_timer, K_NO_WAIT);
 #endif
 }
 
diff --git a/tests/kernel/workq/work_queue/src/main.c b/tests/kernel/workq/work_queue/src/main.c
index 4e6f9ab152e..e9b35fa5095 100644
--- a/tests/kernel/workq/work_queue/src/main.c
+++ b/tests/kernel/workq/work_queue/src/main.c
@@ -289,7 +289,7 @@ static void coop_delayed_work_cancel_main(int arg1, int arg2)
 
 #if defined(CONFIG_POLL)
 	k_delayed_work_submit(&delayed_tests[2].work,
-			      0 /* Submit immediately */);
+			      K_NO_WAIT /* Submit immediately */);
 
 	TC_PRINT(" - Cancel pending delayed work from coop thread\n");
 	k_delayed_work_cancel(&delayed_tests[2].work);
@@ -370,7 +370,7 @@ static void coop_delayed_work_resubmit(void)
 
 	for (i = 0; i < NUM_TEST_ITEMS; i++) {
 		TC_PRINT(" - Resubmitting delayed work with 1 ms\n");
-		k_delayed_work_submit(&delayed_tests[0].work, 1);
+		k_delayed_work_submit(&delayed_tests[0].work, K_MSEC(1));
 
 		/* Busy wait 1 ms to force a clash with workqueue */
 #if defined(CONFIG_ARCH_POSIX)