diff --git a/README.md b/README.md
index fdf437e0a5..9145ecf76e 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ OSM runs an Envoy based control plane on Kubernetes, can be configured with SMI
 
 ### Project status
 
-OSM is under active development and is **NOT** ready for production workloads. 
+OSM is under active development and is **NOT** ready for production workloads.
 
 ### Support
 
@@ -62,10 +62,10 @@ OSM is an open source project that is [**not** covered by the Microsoft Azure su
 
 |   Specification Component    |         Supported Release          |          Comments          |
 | :---------------------------- | :--------------------------------: |  :--------------------------------: |
-| Traffic Access Control  |  [v1alpha2](https://github.com/servicemeshinterface/smi-spec/blob/master/apis/traffic-access/v1alpha2/traffic-access.md)  | |
-| Traffic Specs  |  [v1alpha3](https://github.com/servicemeshinterface/smi-spec/blob/master/apis/traffic-specs/v1alpha3/traffic-specs.md)  | |
-| Traffic Split  |  [v1alpha2](https://github.com/servicemeshinterface/smi-spec/blob/master/apis/traffic-split/v1alpha2/traffic-split.md) | |
-| Traffic Metrics  | [v1alpha1](https://github.com/servicemeshinterface/smi-spec/blob/master/apis/traffic-metrics/v1alpha1/traffic-metrics.md) | 🚧 **In Progress** [#379](https://github.com/openservicemesh/osm/issues/379) 🚧 |
+| Traffic Access Control  |  [v1alpha2](https://github.com/servicemeshinterface/smi-spec/blob/v0.6.0/apis/traffic-access/v1alpha2/traffic-access.md)  | |
+| Traffic Specs  |  [v1alpha4](https://github.com/servicemeshinterface/smi-spec/blob/v0.6.0/apis/traffic-specs/v1alpha4/traffic-specs.md)  | |
+| Traffic Split  |  [v1alpha2](https://github.com/servicemeshinterface/smi-spec/blob/v0.6.0/apis/traffic-split/v1alpha2/traffic-split.md) | |
+| Traffic Metrics  | [v1alpha1](https://github.com/servicemeshinterface/smi-spec/blob/v0.6.0/apis/traffic-metrics/v1alpha1/traffic-metrics.md) | 🚧 **In Progress** [#379](https://github.com/openservicemesh/osm/issues/379) 🚧 |
 
 ## OSM Design
 
@@ -96,7 +96,7 @@ $ osm install
 See the [installation guide](docs/installation_guide.md) for more detailed options.
 
 ## Demos
-We have provided two demos for you to experience OSM. 
+We have provided two demos for you to experience OSM.
 
 - The [automated demo](demo/README.md) is a set of scripts anyone can run and shows how OSM can manage, secure and provide observability for microservice environments.
 - The [manual demo](docs/example/README.md) is a step-by-step walkthrough set of instruction of the automated demo.
diff --git a/charts/osm/crds/specs.yaml b/charts/osm/crds/specs.yaml
index 4a16545a29..a3934aa1f7 100644
--- a/charts/osm/crds/specs.yaml
+++ b/charts/osm/crds/specs.yaml
@@ -5,18 +5,21 @@ metadata:
   name: httproutegroups.specs.smi-spec.io
 spec:
   group: specs.smi-spec.io
-  scope: Namespaced 
+  scope: Namespaced
   names:
     kind: HTTPRouteGroup
     shortNames:
       - htr
     plural: httproutegroups
     singular: httproutegroup
-  version: v1alpha3
+  version: v1alpha4
   versions:
-    - name: v1alpha3
+    - name: v1alpha4
       served: true
       storage: true
+    - name: v1alpha3
+      served: false
+      storage: false
     - name: v1alpha2
       served: false
       storage: false
@@ -76,21 +79,88 @@ metadata:
   name: tcproutes.specs.smi-spec.io
 spec:
   group: specs.smi-spec.io
-  scope: Namespaced 
+  scope: Namespaced
   names:
     kind: TCPRoute
     shortNames:
       - tr
     plural: tcproutes
     singular: tcproute
-  version: v1alpha3
+  version: v1alpha4
   versions:
+    - name: v1alpha4
+      served: true
+      storage: true
     - name: v1alpha3
+      served: false
+      storage: false
+    - name: v1alpha2
+      served: false
+      storage: false
+    - name: v1alpha1
+      served: false
+      storage: false
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          required:
+            - matches
+          properties:
+            matches:
+              description: Match conditions of this route.
+              type: object
+              required:
+                - ports
+              properties:
+                ports:
+                  description: Port numbers to match TCP traffic.
+                  type: array
+                  items:
+                    type: integer
+---
+apiVersion: apiextensions.k8s.io/v1beta1
+kind: CustomResourceDefinition
+metadata:
+  name: udproutes.specs.smi-spec.io
+spec:
+  group: specs.smi-spec.io
+  scope: Namespaced
+  names:
+    kind: UDPRoute
+    shortNames:
+      - ur
+    plural: udproutes
+    singular: udproute
+  version: v1alpha4
+  versions:
+    - name: v1alpha4
       served: true
       storage: true
+    - name: v1alpha3
+      served: false
+      storage: false
     - name: v1alpha2
       served: false
       storage: false
     - name: v1alpha1
       served: false
       storage: false
+  validation:
+    openAPIV3Schema:
+      properties:
+        spec:
+          required:
+            - matches
+          properties:
+            matches:
+              description: Match conditions of this route.
+              type: object
+              required:
+                - ports
+              properties:
+                ports:
+                  description: Port numbers to match UDP traffic.
+                  type: array
+                  items:
+                    type: integer
\ No newline at end of file
diff --git a/demo/deploy-traffic-specs.sh b/demo/deploy-traffic-specs.sh
index 281cde785b..e13cf10178 100755
--- a/demo/deploy-traffic-specs.sh
+++ b/demo/deploy-traffic-specs.sh
@@ -7,7 +7,7 @@ source .env
 
 echo "Create Bookstore HTTPRouteGroup"
 kubectl apply -f - <<EOF
-apiVersion: specs.smi-spec.io/v1alpha3
+apiVersion: specs.smi-spec.io/v1alpha4
 kind: HTTPRouteGroup
 metadata:
   name: bookstore-service-routes
@@ -34,7 +34,7 @@ EOF
 
 echo "Create Bookwarehouse HTTPRouteGroup"
 kubectl apply -f - <<EOF
-apiVersion: specs.smi-spec.io/v1alpha3
+apiVersion: specs.smi-spec.io/v1alpha4
 kind: HTTPRouteGroup
 metadata:
   name: bookwarehouse-service-routes
diff --git a/docs/example/README.md b/docs/example/README.md
index c0fda0179a..b9177b2c46 100644
--- a/docs/example/README.md
+++ b/docs/example/README.md
@@ -221,6 +221,6 @@ $ osm dashboard
 ```
 Simply navigate to http://localhost:3000 to access the Grafana dashboards. The default user name is `admin` and the default password is `admin`. On the Grafana homepage click on the **Home** icon, you will see a folders containing dashboards for both OSM Control Plan and OSM Data Plane.
 
-[1]: https://github.com/servicemeshinterface/smi-spec/blob/v0.5.0/apis/traffic-access/v1alpha2/traffic-access.md
-[2]: https://github.com/servicemeshinterface/smi-spec/blob/v0.5.0/apis/traffic-specs/v1alpha3/traffic-specs.md
-[3]: https://github.com/servicemeshinterface/smi-spec/blob/v0.5.0/apis/traffic-split/v1alpha2/traffic-split.md
+[1]: https://github.com/servicemeshinterface/smi-spec/blob/v0.6.0/apis/traffic-access/v1alpha2/traffic-access.md
+[2]: https://github.com/servicemeshinterface/smi-spec/blob/v0.6.0/apis/traffic-specs/v1alpha4/traffic-specs.md
+[3]: https://github.com/servicemeshinterface/smi-spec/blob/v0.6.0/apis/traffic-split/v1alpha2/traffic-split.md
diff --git a/docs/example/manifests/access/traffic-access.yaml b/docs/example/manifests/access/traffic-access.yaml
index cd2d1cd737..8bc17491a5 100644
--- a/docs/example/manifests/access/traffic-access.yaml
+++ b/docs/example/manifests/access/traffic-access.yaml
@@ -22,7 +22,7 @@ spec:
     #name: bookthief
     #namespace: bookthief
 ---
-apiVersion: specs.smi-spec.io/v1alpha3
+apiVersion: specs.smi-spec.io/v1alpha4
 kind: HTTPRouteGroup
 metadata:
   name: bookstore-service-routes
diff --git a/experimental/routes_refactor/demo/manifests/traffic-access.yaml b/experimental/routes_refactor/demo/manifests/traffic-access.yaml
index f0445a5922..bbdef6af36 100644
--- a/experimental/routes_refactor/demo/manifests/traffic-access.yaml
+++ b/experimental/routes_refactor/demo/manifests/traffic-access.yaml
@@ -22,7 +22,7 @@ spec:
     #name: bookthief
     #namespace: bookthief
 ---
-apiVersion: specs.smi-spec.io/v1alpha3
+apiVersion: specs.smi-spec.io/v1alpha4
 kind: HTTPRouteGroup
 metadata:
   name: bookstore-service-routes
diff --git a/go.mod b/go.mod
index dbd2d4aa65..4b03a9b9a8 100644
--- a/go.mod
+++ b/go.mod
@@ -34,7 +34,7 @@ require (
 	github.com/prometheus/client_golang v1.0.0
 	github.com/prometheus/common v0.4.1
 	github.com/rs/zerolog v1.18.0
-	github.com/servicemeshinterface/smi-sdk-go v0.4.1
+	github.com/servicemeshinterface/smi-sdk-go v0.5.0
 	github.com/spf13/cobra v1.1.1
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.6.1
@@ -45,10 +45,10 @@ require (
 	google.golang.org/protobuf v1.23.0
 	gopkg.in/yaml.v2 v2.3.0
 	helm.sh/helm/v3 v3.2.0
-	k8s.io/api v0.18.6
+	k8s.io/api v0.18.8
 	k8s.io/apimachinery v0.18.8
 	k8s.io/cli-runtime v0.18.5
-	k8s.io/client-go v0.18.6
+	k8s.io/client-go v0.18.8
 	rsc.io/letsencrypt v0.0.3 // indirect
 	sigs.k8s.io/controller-runtime v0.6.3
 	sigs.k8s.io/kind v0.9.0
diff --git a/go.sum b/go.sum
index e6e57f480e..29cded1ec8 100644
--- a/go.sum
+++ b/go.sum
@@ -845,8 +845,8 @@ github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg
 github.com/securego/gosec/v2 v2.5.0 h1:kjfXLeKdk98gBe2+eYRFMpC4+mxmQQtbidpiiOQ69Qc=
 github.com/securego/gosec/v2 v2.5.0/go.mod h1:L/CDXVntIff5ypVHIkqPXbtRpJiNCh6c6Amn68jXDjo=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
-github.com/servicemeshinterface/smi-sdk-go v0.4.1 h1:L8nS7WtVlGoEJF7RdCbwh0Oj/JheGY+5fa3R+cA2ReY=
-github.com/servicemeshinterface/smi-sdk-go v0.4.1/go.mod h1:9rsLPBNcqfDNmEgyYwpopn93aE9yz46d2EHFBNOYj/w=
+github.com/servicemeshinterface/smi-sdk-go v0.5.0 h1:9cZdhvGbGDlmnp9qqmcQL+RL6KZ3IzHfDLoA5Axg8n0=
+github.com/servicemeshinterface/smi-sdk-go v0.5.0/go.mod h1:nm1Slf3pfaZPP3g2tE/K5wDmQ1uWVSP0p3uu5rQAQLc=
 github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU=
 github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs=
 github.com/shirou/gopsutil v0.0.0-20190901111213-e4ec7b275ada/go.mod h1:WWnYX4lzhCH5h/3YBfyVA3VbLYjlMZZAQcW9ojMexNc=
@@ -1312,6 +1312,8 @@ k8s.io/api v0.18.5 h1:fKbCxr+U3fu7k6jB+QeYPD/c6xKYeSJ2KVWmyUypuWM=
 k8s.io/api v0.18.5/go.mod h1:tN+e/2nbdGKOAH55NMV8oGrMG+3uRlA9GaRfvnCCSNk=
 k8s.io/api v0.18.6 h1:osqrAXbOQjkKIWDTjrqxWQ3w0GkKb1KA1XkUGHHYpeE=
 k8s.io/api v0.18.6/go.mod h1:eeyxr+cwCjMdLAmr2W3RyDI0VvTawSg/3RFFBEnmZGI=
+k8s.io/api v0.18.8 h1:aIKUzJPb96f3fKec2lxtY7acZC9gQNDLVhfSGpxBAC4=
+k8s.io/api v0.18.8/go.mod h1:d/CXqwWv+Z2XEG1LgceeDmHQwpUJhROPx16SlxJgERY=
 k8s.io/apiextensions-apiserver v0.18.0 h1:HN4/P8vpGZFvB5SOMuPPH2Wt9Y/ryX+KRvIyAkchu1Q=
 k8s.io/apiextensions-apiserver v0.18.0/go.mod h1:18Cwn1Xws4xnWQNC00FLq1E350b9lUF+aOdIWDOZxgo=
 k8s.io/apiextensions-apiserver v0.18.5 h1:pvbXjB/BRXZiO+/Erp5Pxr+lnhDCv5uxNxHh3FLGZ/g=
@@ -1338,9 +1340,12 @@ k8s.io/client-go v0.18.5 h1:cLhGZdOmyPhwtt20Lrb7uAqxxB1uvY+NTmNJvno1oKA=
 k8s.io/client-go v0.18.5/go.mod h1:EsiD+7Fx+bRckKWZXnAXRKKetm1WuzPagH4iOSC8x58=
 k8s.io/client-go v0.18.6 h1:I+oWqJbibLSGsZj8Xs8F0aWVXJVIoUHWaaJV3kUN/Zw=
 k8s.io/client-go v0.18.6/go.mod h1:/fwtGLjYMS1MaM5oi+eXhKwG+1UHidUEXRh6cNsdO0Q=
+k8s.io/client-go v0.18.8 h1:SdbLpIxk5j5YbFr1b7fq8S7mDgDjYmUxSbszyoesoDM=
+k8s.io/client-go v0.18.8/go.mod h1:HqFqMllQ5NnQJNwjro9k5zMyfhZlOwpuTLVrxjkYSxU=
 k8s.io/code-generator v0.18.0/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
 k8s.io/code-generator v0.18.5/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
 k8s.io/code-generator v0.18.6/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
+k8s.io/code-generator v0.18.8/go.mod h1:TgNEVx9hCyPGpdtCWA34olQYLkh3ok9ar7XfSsr8b6c=
 k8s.io/component-base v0.18.0 h1:I+lP0fNfsEdTDpHaL61bCAqTZLoiWjEEP304Mo5ZQgE=
 k8s.io/component-base v0.18.0/go.mod h1:u3BCg0z1uskkzrnAKFzulmYaEpZF7XC9Pf/uFyb1v2c=
 k8s.io/component-base v0.18.5 h1:QIz2xFax8W5XQREoNcP/MHgnt4ClgfZ837Qx9yCeCzA=
diff --git a/pkg/catalog/debugger.go b/pkg/catalog/debugger.go
index a5a26acede..d527918e49 100644
--- a/pkg/catalog/debugger.go
+++ b/pkg/catalog/debugger.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	target "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	split "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 
 	"github.com/openservicemesh/osm/pkg/certificate"
diff --git a/pkg/catalog/helpers_test.go b/pkg/catalog/helpers_test.go
index 5758796e7e..42561a231b 100644
--- a/pkg/catalog/helpers_test.go
+++ b/pkg/catalog/helpers_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	target "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	specs "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	specs "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/catalog/mock_catalog.go b/pkg/catalog/mock_catalog.go
index 215520a60a..30d1c97b34 100644
--- a/pkg/catalog/mock_catalog.go
+++ b/pkg/catalog/mock_catalog.go
@@ -15,7 +15,7 @@ import (
 	smi "github.com/openservicemesh/osm/pkg/smi"
 	trafficpolicy "github.com/openservicemesh/osm/pkg/trafficpolicy"
 	v1alpha2 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	v1alpha3 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	v1alpha4 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	v1alpha20 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 )
 
@@ -84,21 +84,6 @@ func (mr *MockMeshCatalogerMockRecorder) GetPortToProtocolMappingForService(arg0
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPortToProtocolMappingForService", reflect.TypeOf((*MockMeshCataloger)(nil).GetPortToProtocolMappingForService), arg0)
 }
 
-// GetTargetPortToProtocolMappingForService mocks base method
-func (m *MockMeshCataloger) GetTargetPortToProtocolMappingForService(arg0 service.MeshService) (map[uint32]string, error) {
-	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "GetTargetPortToProtocolMappingForService", arg0)
-	ret0, _ := ret[0].(map[uint32]string)
-	ret1, _ := ret[1].(error)
-	return ret0, ret1
-}
-
-// GetTargetPortToProtocolMappingForService indicates an expected call of GetTargetPortToProtocolMappingForService
-func (mr *MockMeshCatalogerMockRecorder) GetTargetPortToProtocolMappingForService(arg0 interface{}) *gomock.Call {
-	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTargetPortToProtocolMappingForService", reflect.TypeOf((*MockMeshCataloger)(nil).GetTargetPortToProtocolMappingForService), arg0)
-}
-
 // GetResolvableHostnamesForUpstreamService mocks base method
 func (m *MockMeshCataloger) GetResolvableHostnamesForUpstreamService(arg0, arg1 service.MeshService) ([]string, error) {
 	m.ctrl.T.Helper()
@@ -173,6 +158,21 @@ func (mr *MockMeshCatalogerMockRecorder) GetServicesFromEnvoyCertificate(arg0 in
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetServicesFromEnvoyCertificate", reflect.TypeOf((*MockMeshCataloger)(nil).GetServicesFromEnvoyCertificate), arg0)
 }
 
+// GetTargetPortToProtocolMappingForService mocks base method
+func (m *MockMeshCataloger) GetTargetPortToProtocolMappingForService(arg0 service.MeshService) (map[uint32]string, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetTargetPortToProtocolMappingForService", arg0)
+	ret0, _ := ret[0].(map[uint32]string)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetTargetPortToProtocolMappingForService indicates an expected call of GetTargetPortToProtocolMappingForService
+func (mr *MockMeshCatalogerMockRecorder) GetTargetPortToProtocolMappingForService(arg0 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetTargetPortToProtocolMappingForService", reflect.TypeOf((*MockMeshCataloger)(nil).GetTargetPortToProtocolMappingForService), arg0)
+}
+
 // GetWeightedClusterForService mocks base method
 func (m *MockMeshCataloger) GetWeightedClusterForService(arg0 service.MeshService) (service.WeightedCluster, error) {
 	m.ctrl.T.Helper()
@@ -292,13 +292,13 @@ func (mr *MockMeshCatalogerMockRecorder) ListMonitoredNamespaces() *gomock.Call
 }
 
 // ListSMIPolicies mocks base method
-func (m *MockMeshCataloger) ListSMIPolicies() ([]*v1alpha20.TrafficSplit, []service.WeightedService, []service.K8sServiceAccount, []*v1alpha3.HTTPRouteGroup, []*v1alpha2.TrafficTarget) {
+func (m *MockMeshCataloger) ListSMIPolicies() ([]*v1alpha20.TrafficSplit, []service.WeightedService, []service.K8sServiceAccount, []*v1alpha4.HTTPRouteGroup, []*v1alpha2.TrafficTarget) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ListSMIPolicies")
 	ret0, _ := ret[0].([]*v1alpha20.TrafficSplit)
 	ret1, _ := ret[1].([]service.WeightedService)
 	ret2, _ := ret[2].([]service.K8sServiceAccount)
-	ret3, _ := ret[3].([]*v1alpha3.HTTPRouteGroup)
+	ret3, _ := ret[3].([]*v1alpha4.HTTPRouteGroup)
 	ret4, _ := ret[4].([]*v1alpha2.TrafficTarget)
 	return ret0, ret1, ret2, ret3, ret4
 }
diff --git a/pkg/catalog/routes_test.go b/pkg/catalog/routes_test.go
index 1f71f3d2c5..ff5e4b3d59 100644
--- a/pkg/catalog/routes_test.go
+++ b/pkg/catalog/routes_test.go
@@ -8,8 +8,8 @@ import (
 	mapset "github.com/deckarep/golang-set"
 	"github.com/golang/mock/gomock"
 	target "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
-	specs "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
+	specs "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	tassert "github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/catalog/traffictarget.go b/pkg/catalog/traffictarget.go
index 2001efbacd..65eb849b9b 100644
--- a/pkg/catalog/traffictarget.go
+++ b/pkg/catalog/traffictarget.go
@@ -2,11 +2,8 @@ package catalog
 
 import (
 	"fmt"
-	"strconv"
-	"strings"
 
 	mapset "github.com/deckarep/golang-set"
-	"github.com/pkg/errors"
 	smiAccess "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
 
 	"github.com/openservicemesh/osm/pkg/identity"
@@ -179,25 +176,8 @@ func (mc *MeshCatalog) getTCPRouteMatchesFromTrafficTarget(trafficTarget smiAcce
 			return nil, errNoTrafficSpecFoundForTrafficPolicy
 		}
 
-		// TODO(#1521): Create an actual TCP route match once v1alpha4 TCPRoute spec is available
-		// Hack: derive ports from 'ports' label on the TCPRoute resource
-		portsStr, ok := tcpRoute.Labels["ports"]
-		if !ok {
-			continue
-		}
-		portStrList := strings.Split(portsStr, ",")
-		var ports []int
-		for i := range portStrList {
-			portStrList[i] = strings.TrimSpace(portStrList[i])
-			port, err := strconv.Atoi(portStrList[i])
-			if err != nil {
-				return nil, errors.Errorf("Invalid port value %s, must be an integer", portStrList[i])
-			}
-			ports = append(ports, port)
-		}
-
 		tcpRouteMatch := trafficpolicy.TCPRouteMatch{
-			Ports: ports,
+			Ports: tcpRoute.Spec.Matches.Ports,
 		}
 		matches = append(matches, tcpRouteMatch)
 	}
diff --git a/pkg/catalog/traffictarget_test.go b/pkg/catalog/traffictarget_test.go
index 2ed7b4b451..ed13d5097c 100644
--- a/pkg/catalog/traffictarget_test.go
+++ b/pkg/catalog/traffictarget_test.go
@@ -7,7 +7,7 @@ import (
 	"github.com/golang/mock/gomock"
 	smiAccess "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
 	target "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	smiSpecs "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	smiSpecs "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	tassert "github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
@@ -503,8 +503,11 @@ func TestListInboundTrafficTargetsWithRoutes(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "route-1",
 						Namespace: "ns-1",
-						Labels: map[string]string{
-							"ports": "8000, 9000",
+					},
+					Spec: smiSpecs.TCPRouteSpec{
+						Matches: smiSpecs.TCPMatch{
+							Name:  "8000,9000",
+							Ports: []int{8000, 9000},
 						},
 					},
 				},
@@ -575,8 +578,11 @@ func TestListInboundTrafficTargetsWithRoutes(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "route-1",
 						Namespace: "ns-1",
-						Labels: map[string]string{
-							"ports": "8000",
+					},
+					Spec: smiSpecs.TCPRouteSpec{
+						Matches: smiSpecs.TCPMatch{
+							Name:  "8000",
+							Ports: []int{8000},
 						},
 					},
 				},
@@ -584,8 +590,11 @@ func TestListInboundTrafficTargetsWithRoutes(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "route-2",
 						Namespace: "ns-1",
-						Labels: map[string]string{
-							"ports": "9000",
+					},
+					Spec: smiSpecs.TCPRouteSpec{
+						Matches: smiSpecs.TCPMatch{
+							Name:  "9000",
+							Ports: []int{9000},
 						},
 					},
 				},
@@ -693,8 +702,11 @@ func TestListInboundTrafficTargetsWithRoutes(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "route-1",
 						Namespace: "ns-1",
-						Labels: map[string]string{
-							"ports": "1000",
+					},
+					Spec: smiSpecs.TCPRouteSpec{
+						Matches: smiSpecs.TCPMatch{
+							Name:  "1000",
+							Ports: []int{1000},
 						},
 					},
 				},
@@ -702,8 +714,11 @@ func TestListInboundTrafficTargetsWithRoutes(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "route-2",
 						Namespace: "ns-1",
-						Labels: map[string]string{
-							"ports": "2000",
+					},
+					Spec: smiSpecs.TCPRouteSpec{
+						Matches: smiSpecs.TCPMatch{
+							Name:  "2000",
+							Ports: []int{2000},
 						},
 					},
 				},
@@ -711,8 +726,11 @@ func TestListInboundTrafficTargetsWithRoutes(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "route-3",
 						Namespace: "ns-1",
-						Labels: map[string]string{
-							"ports": "3000",
+					},
+					Spec: smiSpecs.TCPRouteSpec{
+						Matches: smiSpecs.TCPMatch{
+							Name:  "3000",
+							Ports: []int{3000},
 						},
 					},
 				},
@@ -720,8 +738,11 @@ func TestListInboundTrafficTargetsWithRoutes(t *testing.T) {
 					ObjectMeta: metav1.ObjectMeta{
 						Name:      "route-4",
 						Namespace: "ns-1",
-						Labels: map[string]string{
-							"ports": "4000",
+					},
+					Spec: smiSpecs.TCPRouteSpec{
+						Matches: smiSpecs.TCPMatch{
+							Name:  "4000",
+							Ports: []int{4000},
 						},
 					},
 				},
@@ -823,7 +844,11 @@ func TestListInboundTrafficTargetsWithRoutes(t *testing.T) {
 					Sources: []identity.ServiceIdentity{
 						identity.ServiceIdentity("sa-2.ns-2.cluster.local"),
 					},
-					TCPRouteMatches: nil,
+					TCPRouteMatches: []trafficpolicy.TCPRouteMatch{
+						{
+							Ports: nil,
+						},
+					},
 				},
 			},
 
diff --git a/pkg/catalog/types.go b/pkg/catalog/types.go
index 46065ccaeb..580205fb5c 100644
--- a/pkg/catalog/types.go
+++ b/pkg/catalog/types.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/google/uuid"
 	target "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	split "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 	"k8s.io/client-go/kubernetes"
 
diff --git a/pkg/debugger/mock_debugger.go b/pkg/debugger/mock_debugger.go
index e7f161e3aa..24b4f62c9f 100644
--- a/pkg/debugger/mock_debugger.go
+++ b/pkg/debugger/mock_debugger.go
@@ -11,7 +11,7 @@ import (
 
 	gomock "github.com/golang/mock/gomock"
 	v1alpha2 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	v1alpha3 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	v1alpha4 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	v1alpha20 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 
 	certificate "github.com/openservicemesh/osm/pkg/certificate"
@@ -136,13 +136,13 @@ func (mr *MockMeshCatalogDebuggerMockRecorder) ListMonitoredNamespaces() *gomock
 }
 
 // ListSMIPolicies mocks base method
-func (m *MockMeshCatalogDebugger) ListSMIPolicies() ([]*v1alpha20.TrafficSplit, []service.WeightedService, []service.K8sServiceAccount, []*v1alpha3.HTTPRouteGroup, []*v1alpha2.TrafficTarget) {
+func (m *MockMeshCatalogDebugger) ListSMIPolicies() ([]*v1alpha20.TrafficSplit, []service.WeightedService, []service.K8sServiceAccount, []*v1alpha4.HTTPRouteGroup, []*v1alpha2.TrafficTarget) {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ListSMIPolicies")
 	ret0, _ := ret[0].([]*v1alpha20.TrafficSplit)
 	ret1, _ := ret[1].([]service.WeightedService)
 	ret2, _ := ret[2].([]service.K8sServiceAccount)
-	ret3, _ := ret[3].([]*v1alpha3.HTTPRouteGroup)
+	ret3, _ := ret[3].([]*v1alpha4.HTTPRouteGroup)
 	ret4, _ := ret[4].([]*v1alpha2.TrafficTarget)
 	return ret0, ret1, ret2, ret3, ret4
 }
diff --git a/pkg/debugger/policy.go b/pkg/debugger/policy.go
index c14d763a68..8f6112f143 100644
--- a/pkg/debugger/policy.go
+++ b/pkg/debugger/policy.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	target "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	split "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 
 	"github.com/openservicemesh/osm/pkg/service"
diff --git a/pkg/debugger/policy_test.go b/pkg/debugger/policy_test.go
index 89be41481d..d5a0013111 100644
--- a/pkg/debugger/policy_test.go
+++ b/pkg/debugger/policy_test.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/golang/mock/gomock"
 	target "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	split "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 	tassert "github.com/stretchr/testify/assert"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/pkg/debugger/types.go b/pkg/debugger/types.go
index 5d39240eda..25e1f4a3f1 100644
--- a/pkg/debugger/types.go
+++ b/pkg/debugger/types.go
@@ -4,7 +4,7 @@ import (
 	"time"
 
 	target "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	split "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
diff --git a/pkg/smi/client.go b/pkg/smi/client.go
index 32caf778ff..eb908f57d2 100644
--- a/pkg/smi/client.go
+++ b/pkg/smi/client.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 	smiAccess "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	smiSpecs "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	smiSpecs "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	smiSplit "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 	smiAccessClient "github.com/servicemeshinterface/smi-sdk-go/pkg/gen/client/access/clientset/versioned"
 	smiAccessInformers "github.com/servicemeshinterface/smi-sdk-go/pkg/gen/client/access/informers/externalversions"
@@ -112,8 +112,8 @@ func newSMIClient(kubeClient kubernetes.Interface, smiTrafficSplitClient smiTraf
 
 	informerCollection := InformerCollection{
 		TrafficSplit:   smiTrafficSplitInformerFactory.Split().V1alpha2().TrafficSplits().Informer(),
-		HTTPRouteGroup: smiTrafficSpecInformerFactory.Specs().V1alpha3().HTTPRouteGroups().Informer(),
-		TCPRoute:       smiTrafficSpecInformerFactory.Specs().V1alpha3().TCPRoutes().Informer(),
+		HTTPRouteGroup: smiTrafficSpecInformerFactory.Specs().V1alpha4().HTTPRouteGroups().Informer(),
+		TCPRoute:       smiTrafficSpecInformerFactory.Specs().V1alpha4().TCPRoutes().Informer(),
 		TrafficTarget:  smiTrafficTargetInformerFactory.Access().V1alpha2().TrafficTargets().Informer(),
 	}
 
diff --git a/pkg/smi/client_test.go b/pkg/smi/client_test.go
index 128e2d70e9..0e01c10390 100644
--- a/pkg/smi/client_test.go
+++ b/pkg/smi/client_test.go
@@ -6,7 +6,7 @@ import (
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	smiAccess "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	smiSpecs "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	smiSpecs "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	smiSplit "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 	testTrafficTargetClient "github.com/servicemeshinterface/smi-sdk-go/pkg/gen/client/access/clientset/versioned/fake"
 	testTrafficSpecClient "github.com/servicemeshinterface/smi-sdk-go/pkg/gen/client/specs/clientset/versioned/fake"
@@ -336,7 +336,7 @@ var _ = Describe("When listing ListHTTPTrafficSpecs", func() {
 
 		routeSpec := &smiSpecs.HTTPRouteGroup{
 			TypeMeta: metav1.TypeMeta{
-				APIVersion: "specs.smi-spec.io/v1alpha3",
+				APIVersion: "specs.smi-spec.io/v1alpha4",
 				Kind:       "HTTPRouteGroup",
 			},
 			ObjectMeta: metav1.ObjectMeta{
@@ -368,7 +368,7 @@ var _ = Describe("When listing ListHTTPTrafficSpecs", func() {
 			},
 		}
 
-		_, err := fakeClientSet.smiTrafficSpecClientSet.SpecsV1alpha3().HTTPRouteGroups(testNamespaceName).Create(context.TODO(), routeSpec, metav1.CreateOptions{})
+		_, err := fakeClientSet.smiTrafficSpecClientSet.SpecsV1alpha4().HTTPRouteGroups(testNamespaceName).Create(context.TODO(), routeSpec, metav1.CreateOptions{})
 		Expect(err).ToNot(HaveOccurred())
 		<-rgChannel
 
@@ -376,7 +376,7 @@ var _ = Describe("When listing ListHTTPTrafficSpecs", func() {
 		Expect(len(httpRoutes)).To(Equal(1))
 		Expect(httpRoutes[0].Name).To(Equal(routeSpec.Name))
 
-		err = fakeClientSet.smiTrafficSpecClientSet.SpecsV1alpha3().HTTPRouteGroups(testNamespaceName).Delete(context.TODO(), routeSpec.Name, metav1.DeleteOptions{})
+		err = fakeClientSet.smiTrafficSpecClientSet.SpecsV1alpha4().HTTPRouteGroups(testNamespaceName).Delete(context.TODO(), routeSpec.Name, metav1.DeleteOptions{})
 		Expect(err).ToNot(HaveOccurred())
 		<-rgChannel
 	})
@@ -415,7 +415,7 @@ var _ = Describe("When listing TCP routes", func() {
 			Spec: smiSpecs.TCPRouteSpec{},
 		}
 
-		_, err := fakeClientSet.smiTrafficSpecClientSet.SpecsV1alpha3().TCPRoutes(testNamespaceName).Create(context.TODO(), routeSpec, metav1.CreateOptions{})
+		_, err := fakeClientSet.smiTrafficSpecClientSet.SpecsV1alpha4().TCPRoutes(testNamespaceName).Create(context.TODO(), routeSpec, metav1.CreateOptions{})
 		Expect(err).ToNot(HaveOccurred())
 		<-trChannel
 
@@ -423,7 +423,7 @@ var _ = Describe("When listing TCP routes", func() {
 		Expect(len(tcpRoutes)).To(Equal(1))
 		Expect(tcpRoutes[0].Name).To(Equal(routeSpec.Name))
 
-		err = fakeClientSet.smiTrafficSpecClientSet.SpecsV1alpha3().TCPRoutes(testNamespaceName).Delete(context.TODO(), routeSpec.Name, metav1.DeleteOptions{})
+		err = fakeClientSet.smiTrafficSpecClientSet.SpecsV1alpha4().TCPRoutes(testNamespaceName).Delete(context.TODO(), routeSpec.Name, metav1.DeleteOptions{})
 		Expect(err).ToNot(HaveOccurred())
 		<-trChannel
 	})
diff --git a/pkg/smi/fake.go b/pkg/smi/fake.go
index 91ca2773a4..ea73982602 100644
--- a/pkg/smi/fake.go
+++ b/pkg/smi/fake.go
@@ -2,7 +2,7 @@ package smi
 
 import (
 	target "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	split "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 
 	backpressure "github.com/openservicemesh/osm/experimental/pkg/apis/policy/v1alpha1"
diff --git a/pkg/smi/mock_meshspec.go b/pkg/smi/mock_meshspec.go
index b5c8f6548a..77eecadb58 100644
--- a/pkg/smi/mock_meshspec.go
+++ b/pkg/smi/mock_meshspec.go
@@ -11,7 +11,7 @@ import (
 	v1alpha1 "github.com/openservicemesh/osm/experimental/pkg/apis/policy/v1alpha1"
 	service "github.com/openservicemesh/osm/pkg/service"
 	v1alpha2 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	v1alpha3 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	v1alpha4 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	v1alpha20 "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 )
 
@@ -53,10 +53,10 @@ func (mr *MockMeshSpecMockRecorder) GetBackpressurePolicy(arg0 interface{}) *gom
 }
 
 // GetTCPRoute mocks base method
-func (m *MockMeshSpec) GetTCPRoute(arg0 string) *v1alpha3.TCPRoute {
+func (m *MockMeshSpec) GetTCPRoute(arg0 string) *v1alpha4.TCPRoute {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "GetTCPRoute", arg0)
-	ret0, _ := ret[0].(*v1alpha3.TCPRoute)
+	ret0, _ := ret[0].(*v1alpha4.TCPRoute)
 	return ret0
 }
 
@@ -67,10 +67,10 @@ func (mr *MockMeshSpecMockRecorder) GetTCPRoute(arg0 interface{}) *gomock.Call {
 }
 
 // ListHTTPTrafficSpecs mocks base method
-func (m *MockMeshSpec) ListHTTPTrafficSpecs() []*v1alpha3.HTTPRouteGroup {
+func (m *MockMeshSpec) ListHTTPTrafficSpecs() []*v1alpha4.HTTPRouteGroup {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ListHTTPTrafficSpecs")
-	ret0, _ := ret[0].([]*v1alpha3.HTTPRouteGroup)
+	ret0, _ := ret[0].([]*v1alpha4.HTTPRouteGroup)
 	return ret0
 }
 
@@ -95,10 +95,10 @@ func (mr *MockMeshSpecMockRecorder) ListServiceAccounts() *gomock.Call {
 }
 
 // ListTCPTrafficSpecs mocks base method
-func (m *MockMeshSpec) ListTCPTrafficSpecs() []*v1alpha3.TCPRoute {
+func (m *MockMeshSpec) ListTCPTrafficSpecs() []*v1alpha4.TCPRoute {
 	m.ctrl.T.Helper()
 	ret := m.ctrl.Call(m, "ListTCPTrafficSpecs")
-	ret0, _ := ret[0].([]*v1alpha3.TCPRoute)
+	ret0, _ := ret[0].([]*v1alpha4.TCPRoute)
 	return ret0
 }
 
diff --git a/pkg/smi/types.go b/pkg/smi/types.go
index 06e2b9d1db..38c3a523fb 100644
--- a/pkg/smi/types.go
+++ b/pkg/smi/types.go
@@ -2,7 +2,7 @@ package smi
 
 import (
 	target "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	split "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 
 	"k8s.io/client-go/tools/cache"
diff --git a/pkg/tests/fixtures.go b/pkg/tests/fixtures.go
index a4f2fa61f3..5ab858c020 100644
--- a/pkg/tests/fixtures.go
+++ b/pkg/tests/fixtures.go
@@ -7,7 +7,7 @@ import (
 	"net"
 
 	target "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	spec "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	"github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 	corev1 "k8s.io/api/core/v1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
diff --git a/tests/e2e/e2e_pod_client_server_test.go b/tests/e2e/e2e_pod_client_server_test.go
index 1cc24cdb31..b0f3f66ede 100644
--- a/tests/e2e/e2e_pod_client_server_test.go
+++ b/tests/e2e/e2e_pod_client_server_test.go
@@ -117,7 +117,7 @@ func testTraffic(withSourceKubernetesService bool) {
 
 			By("Deleting SMI policies")
 			Expect(Td.SmiClients.AccessClient.AccessV1alpha2().TrafficTargets(sourceName).Delete(context.TODO(), trafficTarget.Name, metav1.DeleteOptions{})).To(Succeed())
-			Expect(Td.SmiClients.SpecClient.SpecsV1alpha3().HTTPRouteGroups(sourceName).Delete(context.TODO(), httpRG.Name, metav1.DeleteOptions{})).To(Succeed())
+			Expect(Td.SmiClients.SpecClient.SpecsV1alpha4().HTTPRouteGroups(sourceName).Delete(context.TODO(), httpRG.Name, metav1.DeleteOptions{})).To(Succeed())
 
 			// Expect client not to reach server
 			cond = Td.WaitForRepeatedSuccess(func() bool {
diff --git a/tests/e2e/e2e_tcp_client_server_test.go b/tests/e2e/e2e_tcp_client_server_test.go
index ed08a8d2c5..aa869f1883 100644
--- a/tests/e2e/e2e_tcp_client_server_test.go
+++ b/tests/e2e/e2e_tcp_client_server_test.go
@@ -142,7 +142,7 @@ func testTCPTraffic(permissiveMode bool) {
 			if !permissiveMode {
 				By("Deleting SMI policies")
 				Expect(Td.SmiClients.AccessClient.AccessV1alpha2().TrafficTargets(sourceName).Delete(context.TODO(), trafficTargetName, metav1.DeleteOptions{})).To(Succeed())
-				Expect(Td.SmiClients.SpecClient.SpecsV1alpha3().TCPRoutes(sourceName).Delete(context.TODO(), trafficRouteName, metav1.DeleteOptions{})).To(Succeed())
+				Expect(Td.SmiClients.SpecClient.SpecsV1alpha4().TCPRoutes(sourceName).Delete(context.TODO(), trafficRouteName, metav1.DeleteOptions{})).To(Succeed())
 
 				// Expect client not to reach server
 				cond = Td.WaitForRepeatedSuccess(func() bool {
diff --git a/tests/framework/common_smi.go b/tests/framework/common_smi.go
index 297d717e06..3119b818a4 100644
--- a/tests/framework/common_smi.go
+++ b/tests/framework/common_smi.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/pkg/errors"
 	smiAccess "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/access/v1alpha2"
-	smiSpecs "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha3"
+	smiSpecs "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/specs/v1alpha4"
 	smiSplit "github.com/servicemeshinterface/smi-sdk-go/pkg/apis/split/v1alpha2"
 	smiTrafficAccessClient "github.com/servicemeshinterface/smi-sdk-go/pkg/gen/client/access/clientset/versioned"
 	smiTrafficSpecClient "github.com/servicemeshinterface/smi-sdk-go/pkg/gen/client/specs/clientset/versioned"
@@ -46,7 +46,7 @@ func (td *OsmTestData) InitSMIClients() error {
 
 // CreateHTTPRouteGroup Creates an SMI HTTPRouteGroup
 func (td *OsmTestData) CreateHTTPRouteGroup(ns string, rg smiSpecs.HTTPRouteGroup) (*smiSpecs.HTTPRouteGroup, error) {
-	hrg, err := td.SmiClients.SpecClient.SpecsV1alpha3().HTTPRouteGroups(ns).Create(context.Background(), &rg, metav1.CreateOptions{})
+	hrg, err := td.SmiClients.SpecClient.SpecsV1alpha4().HTTPRouteGroups(ns).Create(context.Background(), &rg, metav1.CreateOptions{})
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create HTTPRouteGroup")
 	}
@@ -55,7 +55,7 @@ func (td *OsmTestData) CreateHTTPRouteGroup(ns string, rg smiSpecs.HTTPRouteGrou
 
 // CreateTCPRoute Creates an SMI TCPRoute
 func (td *OsmTestData) CreateTCPRoute(ns string, route smiSpecs.TCPRoute) (*smiSpecs.TCPRoute, error) {
-	hrg, err := td.SmiClients.SpecClient.SpecsV1alpha3().TCPRoutes(ns).Create(context.Background(), &route, metav1.CreateOptions{})
+	hrg, err := td.SmiClients.SpecClient.SpecsV1alpha4().TCPRoutes(ns).Create(context.Background(), &route, metav1.CreateOptions{})
 	if err != nil {
 		return nil, errors.Wrap(err, "failed to create TCPRoute")
 	}
@@ -144,12 +144,14 @@ func (td *OsmTestData) CreateSimpleAllowPolicy(def SimpleAllowPolicy) (smiSpecs.
 
 // CreateSimpleTCPAllowPolicy returns an allow policy to allow all TCP traffic from source to destination
 func (td *OsmTestData) CreateSimpleTCPAllowPolicy(def SimpleAllowPolicy, port int) (smiSpecs.TCPRoute, smiAccess.TrafficTarget) {
-	// Hack to specify TCP ports via labels till v1alpha4 of TCPRoute is available
 	tcpRoute := smiSpecs.TCPRoute{
 		ObjectMeta: metav1.ObjectMeta{
 			Name: def.RouteGroupName,
-			Labels: map[string]string{
-				"ports": strconv.Itoa(port),
+		},
+		Spec: smiSpecs.TCPRouteSpec{
+			Matches: smiSpecs.TCPMatch{
+				Name:  strconv.Itoa(port),
+				Ports: []int{port},
 			},
 		},
 	}