diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index 902384f3..b2c48011 100755
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -246,16 +246,16 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 	}
 
 	// This is really the environment's name - NOT org-id
-	orgId := request.Header.Get("Org-Id")
-	if len(orgId) == 0 {
+	environment := request.Header.Get("Org-Id")
+	if len(environment) == 0 {
 		log.Printf("[AUDIT] No org-id header set")
 		resp.WriteHeader(401)
 		resp.Write([]byte(fmt.Sprintf(`{"success": false, "reason": "Specify the org-id header."}`)))
 		return
 	}
 
-	environment := request.Header.Get("org")
-	if len(environment) == 0 {
+	orgId := request.Header.Get("org")
+	if len(orgId) == 0 {
 		//log.Printf("[AUDIT] No 'org' header set (get workflow queue). ")
 		/*
 			resp.WriteHeader(403)
@@ -281,27 +281,14 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 
 	ctx := shuffle.GetContext(request)
 	// Get all env and check the name?
-	envs, err := shuffle.GetEnvironments(ctx, orgId)
+	envs, err := shuffle.GetEnvironments(ctx, environment)
 	if err != nil || len(envs) == 0 {
-		log.Printf("[WARNING] No env found matching %s - continuing without updating orborus anyway: %s", orgId, err)
-	}
-
-	body, err := io.ReadAll(request.Body)
-	if err != nil {
-		log.Printf("[ERROR] Failed to read body of orborus workflow queue request")
-		return
-	}
-
-	var envData shuffle.OrborusStats
-	err = json.Unmarshal(body, &envData)
-	if err != nil {
-		log.Printf("[ERROR] Failed to unmarshal orborus workflow queue request")
-		return
+		log.Printf("[WARNING] No env found matching %s - continuing without updating orborus anyway: %s", environment, err)
 	}
 
 	var env *shuffle.Environment
 	for _, e := range envs {
-		if e.Name == envData.Environment {
+		if e.Name == environment {
 			env = &e
 			break
 		}
@@ -319,7 +306,7 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 
 	//log.Printf("Found env: %#v", env)
 	if len(env.OrgId) > 0 {
-		environment = env.OrgId
+		orgId = env.OrgId
 	}
 
 	// FIXME: Workflow stats disabled for now
@@ -360,7 +347,7 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 					//if int(envData.CPUPercent) > percentageCheck {
 					// Get cached data
 					percentages := []float64{}
-					cacheKey := fmt.Sprintf("%s_%s_percent", orgId, strings.ToLower(environment))
+					cacheKey := fmt.Sprintf("%s_%s_percent", environment , strings.ToLower(orgId))
 
 					// Marshal float list into []byte
 					cacheData := []byte{}
@@ -470,7 +457,7 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 		}
 	}
 
-	executionRequests, err := shuffle.GetWorkflowQueue(ctx, orgId, 100)
+	executionRequests, err := shuffle.GetWorkflowQueue(ctx, environment, 100)
 	if err != nil {
 		// Skipping as this comes up over and over
 		//log.Printf("(2) Failed reading body for workflowqueue: %s", err)
@@ -498,8 +485,8 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 				}
 			}
 
-			if len(orgId) > 0 {
-				env, err := shuffle.GetEnvironment(ctx, foundId, orgId)
+			if len(environment) > 0 {
+				env, err := shuffle.GetEnvironment(ctx, foundId, environment)
 				if err != nil {
 					log.Printf("[WARNING] No env found matching %s - continuing without updating orborus anyway: %s", orgId, err)
 					//resp.WriteHeader(401)