diff --git a/config/types.go b/config/types.go
index 7bc88e88..ed70320e 100644
--- a/config/types.go
+++ b/config/types.go
@@ -28,7 +28,7 @@ const (
 	SCOPE         = "io.rancher.os.scope"
 	SYSTEM        = "system"
 
-	OsConfigFile          = "/os-config.yml"
+	OsConfigFile          = "/usr/share/ros/os-config.yml"
 	CloudConfigFile       = "/var/lib/rancher/conf/cloud-config.yml"
 	CloudConfigScriptFile = "/var/lib/rancher/conf/cloud-config-script"
 	MetaDataFile          = "/var/lib/rancher/conf/metadata"
diff --git a/os-config.yml b/os-config.yml
index ea67bd1f..1b2706b5 100644
--- a/os-config.yml
+++ b/os-config.yml
@@ -271,8 +271,8 @@ rancher:
       - /home:/home
       - /opt:/opt
   system_docker:
-    args: [docker, -d, -s, overlay, -b, docker-sys, --fixed-cidr,
-      172.18.42.1/16, --restart=false, -g, /var/lib/system-docker, -G, root,
+    args: [-d, -s, overlay, -b, docker-sys, --fixed-cidr, 172.18.42.1/16,
+      --restart=false, -g, /var/lib/system-docker, -G, root,
       -H, 'unix:///var/run/system-docker.sock', --userland-proxy=false]
   upgrade:
     url: https://releases.rancher.com/os/versions.yml
@@ -280,4 +280,4 @@ rancher:
   user_docker:
     tls_args: [--tlsverify, --tlscacert=ca.pem, --tlscert=server-cert.pem, --tlskey=server-key.pem,
       '-H=0.0.0.0:2376']
-    args: [docker, -d, -s, overlay, -G, docker, -H, 'unix:///var/run/docker.sock', --userland-proxy=false]
+    args: [-d, -s, overlay, -G, docker, -H, 'unix:///var/run/docker.sock', --userland-proxy=false]