diff --git a/config/default.go b/config/default.go
index a7d9f0cd..f6a471b3 100644
--- a/config/default.go
+++ b/config/default.go
@@ -279,8 +279,8 @@ func NewConfig() *Config {
 				},
 				LogDriver: "json-file",
 			},
-			"userdocker": {
-				Image:      "userdocker",
+			"docker": {
+				Image:      "docker",
 				Restart:    "always",
 				Privileged: true,
 				Pid:        "host",
@@ -296,15 +296,15 @@ func NewConfig() *Config {
 					"all-volumes",
 				},
 			},
-			"userdockerwait": {
-				Image: "userdockerwait",
+			"dockerwait": {
+				Image: "dockerwait",
 				Net:   "host",
 				Labels: project.NewSliceorMap(map[string]string{
 					DETACH: "false",
 					SCOPE:  SYSTEM,
 				}),
 				Links: []string{
-					"userdocker",
+					"docker",
 				},
 				VolumesFrom: []string{
 					"all-volumes",
diff --git a/scripts/dockerimages/05-userdocker b/scripts/dockerimages/05-docker
similarity index 100%
rename from scripts/dockerimages/05-userdocker
rename to scripts/dockerimages/05-docker
diff --git a/scripts/dockerimages/11-userdockerwait b/scripts/dockerimages/11-dockerwait
similarity index 100%
rename from scripts/dockerimages/11-userdockerwait
rename to scripts/dockerimages/11-dockerwait