diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index 1d0deea1..b1da0f70 100644
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -2258,7 +2258,10 @@ func saveWorkflow(resp http.ResponseWriter, request *http.Request) {
 	// FIXME: Is this too drastic? May lead to issues in the future.
 	// Should maybe make a copy for the old org.
 	if workflow.OrgId != user.ActiveOrg.Id {
+		log.Printf("[WARNING] Editing workflow to be owned by %s", user.ActiveOrg.Id)
 		workflow.OrgId = user.ActiveOrg.Id
+		workflow.ExecutingOrg = user.ActiveOrg
+		workflow.Org = append(workflow.Org, user.ActiveOrg)
 	}
 
 	err = setWorkflow(ctx, workflow, fileId)
diff --git a/docker-compose.yml b/docker-compose.yml
index 5ed77582..014798f3 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -16,7 +16,7 @@ services:
     depends_on:
       - backend
   backend:
-    #build: ./backend
+    build: ./backend
     image: ghcr.io/frikky/shuffle-backend:0.8.3
     container_name: shuffle-backend
     hostname: ${BACKEND_HOSTNAME}