diff --git a/client/src/pages/servapps/actionBar.jsx b/client/src/pages/servapps/actionBar.jsx
index 7ce3bc7..4f55599 100644
--- a/client/src/pages/servapps/actionBar.jsx
+++ b/client/src/pages/servapps/actionBar.jsx
@@ -118,6 +118,7 @@ const GetActions = ({
     />
     
     {!isUpdating && actions.filter((action) => {
+      updateAvailable = true
       return action.if.includes(state) || (updateAvailable && action.if.includes('update_available'));
     }).map((action) => {
       return <Tooltip title={action.t}>{action.e}</Tooltip>
diff --git a/package.json b/package.json
index 0f0c4cd..bb34069 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cosmos-server",
-  "version": "0.5.0-unstable12",
+  "version": "0.5.0-unstable13",
   "description": "",
   "main": "test-server.js",
   "bugs": {
diff --git a/src/docker/docker.go b/src/docker/docker.go
index 38cff4b..9c22765 100644
--- a/src/docker/docker.go
+++ b/src/docker/docker.go
@@ -343,19 +343,50 @@ func CheckUpdatesAvailable() map[string]bool {
 		scanner := bufio.NewScanner(rc)
 		defer  rc.Close()
 
+		needsUpdate := false
+
 		for scanner.Scan() {
 			newStr := scanner.Text()
-
 			// Check if a download has started
 			if strings.Contains(newStr, "\"status\":\"Pulling fs layer\"") {
 				utils.Log("Updates available for " + container.Image)
-				result[container.Names[0]] = true
-				rc.Close()
-				break
+
+				if !IsLabel(container, "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\"") {
 				utils.Log("No updates available for " + container.Image)
-				rc.Close()
-				break
+				
+				if !IsLabel(container, "cosmos-auto-update") {
+					rc.Close()
+					break
+				}
+			}
+		}
+
+		// 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)
+			if err != nil {
+				utils.Error("CheckUpdatesAvailable - local image - ", err)
+				continue
+			}
+
+			if localImage.ID != container.ImageID {
+				result[container.Names[0]] = true
+			}
+		}
+
+		if needsUpdate && IsLabel(container, "cosmos-auto-update") {
+			utils.Log("Downlaoded new update for " + container.Image + " ready to install")
+			_, err := EditContainer(container.ID, container)
+			if err != nil {
+				utils.Error("CheckUpdatesAvailable - Failed to update - ", err)
 			}
 		}
 	}
diff --git a/src/index.go b/src/index.go
index 54671b8..758a212 100644
--- a/src/index.go
+++ b/src/index.go
@@ -24,10 +24,6 @@ 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)