diff --git a/pkg/workflow_template.go b/pkg/workflow_template.go
index 7d99771..3d61cdf 100644
--- a/pkg/workflow_template.go
+++ b/pkg/workflow_template.go
@@ -456,6 +456,7 @@ func (c *Client) CreateWorkflowTemplateVersion(namespace string, workflowTemplat
 		return nil, err
 	}
 
+	workflowTemplate.WorkflowTemplateVersionId = workflowTemplateVersionId
 	latest, err := c.getArgoWorkflowTemplate(namespace, workflowTemplate.UID, "latest")
 	if err != nil {
 		log.WithFields(log.Fields{
diff --git a/server/workflow_template_server.go b/server/workflow_template_server.go
index 596a191..5d1a87d 100644
--- a/server/workflow_template_server.go
+++ b/server/workflow_template_server.go
@@ -91,13 +91,8 @@ func (s *WorkflowTemplateServer) CreateWorkflowTemplateVersion(ctx context.Conte
 		return nil, err
 	}
 
-	if len(workflowTemplate.Labels) != 0 {
-		_, err = client.InsertLabelsBuilder(v1.TypeWorkflowTemplateVersion, workflowTemplate.ID, workflowTemplate.Labels).
-			RunWith(client.DB).
-			Exec()
-		if err != nil {
-			return nil, err
-		}
+	if _, err := client.InsertLabels(v1.TypeWorkflowTemplateVersion, workflowTemplate.WorkflowTemplateVersionId, workflowTemplate.Labels); err != nil {
+		return nil, err
 	}
 
 	req.WorkflowTemplate.Uid = workflowTemplate.UID