diff --git a/images/02-acpid/Dockerfile b/images/02-acpid/Dockerfile
deleted file mode 100644
index e2f1cc9c..00000000
--- a/images/02-acpid/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM rancher/os-base
-CMD ["/usr/sbin/acpid", "-f"]
diff --git a/images/02-docker/Dockerfile b/images/02-docker/Dockerfile
deleted file mode 100644
index d36402a9..00000000
--- a/images/02-docker/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM rancher/os-base
-CMD ["/usr/bin/user-docker"]
diff --git a/images/02-ntp/Dockerfile b/images/02-ntp/Dockerfile
deleted file mode 100644
index 890419bc..00000000
--- a/images/02-ntp/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM rancher/os-base
-COPY ntp.sh /
-CMD ["/ntp.sh"]
diff --git a/images/02-ntp/ntp.sh b/images/02-ntp/ntp.sh
deleted file mode 100755
index 6cb21b2e..00000000
--- a/images/02-ntp/ntp.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-exec ntpd --nofork -g
diff --git a/images/02-state/Dockerfile b/images/02-state/Dockerfile
deleted file mode 100644
index 4f530f7c..00000000
--- a/images/02-state/Dockerfile
+++ /dev/null
@@ -1,2 +0,0 @@
-FROM rancher/os-base
-CMD ["echo"]
diff --git a/os-config.tpl.yml b/os-config.tpl.yml
index 3277d3ca..36bf94c2 100644
--- a/os-config.tpl.yml
+++ b/os-config.tpl.yml
@@ -77,7 +77,8 @@ rancher:
   services:
     {{if eq "amd64" .ARCH -}}
     acpid:
-      image: {{.OS_REPO}}/os-acpid:{{.VERSION}}{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: /usr/sbin/acpid -f
       labels:
         io.rancher.os.scope: system
       net: host
@@ -88,7 +89,8 @@ rancher:
       - system-volumes
     {{end -}}
     all-volumes:
-      image: {{.OS_REPO}}/os-state:{{.VERSION}}{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: echo
       labels:
         io.rancher.os.createonly: "true"
         io.rancher.os.scope: system
@@ -130,7 +132,8 @@ rancher:
       - command-volumes
       - system-volumes
     command-volumes:
-      image: {{.OS_REPO}}/os-state:{{.VERSION}}{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: echo
       labels:
         io.rancher.os.createonly: "true"
         io.rancher.os.scope: system
@@ -176,7 +179,8 @@ rancher:
       - /media:/media:shared
       - /mnt:/mnt:shared
     container-data-volumes:
-      image: {{.OS_REPO}}/os-state:{{.VERSION}}{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: echo
       labels:
         io.rancher.os.createonly: "true"
         io.rancher.os.scope: system
@@ -214,7 +218,8 @@ rancher:
       - command-volumes
       - system-volumes
     ntp:
-      image: {{.OS_REPO}}/os-ntp:{{.VERSION}}{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: ntpd --nofork -g
       labels:
         io.rancher.os.scope: system
         io.rancher.os.after: network-pre
@@ -259,7 +264,8 @@ rancher:
       volumes_from:
       - system-volumes
     system-volumes:
-      image: {{.OS_REPO}}/os-state:{{.VERSION}}{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: echo
       labels:
         io.rancher.os.createonly: "true"
         io.rancher.os.scope: system
@@ -308,7 +314,8 @@ rancher:
       volumes_from:
       - system-volumes
     user-volumes:
-      image: {{.OS_REPO}}/os-state:{{.VERSION}}{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: echo
       labels:
         io.rancher.os.createonly: "true"
         io.rancher.os.scope: system
@@ -320,7 +327,8 @@ rancher:
       - /home:/home
       - /opt:/opt
     docker:
-      image: {{.OS_REPO}}/os-docker:{{.VERSION}}{{.SUFFIX}}
+      image: {{.OS_REPO}}/os-base:{{.VERSION}}{{.SUFFIX}}
+      command: /usr/bin/user-docker
       environment:
       - HTTP_PROXY
       - HTTPS_PROXY