diff --git a/src/docker/api_blueprint.go b/src/docker/api_blueprint.go
index f1908ab6..3944ecee 100644
--- a/src/docker/api_blueprint.go
+++ b/src/docker/api_blueprint.go
@@ -61,8 +61,8 @@ type ContainerCreateRequestContainer struct {
 	Tty            bool              `json:"tty,omitempty"`
 	StdinOpen      bool              `json:"stdin_open,omitempty"`
 
-	Command string `json:"command,omitempty"`
-	Entrypoint string `json:"entrypoint,omitempty"`
+	Command strslice.StrSlice `json:"command,omitempty"`
+	Entrypoint strslice.StrSlice `json:"entrypoint,omitempty"`
 	Runtime string `json:"runtime,omitempty"`
 	WorkingDir string `json:"working_dir,omitempty"`
 	User string `json:"user,omitempty"`
@@ -515,12 +515,12 @@ func CreateService(serviceRequest DockerServiceCreateRequest, OnLog func(string)
 			}
 		}
 		
-		if container.Command != "" {
-			containerConfig.Cmd = strings.Fields(container.Command)
+		if container.Command != nil {
+			containerConfig.Cmd = strslice.StrSlice(container.Command)
 		}
 
-		if container.Entrypoint != "" {
-			containerConfig.Entrypoint = strslice.StrSlice(strings.Fields(container.Entrypoint))
+		if container.Entrypoint != nil {
+			containerConfig.Entrypoint = strslice.StrSlice(container.Entrypoint)
 		}
 
 		// For Expose / Ports
diff --git a/src/docker/export.go b/src/docker/export.go
index 1a063828..f697ffba 100644
--- a/src/docker/export.go
+++ b/src/docker/export.go
@@ -35,8 +35,8 @@ func ExportContainer(containerID string) (ContainerCreateRequestContainer, error
 			Image:        detailedInfo.Config.Image,
 			Environment:  detailedInfo.Config.Env,
 			Labels:       detailedInfo.Config.Labels,
-			Command:      strings.Join(detailedInfo.Config.Cmd, " "),
-			Entrypoint:   strings.Join(detailedInfo.Config.Entrypoint, " "),
+			Command:      detailedInfo.Config.Cmd,
+			Entrypoint:   detailedInfo.Config.Entrypoint,
 			WorkingDir:   detailedInfo.Config.WorkingDir,
 			User:         detailedInfo.Config.User,
 			Tty:          detailedInfo.Config.Tty,
diff --git a/src/docker/run.go b/src/docker/run.go
index d1d578a7..1df7ecf0 100644
--- a/src/docker/run.go
+++ b/src/docker/run.go
@@ -62,7 +62,10 @@ func RunDB(db utils.DatabaseConfig) (DockerServiceCreateRequest, error) {
 		Name: db.Hostname,
 		Image: imageName,
 		RestartPolicy: "always",
-		Command: "--wiredTigerCacheSizeGB 0.25",
+		Command: []string{
+			"mongod",
+			"--wiredTigerCacheSizeGB=0.25",
+		},
 		Environment: []string{
 			"MONGO_INITDB_ROOT_USERNAME=" + db.Username,
 			"MONGO_INITDB_ROOT_PASSWORD=" + db.Password,