diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index 2331a273..729d100a 100755
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -280,7 +280,7 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 	//log.Printf("[AUDIT] Get workflow queue for org %s, env %s, orborus label %s", orgId, environment, orborusLabel)
 
 	ctx := shuffle.GetContext(request)
-	env, err := shuffle.GetEnvironment(ctx, orgId, "")
+	env, err := shuffle.GetEnvironment(ctx, "", orgId)
 	if err != nil {
 		log.Printf("[WARNING] No env found matching %s - continuing without updating orborus anyway: %s", orgId, err)
 	}
@@ -477,7 +477,7 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 			}
 
 			if len(orgId) > 0 {
-				env, err := shuffle.GetEnvironment(ctx, orgId, foundId)
+				env, err := shuffle.GetEnvironment(ctx, foundId, orgId)
 				if err != nil {
 					log.Printf("[WARNING] No env found matching %s - continuing without updating orborus anyway: %s", orgId, err)
 					//resp.WriteHeader(401)
diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go
index 9b5c87da..26f16017 100755
--- a/functions/onprem/orborus/orborus.go
+++ b/functions/onprem/orborus/orborus.go
@@ -813,20 +813,20 @@ func handleBackendImageDownload(ctx context.Context, images string) error {
 		newImages = append(newImages, curimage)
 
 		// Force remove the current image to avoid cached layers
-		if swarmConfig == "run" || swarmConfig == "swarm" {
-			_, err := dockercli.ImageRemove(ctx, curimage, image.RemoveOptions{
-				Force:         true,
-				PruneChildren: true,
-			})
+	//	if swarmConfig == "run" || swarmConfig == "swarm" {
+	//		_, err := dockercli.ImageRemove(ctx, curimage, image.RemoveOptions{
+	//			Force:         true,
+	//			PruneChildren: true,
+	//		})
 
-			if err != nil {
-				log.Printf("[ERROR] Failed removing image for re-download: %s", err)
-			} else {
-				log.Printf("[DEBUG] Removed image: %s", curimage)
-			}
-		} else {
-			//log.Printf("[DEBUG] Skipping image removal for %s as swarmConfig is not set to run or swarm. Value: %#v", curimage, swarmConfig)
-		}
+	//		if err != nil {
+	//			log.Printf("[ERROR] Failed removing image for re-download: %s", err)
+	//		} else {
+	//			log.Printf("[DEBUG] Removed image: %s", curimage)
+	//		}
+	//	} else {
+	//		//log.Printf("[DEBUG] Skipping image removal for %s as swarmConfig is not set to run or swarm. Value: %#v", curimage, swarmConfig)
+	//	}
 
 		err := shuffle.DownloadDockerImageBackend(&http.Client{Timeout: imagedownloadTimeout}, curimage)
 		if err != nil {
@@ -874,6 +874,7 @@ func handleBackendImageDownload(ctx context.Context, images string) error {
 					// Update the service to run with the new image
 					//docker service update --image username/imagename:latest servicename --force
 					serviceUpdateOptions := types.ServiceUpdateOptions{}
+					service.Spec.TaskTemplate.ForceUpdate++
 					resp, err := dockercli.ServiceUpdate(
 						ctx,
 						service.ID,