diff --git a/examples/gcp.yml b/examples/gcp.yml
index 34fd68bd4..68460cb7e 100644
--- a/examples/gcp.yml
+++ b/examples/gcp.yml
@@ -15,6 +15,17 @@ onboot:
     capabilities:
      - CAP_SYS_ADMIN
     readonly: true
+  - name: dhcpcd
+    image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
+    binds:
+     - /var:/var
+     - /tmp:/etc
+    capabilities:
+     - CAP_NET_ADMIN
+     - CAP_NET_BIND_SERVICE
+     - CAP_NET_RAW
+    net: host
+    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
   - name: metadata-gcp
     image: "mobylinux/metadata-gcp:7fc3dd5ef92e0408fb3f76048bbaae88bbb55ad9"
     binds:
@@ -32,17 +43,6 @@ services:
      - CAP_SYS_ADMIN
     oomScoreAdj: -800
     readonly: true
-  - name: dhcpcd
-    image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea"
-    binds:
-     - /var:/var
-     - /tmp:/etc
-    capabilities:
-     - CAP_NET_ADMIN
-     - CAP_NET_BIND_SERVICE
-     - CAP_NET_RAW
-    net: host
-    oomScoreAdj: -800
   - name: sshd
     image: "mobylinux/sshd:160631d59fffc13d523ff7f09b3b49538d34b9cd"
     capabilities:
diff --git a/examples/sshd.yml b/examples/sshd.yml
index 79686f6f3..87a106aa7 100644
--- a/examples/sshd.yml
+++ b/examples/sshd.yml
@@ -21,7 +21,7 @@ services:
      - CAP_SYS_ADMIN
     oomScoreAdj: -800
   - name: dhcpcd
-    image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea"
+    image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
     binds:
      - /var:/var
      - /tmp:/etc
diff --git a/examples/vmware.yml b/examples/vmware.yml
index dd5fed44f..a25df911d 100644
--- a/examples/vmware.yml
+++ b/examples/vmware.yml
@@ -23,7 +23,7 @@ services:
     oomScoreAdj: -800
     readonly: true
   - name: dhcpcd
-    image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea"
+    image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
     binds:
      - /var:/var
      - /tmp:/etc
diff --git a/moby.yml b/moby.yml
index ede1392dd..8e0c6ae19 100644
--- a/moby.yml
+++ b/moby.yml
@@ -20,15 +20,8 @@ onboot:
     binds:
      - /proc/sys/fs/binfmt_misc:/binfmt_misc
     readonly: true
-services:
-  - name: rngd
-    image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92"
-    capabilities:
-     - CAP_SYS_ADMIN
-    oomScoreAdj: -800
-    readonly: true
   - name: dhcpcd
-    image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea"
+    image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
     binds:
      - /var:/var
      - /tmp/etc:/etc
@@ -37,7 +30,14 @@ services:
      - CAP_NET_BIND_SERVICE
      - CAP_NET_RAW
     net: host
+    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
+services:
+  - name: rngd
+    image: "mobylinux/rngd:3dad6dd43270fa632ac031e99d1947f20b22eec9@sha256:1c93c1db7196f6f71f8e300bc1d15f0376dd18e8891c8789d77c8ff19f3a9a92"
+    capabilities:
+     - CAP_SYS_ADMIN
     oomScoreAdj: -800
+    readonly: true
   - name: nginx
     image: "nginx:alpine"
     capabilities:
diff --git a/pkg/dhcpcd/dhcpcd.conf b/pkg/dhcpcd/dhcpcd.conf
index 944c51d43..62d2e6ec7 100644
--- a/pkg/dhcpcd/dhcpcd.conf
+++ b/pkg/dhcpcd/dhcpcd.conf
@@ -41,3 +41,6 @@ nodelay
 
 # Do not arp to check IP
 noarp
+
+# wait for ipv4 address
+waitip 4
diff --git a/projects/demo/etcd/etcd.yml b/projects/demo/etcd/etcd.yml
index fec34d00d..957807766 100644
--- a/projects/demo/etcd/etcd.yml
+++ b/projects/demo/etcd/etcd.yml
@@ -39,7 +39,7 @@ services:
     oomScoreAdj: -800
     readonly: true
   - name: dhcpcd
-    image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea"
+    image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
     binds:
      - /var:/var
      - /tmp/etc:/etc
diff --git a/projects/demo/intro/intro.yml b/projects/demo/intro/intro.yml
index 904e5f5d5..955d805fe 100644
--- a/projects/demo/intro/intro.yml
+++ b/projects/demo/intro/intro.yml
@@ -16,7 +16,7 @@ onboot:
     readonly: true
 services:
   - name: dhcpcd
-    image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea"
+    image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
     binds:
      - /var:/var
      - /tmp/etc:/etc
diff --git a/projects/swarmd/swarmd.yml b/projects/swarmd/swarmd.yml
index 998019d12..13f7587b9 100644
--- a/projects/swarmd/swarmd.yml
+++ b/projects/swarmd/swarmd.yml
@@ -20,7 +20,7 @@ services:
     oomScoreAdj: -800
     readonly: true
   - name: dhcpcd
-    image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea"
+    image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
     binds:
      - /var:/var
      - /tmp/etc:/etc
diff --git a/test/docker-bench/test-docker-bench.yml b/test/docker-bench/test-docker-bench.yml
index 6c8c3b2c7..b07086398 100644
--- a/test/docker-bench/test-docker-bench.yml
+++ b/test/docker-bench/test-docker-bench.yml
@@ -81,4 +81,4 @@ trust:
   image:
     - mobylinux/kernel
 outputs:
-  - format: kernel+initrd
\ No newline at end of file
+  - format: kernel+initrd
diff --git a/test/ltp/test-ltp.yml b/test/ltp/test-ltp.yml
index 059f2f086..31d7e2378 100644
--- a/test/ltp/test-ltp.yml
+++ b/test/ltp/test-ltp.yml
@@ -15,7 +15,7 @@ onboot:
      - CAP_SYS_ADMIN
 services:
   - name: dhcpcd
-    image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea"
+    image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
     binds:
      - /var:/var
      - /tmp:/etc
diff --git a/test/test.yml b/test/test.yml
index 66631ade2..babc60331 100644
--- a/test/test.yml
+++ b/test/test.yml
@@ -7,15 +7,8 @@ init:
   - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b
   - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935
 onboot:
-  - name: check
-    image: "mobylinux/check:c9e41ab96b3ea6a3ced97634751e20d12a5bf52f"
-    pid: host
-    capabilities:
-     - CAP_SYS_BOOT
-    readonly: true
-services:
   - name: dhcpcd
-    image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea"
+    image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
     binds:
      - /var:/var
      - /tmp:/etc
@@ -24,7 +17,13 @@ services:
      - CAP_NET_BIND_SERVICE
      - CAP_NET_RAW
     net: host
-    oomScoreAdj: -800
+    command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"]
+  - name: check
+    image: "mobylinux/check:c9e41ab96b3ea6a3ced97634751e20d12a5bf52f"
+    pid: host
+    capabilities:
+     - CAP_SYS_BOOT
+    readonly: true
 outputs:
   - format: kernel+initrd
   - format: iso-bios
diff --git a/test/virtsock/test-virtsock-server.yml b/test/virtsock/test-virtsock-server.yml
index e402d05d6..14b374518 100644
--- a/test/virtsock/test-virtsock-server.yml
+++ b/test/virtsock/test-virtsock-server.yml
@@ -27,7 +27,7 @@ services:
     oomScoreAdj: -800
     readonly: true
   - name: dhcpcd
-    image: "mobylinux/dhcpcd:3eb32da7ff8051f61e0f18edd90dd0fbfcf148ea"
+    image: "mobylinux/dhcpcd:0d4012269cb142972fed8542fbdc3ff5a7b695cd"
     binds:
      - /var:/var
      - /tmp:/etc