diff --git a/internal/daemon/controller/handlers/workers/worker_service.go b/internal/daemon/controller/handlers/workers/worker_service.go
index a98316e03f..9332014259 100644
--- a/internal/daemon/controller/handlers/workers/worker_service.go
+++ b/internal/daemon/controller/handlers/workers/worker_service.go
@@ -395,7 +395,7 @@ func toProto(ctx context.Context, in *servers.Worker, opt ...handlers.Option) (*
 	}
 	if outputFields.Has(globals.CanonicalTagsField) && len(in.CanonicalTags()) > 0 {
 		var err error
-		out.Tags, err = tagsToMapProto(in.CanonicalTags())
+		out.CanonicalTags, err = tagsToMapProto(in.CanonicalTags())
 		if err != nil {
 			return nil, errors.Wrap(ctx, err, op, errors.WithMsg("error preparing canonical tags proto"))
 		}
diff --git a/internal/daemon/controller/handlers/workers/worker_service_test.go b/internal/daemon/controller/handlers/workers/worker_service_test.go
index 64d9505bff..0613997bcc 100644
--- a/internal/daemon/controller/handlers/workers/worker_service_test.go
+++ b/internal/daemon/controller/handlers/workers/worker_service_test.go
@@ -31,6 +31,17 @@ import (
 
 var testAuthorizedActions = []string{"no-op", "read", "update", "delete"}
 
+func structListValue(t *testing.T, ss ...string) *structpb.ListValue {
+	t.Helper()
+	var val []interface{}
+	for _, s := range ss {
+		val = append(val, s)
+	}
+	lv, err := structpb.NewList(val)
+	require.NoError(t, err)
+	return lv
+}
+
 func TestGet(t *testing.T) {
 	conn, _ := db.TestSetup(t, "postgres")
 	wrap := db.TestWrapper(t)
@@ -40,14 +51,29 @@ func TestGet(t *testing.T) {
 	}
 	rw := db.New(conn)
 	kms := kms.TestKms(t, conn, wrap)
+	repo, err := servers.NewRepository(rw, rw, kms)
+	require.NoError(t, err)
 	repoFn := func() (*servers.Repository, error) {
-		return servers.NewRepository(rw, rw, kms)
+		return repo, nil
 	}
 
 	worker := servers.TestWorker(t, conn, wrap,
 		servers.WithName("test worker names"),
 		servers.WithDescription("test worker description"),
-		servers.WithAddress("test worker address"))
+		servers.WithAddress("test worker address"),
+		servers.WithWorkerTags(&servers.Tag{"key", "val"}))
+	// Add config tags to the created worker
+	worker, err = repo.UpsertWorkerStatus(context.Background(),
+		servers.NewWorkerForStatus(worker.GetScopeId(),
+			servers.WithName(worker.GetWorkerReportedName()),
+			servers.WithAddress(worker.GetWorkerReportedAddress()),
+			servers.WithWorkerTags(&servers.Tag{
+				Key:   "config",
+				Value: "test",
+			})),
+		servers.WithUpdateTags(true),
+		servers.WithPublicId(worker.GetPublicId()))
+	require.NoError(t, err)
 
 	wantWorker := &pb.Worker{
 		Id:                worker.GetPublicId(),
@@ -62,9 +88,19 @@ func TestGet(t *testing.T) {
 		AuthorizedActions: testAuthorizedActions,
 		CanonicalAddress:  worker.CanonicalAddress(),
 		LastStatusTime:    worker.GetLastStatusTime().GetTimestamp(),
+		CanonicalTags: map[string]*structpb.ListValue{
+			"key":    structListValue(t, "val"),
+			"config": structListValue(t, "test"),
+		},
+		Tags: map[string]*structpb.ListValue{
+			"key": structListValue(t, "val"),
+		},
 		WorkerConfig: &pb.WorkerConfig{
 			Address: worker.GetWorkerReportedAddress(),
 			Name:    worker.GetWorkerReportedName(),
+			Tags: map[string]*structpb.ListValue{
+				"config": structListValue(t, "test"),
+			},
 		},
 	}
 
@@ -631,11 +667,7 @@ func TestUpdate(t *testing.T) {
 				},
 				Item: &pb.Worker{
 					Tags: map[string]*structpb.ListValue{
-						"foo": func() *structpb.ListValue {
-							l, err := structpb.NewList([]interface{}{"bar"})
-							require.NoError(t, err)
-							return l
-						}(),
+						"foo": structListValue(t, "bar"),
 					},
 				},
 			},
@@ -650,11 +682,7 @@ func TestUpdate(t *testing.T) {
 				},
 				Item: &pb.Worker{
 					CanonicalTags: map[string]*structpb.ListValue{
-						"foo": func() *structpb.ListValue {
-							l, err := structpb.NewList([]interface{}{"bar"})
-							require.NoError(t, err)
-							return l
-						}(),
+						"foo": structListValue(t, "bar"),
 					},
 				},
 			},
diff --git a/internal/servers/repository_worker_test.go b/internal/servers/repository_worker_test.go
index 7daaffb5e3..732aebc3f3 100644
--- a/internal/servers/repository_worker_test.go
+++ b/internal/servers/repository_worker_test.go
@@ -145,11 +145,33 @@ func TestLookupWorker(t *testing.T) {
 	require.NoError(t, err)
 	ctx := context.Background()
 
-	w := servers.TestWorker(t, conn, wrapper)
+	w := servers.TestWorker(t, conn, wrapper,
+		servers.WithName("name"),
+		servers.WithDescription("description"),
+		servers.WithAddress("address"),
+		servers.WithWorkerTags(&servers.Tag{"key", "val"}))
+	w, err = repo.UpsertWorkerStatus(context.Background(),
+		servers.NewWorkerForStatus(w.GetScopeId(),
+			servers.WithName(w.GetWorkerReportedName()),
+			servers.WithAddress(w.GetWorkerReportedAddress()),
+			servers.WithWorkerTags(&servers.Tag{
+				Key:   "config",
+				Value: "test",
+			})),
+		servers.WithUpdateTags(true),
+		servers.WithPublicId(w.GetPublicId()))
+	require.NoError(t, err)
+
 	t.Run("success", func(t *testing.T) {
 		got, err := repo.LookupWorker(ctx, w.GetPublicId())
 		require.NoError(t, err)
-		assert.Empty(t, cmp.Diff(w.Worker, got.Worker, protocmp.Transform()))
+		assert.Empty(t, cmp.Diff(w, got, protocmp.Transform()))
+		assert.Equal(t, map[string][]string{"key": {"val"}}, got.GetApiTags())
+		assert.Equal(t, map[string][]string{"config": {"test"}}, got.GetConfigTags())
+		assert.Equal(t, map[string][]string{
+			"key":    {"val"},
+			"config": {"test"},
+		}, got.CanonicalTags())
 	})
 	t.Run("not found", func(t *testing.T) {
 		got, err := repo.LookupWorker(ctx, "w_unknownid")
diff --git a/internal/servers/testing.go b/internal/servers/testing.go
index f09b65eae2..1cd0810269 100644
--- a/internal/servers/testing.go
+++ b/internal/servers/testing.go
@@ -11,6 +11,7 @@ import (
 	"github.com/hashicorp/boundary/internal/db/timestamp"
 	"github.com/hashicorp/boundary/internal/iam"
 	"github.com/hashicorp/boundary/internal/kms"
+	"github.com/hashicorp/boundary/internal/servers/store"
 	"github.com/hashicorp/boundary/internal/types/scope"
 	wrapping "github.com/hashicorp/go-kms-wrapping/v2"
 	"github.com/stretchr/testify/require"
@@ -103,6 +104,18 @@ func TestWorker(t *testing.T, conn *db.DB, wrapper wrapping.Wrapper, opt ...Opti
 	require.NotNil(t, wrk)
 	opts := getOpts(opt...)
 
+	if len(opts.withWorkerTags) > 0 {
+		var tags []interface{}
+		for _, t := range opts.withWorkerTags {
+			tags = append(tags, &store.WorkerTag{
+				WorkerId: wrk.GetPublicId(),
+				Key:      t.Key,
+				Value:    t.Value,
+				Source:   "api",
+			})
+		}
+		require.NoError(t, rw.CreateItems(ctx, tags))
+	}
 	var mask []string
 	if opts.withName != "" {
 		wrk.Name = opts.withName