diff --git a/docker-compose.yaml b/docker-compose.yaml
index d7b0936..058898e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -7,7 +7,7 @@ services:
       - ES_VERSION=7
       - INDEXING_ENABLED=true
       - JAVA_OPTS=-Dpolyglot.engine.WarnInterpreterOnly=false
-    image: niemen/conductor-server:7.1.6
+    image: niemen/conductor-server:7.1.7
     networks:
       - internal
     ports:
diff --git a/gql-bff/src/features/workflow/resolvers.js b/gql-bff/src/features/workflow/resolvers.js
index a12c988..214061f 100644
--- a/gql-bff/src/features/workflow/resolvers.js
+++ b/gql-bff/src/features/workflow/resolvers.js
@@ -57,7 +57,7 @@ const workflowResolvers = {
         ...input,
         description: JSON.stringify({
           description: input?.description,
-          tenantId: isGlobalAdmin(externalUser) ? null : externalUser?.tenantId,
+          tenantId: externalUser?.tenantId,
         }),
       };