diff --git a/jflyte/src/main/java/org/flyte/jflyte/ExecuteDynamicWorkflow.java b/jflyte/src/main/java/org/flyte/jflyte/ExecuteDynamicWorkflow.java
index 6b0079846..21cb3338e 100644
--- a/jflyte/src/main/java/org/flyte/jflyte/ExecuteDynamicWorkflow.java
+++ b/jflyte/src/main/java/org/flyte/jflyte/ExecuteDynamicWorkflow.java
@@ -203,44 +203,47 @@ static DynamicJobSpec rewrite(
       Map<TaskIdentifier, TaskTemplate> taskTemplates,
       Map<WorkflowIdentifier, WorkflowTemplate> workflowTemplates) {
 
-    WorkflowNodeVisitor workflowNodeVisitor =
-        IdentifierRewrite.builder()
-            .domain(executionConfig.domain())
-            .project(executionConfig.project())
-            .version(executionConfig.version())
-            .adminClient(
-                FlyteAdminClient.create(config.platformUrl(), config.platformInsecure(), null))
-            .build()
-            .visitor();
-
-    List<Node> rewrittenNodes =
-        spec.nodes().stream().map(workflowNodeVisitor::visitNode).collect(toUnmodifiableList());
-
-    Map<WorkflowIdentifier, WorkflowTemplate> usedSubWorkflows =
-        ProjectClosure.collectSubWorkflows(rewrittenNodes, workflowTemplates);
-
-    Map<TaskIdentifier, TaskTemplate> usedTaskTemplates =
-        ProjectClosure.collectTasks(rewrittenNodes, taskTemplates);
-
-    // FIXME one sub-workflow can use more sub-workflows, we should recursively collect used tasks
-    // and workflows
-
-    Map<WorkflowIdentifier, WorkflowTemplate> rewrittenUsedSubWorkflows =
-        mapValues(usedSubWorkflows, workflowNodeVisitor::visitWorkflowTemplate);
-
-    return spec.toBuilder()
-        .nodes(rewrittenNodes)
-        .subWorkflows(
-            ImmutableMap.<WorkflowIdentifier, WorkflowTemplate>builder()
-                .putAll(spec.subWorkflows())
-                .putAll(rewrittenUsedSubWorkflows)
-                .build())
-        .tasks(
-            ImmutableMap.<TaskIdentifier, TaskTemplate>builder()
-                .putAll(spec.tasks())
-                .putAll(usedTaskTemplates)
-                .build())
-        .build();
+    try (FlyteAdminClient flyteAdminClient =
+        FlyteAdminClient.create(config.platformUrl(), config.platformInsecure(), null)) {
+
+      WorkflowNodeVisitor workflowNodeVisitor =
+          IdentifierRewrite.builder()
+              .domain(executionConfig.domain())
+              .project(executionConfig.project())
+              .version(executionConfig.version())
+              .adminClient(flyteAdminClient)
+              .build()
+              .visitor();
+
+      List<Node> rewrittenNodes =
+          spec.nodes().stream().map(workflowNodeVisitor::visitNode).collect(toUnmodifiableList());
+
+      Map<WorkflowIdentifier, WorkflowTemplate> usedSubWorkflows =
+          ProjectClosure.collectSubWorkflows(rewrittenNodes, workflowTemplates);
+
+      Map<TaskIdentifier, TaskTemplate> usedTaskTemplates =
+          ProjectClosure.collectTasks(rewrittenNodes, taskTemplates);
+
+      // FIXME one sub-workflow can use more sub-workflows, we should recursively collect used tasks
+      // and workflows
+
+      Map<WorkflowIdentifier, WorkflowTemplate> rewrittenUsedSubWorkflows =
+          mapValues(usedSubWorkflows, workflowNodeVisitor::visitWorkflowTemplate);
+
+      return spec.toBuilder()
+          .nodes(rewrittenNodes)
+          .subWorkflows(
+              ImmutableMap.<WorkflowIdentifier, WorkflowTemplate>builder()
+                  .putAll(spec.subWorkflows())
+                  .putAll(rewrittenUsedSubWorkflows)
+                  .build())
+          .tasks(
+              ImmutableMap.<TaskIdentifier, TaskTemplate>builder()
+                  .putAll(spec.tasks())
+                  .putAll(usedTaskTemplates)
+                  .build())
+          .build();
+    }
   }
 
   private static DynamicWorkflowTask getDynamicWorkflowTask(String name) {