diff --git a/.github/workflows/jira-issues.yaml b/.github/workflows/jira-issues.yaml
index 9bba702c..1047bb61 100644
--- a/.github/workflows/jira-issues.yaml
+++ b/.github/workflows/jira-issues.yaml
@@ -46,8 +46,6 @@ jobs:
           # customfield_10089 is "Issue Link", customfield_10371 is "Source" (use JIRA API to retrieve)
           extraFields: '{ "customfield_10089": "${{ github.event.issue.html_url || github.event.pull_request.html_url }}",
                           "customfield_10371": { "value": "GitHub" },
-                          "customfield_10535": [{ "value": "Service Mesh" }],
-                          "components": [{ "name": "${{ github.event.repository.name }}" }],
                           "labels": ${{ steps.set-ticket-labels.outputs.LABELS }} }'
         env:
           JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
diff --git a/.github/workflows/jira-pr.yaml b/.github/workflows/jira-pr.yaml
index 8af54cdc..4d9b7608 100644
--- a/.github/workflows/jira-pr.yaml
+++ b/.github/workflows/jira-pr.yaml
@@ -59,8 +59,6 @@ jobs:
           # customfield_10089 is "Issue Link", customfield_10371 is "Source" (use JIRA API to retrieve)
           extraFields: '{ "customfield_10089": "${{ github.event.pull_request.html_url }}",
                           "customfield_10371": { "value": "GitHub" },
-                          "customfield_10535": [{ "value": "Service Mesh" }],
-                          "components": [{ "name": "${{ github.event.repository.name }}" }],
                           "labels": ${{ steps.set-ticket-labels.outputs.LABELS }} }'
         env:
           JIRA_BASE_URL: ${{ secrets.JIRA_BASE_URL }}
diff --git a/pkg/consuldp/xds.go b/pkg/consuldp/xds.go
index e85e1de9..f3cb564f 100644
--- a/pkg/consuldp/xds.go
+++ b/pkg/consuldp/xds.go
@@ -28,7 +28,7 @@ const (
 func (cdp *ConsulDataplane) director(ctx context.Context, fullMethodName string) (context.Context, *grpc.ClientConn, error) {
 	// check to ensure other unknown/unregistered RPCs are not proxied to the target consul server.
 	if !strings.Contains(fullMethodName, envoyADSMethodName) {
-		return ctx, nil, status.Errorf(codes.Unimplemented, fmt.Sprintf("Unknown method %s", fullMethodName))
+		return ctx, nil, status.Errorf(codes.Unimplemented, "Unknown method %s", fullMethodName)
 	}
 
 	var mdCopy metadata.MD