diff --git a/.env b/.env
index 53204db2..0b1e8cee 100755
--- a/.env
+++ b/.env
@@ -1,5 +1,4 @@
 # Default execution environment for workers
-ORG_ID=Shuffle
 ENVIRONMENT_NAME=Shuffle
 
 # Sanitize liquid.py input
diff --git a/backend/go-app/main.go b/backend/go-app/main.go
index cfbc768a..bd939374 100755
--- a/backend/go-app/main.go
+++ b/backend/go-app/main.go
@@ -638,7 +638,7 @@ func handleRegister(resp http.ResponseWriter, request *http.Request) {
 			} else {
 				log.Printf("[DEBUG] Successfully created the default org!")
 
-				defaultEnv := os.Getenv("ORG_ID")
+				defaultEnv := os.Getenv("ENVIRONMENT_NAME")
 				if len(defaultEnv) == 0 {
 					defaultEnv = "Shuffle"
 					log.Printf("[DEBUG] Setting default environment for org to %s", defaultEnv)
@@ -3925,7 +3925,7 @@ func runInitEs(ctx context.Context) {
 		log.Printf("[INFO] Running with HTTPS proxy %s (env: HTTPS_PROXY)", httpsProxy)
 	}
 
-	defaultEnv := os.Getenv("ORG_ID")
+	defaultEnv := os.Getenv("ENVIRONMENT_NAME")
 	if len(defaultEnv) == 0 {
 		defaultEnv = "Shuffle"
 		log.Printf("[DEBUG] Setting default environment for org to %s", defaultEnv)
diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go
index 2331a273..c194d091 100755
--- a/backend/go-app/walkoff.go
+++ b/backend/go-app/walkoff.go
@@ -292,6 +292,8 @@ func handleGetWorkflowqueue(resp http.ResponseWriter, request *http.Request) {
 			log.Printf("[WARNING] Failed handling Orborus failover: %s", err)
 		}
 
+		log.Printf("[DEBUG] Issue with environment ID: %s", orgId)
+
 		return
 	}