diff --git a/package.json b/package.json
index 33340df..e52af0a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.5.0-unstable14",
+  "version": "0.5.0-unstable15",
   "description": "",
   "main": "test-server.js",
   "bugs": {
diff --git a/src/docker/docker.go b/src/docker/docker.go
index 9c22765..4cb8cec 100644
--- a/src/docker/docker.go
+++ b/src/docker/docker.go
@@ -327,6 +327,12 @@ func CheckUpdatesAvailable() map[string]bool {
 
 	for _, container := range containers {
 		utils.Log("Checking for updates for " + container.Image)
+		
+		fullContainer, err := DockerClient.ContainerInspect(DockerContext, container.ID)
+		if err != nil {
+			utils.Error("CheckUpdatesAvailable", err)
+			continue
+		}
 
 		// check container is running 
 		if container.State != "running" {
@@ -351,27 +357,30 @@ func CheckUpdatesAvailable() map[string]bool {
 			if strings.Contains(newStr, "\"status\":\"Pulling fs layer\"") {
 				utils.Log("Updates available for " + container.Image)
 
-				if !IsLabel(container, "cosmos-auto-update") {
+				if !IsLabel(fullContainer, "cosmos-auto-update") {
 					result[container.Names[0]] = true
 					rc.Close()
 					break
 				} else {
 					needsUpdate = true
 				}
-			} else if strings.Contains(newStr, "\"status\":\"Status: Image is up to date\"") {
+			} else if strings.Contains(newStr, "\"status\":\"Status: Image is up to date") {
 				utils.Log("No updates available for " + container.Image)
 				
-				if !IsLabel(container, "cosmos-auto-update") {
+				if !IsLabel(fullContainer, "cosmos-auto-update") {
 					rc.Close()
 					break
 				}
+			} else {
+				utils.Log(newStr)
 			}
 		}
 
 		// no new image to pull, see if local image is matching
 		if !result[container.Names[0]] && !needsUpdate {
 			// check sum of local vs container image
-			localImage, _, err := cli.ImageInspectWithRaw(context.Background(), container.Image)
+			utils.Log("CheckUpdatesAvailable - Checking local image for change for " + container.Image)
+			localImage, _, err := DockerClient.ImageInspectWithRaw(DockerContext, container.Image)
 			if err != nil {
 				utils.Error("CheckUpdatesAvailable - local image - ", err)
 				continue
@@ -379,12 +388,16 @@ func CheckUpdatesAvailable() map[string]bool {
 
 			if localImage.ID != container.ImageID {
 				result[container.Names[0]] = true
+				needsUpdate = true
+				utils.Log("CheckUpdatesAvailable - Local updates available for " + container.Image)
+			} else {
+				utils.Log("CheckUpdatesAvailable - No local updates available for " + container.Image)
 			}
 		}
 
-		if needsUpdate && IsLabel(container, "cosmos-auto-update") {
+		if needsUpdate && IsLabel(fullContainer, "cosmos-auto-update") {
 			utils.Log("Downlaoded new update for " + container.Image + " ready to install")
-			_, err := EditContainer(container.ID, container)
+			_, err := EditContainer(container.ID, fullContainer)
 			if err != nil {
 				utils.Error("CheckUpdatesAvailable - Failed to update - ", err)
 			}
diff --git a/src/index.go b/src/index.go
index 758a212..54671b8 100644
--- a/src/index.go
+++ b/src/index.go
@@ -24,6 +24,10 @@ func main() {
 
 	docker.BootstrapAllContainersFromTags()
 
+	// TODO DELET THIS BEFORE RELEASE
+
+	docker.CheckUpdatesAvailable()
+
 	version, err := docker.DockerClient.ServerVersion(context.Background())
 	if err == nil {
 		utils.Log("Docker API version: " + version.APIVersion)