diff --git a/server/project/project.pb.go b/server/project/project.pb.go
index f5009b7085afe..7176fd18ba85e 100644
--- a/server/project/project.pb.go
+++ b/server/project/project.pb.go
@@ -1595,49 +1595,49 @@ var (
 func init() { proto.RegisterFile("server/project/project.proto", fileDescriptorProject) }
 
 var fileDescriptorProject = []byte{
-	// 689 bytes of a gzipped FileDescriptorProto
+	// 697 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x55, 0x5d, 0x6b, 0x13, 0x4d,
-	0x14, 0x66, 0x9a, 0xbe, 0x79, 0xed, 0xc4, 0x8f, 0x32, 0xb4, 0x9a, 0xc6, 0x36, 0x86, 0xb9, 0x90,
-	0x12, 0xec, 0x0c, 0x69, 0x15, 0x8a, 0x77, 0x7e, 0x14, 0x29, 0x78, 0xa1, 0x51, 0x41, 0xf4, 0xa2,
-	0x4c, 0x37, 0x87, 0xed, 0x36, 0xc9, 0xce, 0x38, 0x3b, 0x5d, 0x2d, 0xa5, 0x20, 0xc5, 0x1b, 0xf5,
-	0xd2, 0x9f, 0x20, 0xf8, 0x5b, 0xbc, 0x14, 0xfc, 0x03, 0x12, 0xfc, 0x21, 0x32, 0xb3, 0xbb, 0x49,
-	0xb6, 0xe9, 0x16, 0x84, 0xe0, 0x55, 0xce, 0x9e, 0x39, 0x73, 0x9e, 0xe7, 0x39, 0x1f, 0x19, 0xbc,
-	0x1c, 0x81, 0x8e, 0x41, 0x73, 0xa5, 0xe5, 0x3e, 0x78, 0x26, 0xfb, 0x65, 0x4a, 0x4b, 0x23, 0xc9,
-	0xff, 0xe9, 0x67, 0x6d, 0xc1, 0x97, 0xbe, 0x74, 0x3e, 0x6e, 0xad, 0xe4, 0xb8, 0xb6, 0xec, 0x4b,
-	0xe9, 0xf7, 0x80, 0x0b, 0x15, 0x70, 0x11, 0x86, 0xd2, 0x08, 0x13, 0xc8, 0x30, 0x4a, 0x4f, 0x69,
-	0x77, 0x33, 0x62, 0x81, 0x74, 0xa7, 0x9e, 0xd4, 0xc0, 0xe3, 0x16, 0xf7, 0x21, 0x04, 0x2d, 0x0c,
-	0x74, 0xd2, 0x98, 0xdb, 0xa3, 0x98, 0xbe, 0xf0, 0xf6, 0x82, 0x10, 0xf4, 0x21, 0x57, 0x5d, 0xdf,
-	0x3a, 0x22, 0xde, 0x07, 0x23, 0xce, 0xba, 0xb5, 0xed, 0x07, 0x66, 0xef, 0x60, 0x97, 0x79, 0xb2,
-	0xcf, 0x85, 0x76, 0xc4, 0xf6, 0x9d, 0xb1, 0xe6, 0x75, 0x46, 0xb7, 0x85, 0x52, 0xbd, 0xc0, 0x73,
-	0x94, 0x78, 0xdc, 0x12, 0x3d, 0xb5, 0x27, 0x26, 0x52, 0xd1, 0xb7, 0x78, 0xe1, 0x49, 0xa2, 0xf1,
-	0x81, 0x06, 0x61, 0xa0, 0x0d, 0x6f, 0x0e, 0x20, 0x32, 0x64, 0x07, 0x67, 0xda, 0xab, 0xa8, 0x81,
-	0x56, 0x2b, 0xeb, 0x5b, 0x6c, 0x04, 0xca, 0x32, 0x50, 0x67, 0xec, 0x78, 0x1d, 0xa6, 0xba, 0x3e,
-	0xb3, 0xa0, 0x6c, 0x0c, 0x94, 0x65, 0xa0, 0xec, 0x9e, 0x52, 0x29, 0x48, 0x3b, 0xcb, 0x4a, 0x5f,
-	0xe3, 0xa5, 0xd4, 0xf7, 0x5c, 0x76, 0x21, 0x7c, 0x08, 0x3d, 0x18, 0xa1, 0x57, 0xf3, 0xe8, 0x73,
-	0xc3, 0x6b, 0x84, 0xe0, 0x59, 0x2d, 0x7b, 0x50, 0x9d, 0x71, 0x6e, 0x67, 0x93, 0x79, 0x5c, 0x0a,
-	0x84, 0xa9, 0x96, 0x1a, 0x68, 0xb5, 0xd4, 0xb6, 0x26, 0xfd, 0x88, 0xf2, 0xd9, 0xf3, 0xda, 0x8a,
-	0xb3, 0x37, 0x70, 0xa5, 0x03, 0x91, 0xa7, 0x03, 0x65, 0x05, 0xa4, 0x20, 0xe3, 0xae, 0x21, 0x7e,
-	0x69, 0x0c, 0x7f, 0x19, 0xcf, 0xc1, 0x3b, 0x15, 0x68, 0x88, 0xb6, 0xc3, 0xea, 0xac, 0x63, 0x31,
-	0x72, 0xd0, 0x5b, 0xc3, 0x0a, 0x3b, 0x2a, 0x6d, 0x88, 0x94, 0x0c, 0x23, 0x20, 0x0b, 0xf8, 0x3f,
-	0x63, 0x1d, 0x29, 0x87, 0xe4, 0x83, 0x52, 0x7c, 0x31, 0x8d, 0x7e, 0x7a, 0x00, 0xfa, 0xd0, 0xe2,
-	0x85, 0xa2, 0x0f, 0x69, 0x90, 0xb3, 0xc7, 0x7a, 0xf6, 0x42, 0x75, 0xfe, 0x65, 0xcf, 0xae, 0xe0,
-	0x4b, 0x5b, 0x7d, 0x65, 0x0e, 0x33, 0x0d, 0xeb, 0xdf, 0x2e, 0xe0, 0xcb, 0x69, 0xd4, 0x33, 0xd0,
-	0x71, 0xe0, 0x01, 0xf9, 0x84, 0x70, 0x25, 0x29, 0xb7, 0x93, 0x4b, 0x28, 0xcb, 0x56, 0xaa, 0xb0,
-	0x21, 0xb5, 0x95, 0x33, 0x63, 0x32, 0x14, 0xba, 0x79, 0xf2, 0xf3, 0xf7, 0x97, 0x99, 0x75, 0xba,
-	0xe6, 0x56, 0x29, 0x6e, 0x65, 0x4b, 0x1a, 0xf1, 0xa3, 0xd4, 0x3a, 0xe6, 0xb6, 0x11, 0x11, 0x3f,
-	0xb2, 0x3f, 0xc7, 0xdc, 0x95, 0xf2, 0x2e, 0x6a, 0x92, 0xf7, 0x08, 0x57, 0x92, 0xc9, 0x3a, 0x8f,
-	0x4c, 0x6e, 0xf6, 0x6a, 0x57, 0x87, 0x31, 0x39, 0xad, 0xf4, 0x8e, 0x63, 0xc1, 0x9b, 0x7f, 0xc7,
-	0x82, 0x7c, 0x46, 0xb8, 0x9c, 0xa8, 0x25, 0x13, 0x32, 0xf3, 0x55, 0x98, 0x4e, 0xb7, 0xe8, 0x75,
-	0xc7, 0x73, 0x91, 0xce, 0x9f, 0xe6, 0x69, 0x0b, 0x72, 0x82, 0xf0, 0xec, 0xe3, 0x20, 0x32, 0x64,
-	0xf1, 0x34, 0x17, 0x37, 0x6e, 0xb5, 0xed, 0xa9, 0x70, 0xb0, 0x08, 0xb4, 0xea, 0x78, 0x10, 0x32,
-	0xc1, 0x83, 0x7c, 0x40, 0xb8, 0xf4, 0x08, 0x0a, 0x39, 0x4c, 0xa9, 0x0e, 0x37, 0x1c, 0xfe, 0x12,
-	0xb9, 0x36, 0xd9, 0x2f, 0xbb, 0x45, 0xc7, 0xe4, 0x2b, 0xc2, 0xe5, 0x64, 0x81, 0x26, 0x3b, 0x93,
-	0x5b, 0xac, 0x69, 0x31, 0xda, 0x70, 0x8c, 0xd6, 0x6a, 0xab, 0x85, 0x13, 0xc4, 0xec, 0x3f, 0x7e,
-	0x47, 0x18, 0xc1, 0x1c, 0x45, 0xdb, 0xb1, 0x97, 0xb8, 0x9c, 0xcc, 0x67, 0x51, 0xb9, 0x8a, 0xe6,
-	0x35, 0xd5, 0xdf, 0x2c, 0xd4, 0xbf, 0x8f, 0xb1, 0x6d, 0xd4, 0x56, 0x0c, 0xa1, 0x89, 0x8a, 0xb2,
-	0xaf, 0xb0, 0xe4, 0x85, 0xb2, 0x0a, 0x99, 0x7d, 0xc5, 0x58, 0xdc, 0x62, 0xee, 0x8a, 0x6b, 0xf2,
-	0x4d, 0x07, 0xd2, 0x20, 0xf5, 0x02, 0x10, 0x0e, 0x2e, 0xfb, 0xfd, 0xcd, 0xef, 0x83, 0x3a, 0xfa,
-	0x31, 0xa8, 0xa3, 0x5f, 0x83, 0x3a, 0x7a, 0xd5, 0x3c, 0xef, 0xfd, 0xca, 0x3f, 0xc8, 0xbb, 0x65,
-	0xf7, 0x4e, 0x6d, 0xfc, 0x09, 0x00, 0x00, 0xff, 0xff, 0x53, 0xd4, 0xec, 0x49, 0xa9, 0x07, 0x00,
-	0x00,
+	0x14, 0x66, 0x9a, 0xbe, 0x79, 0xdf, 0x4e, 0x5e, 0xb5, 0x0c, 0xad, 0xa6, 0xb1, 0x8d, 0x61, 0x2e,
+	0xa4, 0x04, 0x3b, 0x43, 0x5a, 0x85, 0xa2, 0x57, 0x7e, 0x14, 0x29, 0x78, 0xa1, 0x51, 0x41, 0xf4,
+	0xa2, 0x4c, 0x37, 0x87, 0xed, 0x36, 0xc9, 0xce, 0x38, 0x3b, 0x5d, 0x2d, 0x25, 0x37, 0x45, 0x04,
+	0xf5, 0xd2, 0x9f, 0xe0, 0xad, 0x3f, 0xc4, 0x4b, 0xc1, 0x3f, 0x20, 0xc5, 0x1f, 0x22, 0x33, 0xbb,
+	0x9b, 0x64, 0x9b, 0x6e, 0x41, 0x08, 0x5e, 0xe5, 0xec, 0x99, 0x33, 0xe7, 0x79, 0x9e, 0xf3, 0x91,
+	0xc1, 0xcb, 0x11, 0xe8, 0x18, 0x34, 0x57, 0x5a, 0xee, 0x83, 0x67, 0xb2, 0x5f, 0xa6, 0xb4, 0x34,
+	0x92, 0xfc, 0x9b, 0x7e, 0xd6, 0x16, 0x7c, 0xe9, 0x4b, 0xe7, 0xe3, 0xd6, 0x4a, 0x8e, 0x6b, 0xcb,
+	0xbe, 0x94, 0x7e, 0x0f, 0xb8, 0x50, 0x01, 0x17, 0x61, 0x28, 0x8d, 0x30, 0x81, 0x0c, 0xa3, 0xf4,
+	0x94, 0x76, 0x37, 0x23, 0x16, 0x48, 0x77, 0xea, 0x49, 0x0d, 0x3c, 0x6e, 0x71, 0x1f, 0x42, 0xd0,
+	0xc2, 0x40, 0x27, 0x8d, 0xb9, 0x39, 0x8a, 0xe9, 0x0b, 0x6f, 0x2f, 0x08, 0x41, 0x1f, 0x72, 0xd5,
+	0xf5, 0xad, 0x23, 0xe2, 0x7d, 0x30, 0xe2, 0xac, 0x5b, 0xdb, 0x7e, 0x60, 0xf6, 0x0e, 0x76, 0x99,
+	0x27, 0xfb, 0x5c, 0x68, 0x47, 0x6c, 0xdf, 0x19, 0x6b, 0x5e, 0x67, 0x74, 0x5b, 0x28, 0xd5, 0x0b,
+	0x3c, 0x47, 0x89, 0xc7, 0x2d, 0xd1, 0x53, 0x7b, 0x62, 0x22, 0x15, 0x7d, 0x83, 0x17, 0x1e, 0x27,
+	0x1a, 0xef, 0x6b, 0x10, 0x06, 0xda, 0xf0, 0xfa, 0x00, 0x22, 0x43, 0x76, 0x70, 0xa6, 0xbd, 0x8a,
+	0x1a, 0x68, 0xb5, 0xb2, 0xbe, 0xc5, 0x46, 0xa0, 0x2c, 0x03, 0x75, 0xc6, 0x8e, 0xd7, 0x61, 0xaa,
+	0xeb, 0x33, 0x0b, 0xca, 0xc6, 0x40, 0x59, 0x06, 0xca, 0xee, 0x2a, 0x95, 0x82, 0xb4, 0xb3, 0xac,
+	0xf4, 0x15, 0x5e, 0x4a, 0x7d, 0xcf, 0x64, 0x17, 0xc2, 0x07, 0xd0, 0x83, 0x11, 0x7a, 0x35, 0x8f,
+	0x3e, 0x37, 0xbc, 0x46, 0x08, 0x9e, 0xd5, 0xb2, 0x07, 0xd5, 0x19, 0xe7, 0x76, 0x36, 0x99, 0xc7,
+	0xa5, 0x40, 0x98, 0x6a, 0xa9, 0x81, 0x56, 0x4b, 0x6d, 0x6b, 0xd2, 0x0f, 0x28, 0x9f, 0x3d, 0xaf,
+	0xad, 0x38, 0x7b, 0x03, 0x57, 0x3a, 0x10, 0x79, 0x3a, 0x50, 0x56, 0x40, 0x0a, 0x32, 0xee, 0x1a,
+	0xe2, 0x97, 0xc6, 0xf0, 0x97, 0xf1, 0x1c, 0xbc, 0x55, 0x81, 0x86, 0x68, 0x3b, 0xac, 0xce, 0x3a,
+	0x16, 0x23, 0x07, 0xbd, 0x31, 0xac, 0xb0, 0xa3, 0xd2, 0x86, 0x48, 0xc9, 0x30, 0x02, 0xb2, 0x80,
+	0xff, 0x31, 0xd6, 0x91, 0x72, 0x48, 0x3e, 0x28, 0xc5, 0xff, 0xa7, 0xd1, 0x4f, 0x0e, 0x40, 0x1f,
+	0x5a, 0xbc, 0x50, 0xf4, 0x21, 0x0d, 0x72, 0xf6, 0x58, 0xcf, 0x9e, 0xab, 0xce, 0xdf, 0xec, 0xd9,
+	0x25, 0x7c, 0x61, 0xab, 0xaf, 0xcc, 0x61, 0xa6, 0x61, 0xfd, 0xeb, 0x7f, 0xf8, 0x62, 0x1a, 0xf5,
+	0x14, 0x74, 0x1c, 0x78, 0x40, 0x3e, 0x22, 0x5c, 0x49, 0xca, 0xed, 0xe4, 0x12, 0xca, 0xb2, 0x95,
+	0x2a, 0x6c, 0x48, 0x6d, 0xe5, 0xcc, 0x98, 0x0c, 0x85, 0x6e, 0x1e, 0xff, 0xf8, 0xf5, 0x79, 0x66,
+	0x9d, 0xae, 0xb9, 0x55, 0x8a, 0x5b, 0xd9, 0x92, 0x46, 0xfc, 0x28, 0xb5, 0x06, 0xdc, 0x36, 0x22,
+	0xe2, 0x47, 0xf6, 0x67, 0xc0, 0x5d, 0x29, 0x6f, 0xa3, 0x26, 0x79, 0x8f, 0x70, 0x25, 0x99, 0xac,
+	0xf3, 0xc8, 0xe4, 0x66, 0xaf, 0x76, 0x79, 0x18, 0x93, 0xd3, 0x4a, 0xef, 0x38, 0x16, 0xb7, 0x9a,
+	0x1b, 0x7f, 0xc4, 0x82, 0x1f, 0x05, 0xc2, 0x0c, 0xc8, 0x27, 0x84, 0xcb, 0x89, 0x66, 0x32, 0x21,
+	0x36, 0x5f, 0x8b, 0xe9, 0xf4, 0x8c, 0x5e, 0x75, 0x6c, 0x17, 0xe9, 0xfc, 0x69, 0xb6, 0xb6, 0x2c,
+	0xc7, 0x08, 0xcf, 0x3e, 0x0a, 0x22, 0x43, 0x16, 0x4f, 0x73, 0x71, 0x43, 0x57, 0xdb, 0x9e, 0x0a,
+	0x07, 0x8b, 0x40, 0xab, 0x8e, 0x07, 0x21, 0x13, 0x3c, 0xc8, 0x3b, 0x84, 0x4b, 0x0f, 0xa1, 0x90,
+	0xc3, 0x94, 0xea, 0x70, 0xcd, 0xe1, 0x2f, 0x91, 0x2b, 0x93, 0x5d, 0xb3, 0xbb, 0x34, 0x20, 0x5f,
+	0x10, 0x2e, 0x27, 0x6b, 0x34, 0xd9, 0x99, 0xdc, 0x7a, 0x4d, 0x8b, 0xd1, 0x86, 0x63, 0xb4, 0x56,
+	0x5b, 0x2d, 0x9c, 0x23, 0x66, 0xff, 0xf7, 0x3b, 0xc2, 0x08, 0xe6, 0x28, 0xda, 0x8e, 0xbd, 0xc0,
+	0xe5, 0x64, 0x4a, 0x8b, 0xca, 0x55, 0x34, 0xb5, 0xa9, 0xfe, 0x66, 0xa1, 0xfe, 0x7d, 0x8c, 0x6d,
+	0xa3, 0xb6, 0x62, 0x08, 0x4d, 0x54, 0x94, 0x7d, 0x85, 0x25, 0xef, 0x94, 0x55, 0xc8, 0xec, 0x5b,
+	0xc6, 0xe2, 0x16, 0x73, 0x57, 0x5c, 0x93, 0xaf, 0x3b, 0x90, 0x06, 0xa9, 0x17, 0x80, 0x70, 0x70,
+	0xd9, 0xef, 0x6d, 0x7e, 0x3b, 0xa9, 0xa3, 0xef, 0x27, 0x75, 0xf4, 0xf3, 0xa4, 0x8e, 0x5e, 0x36,
+	0xcf, 0x7b, 0xc5, 0xf2, 0xcf, 0xf2, 0x6e, 0xd9, 0xbd, 0x56, 0x1b, 0xbf, 0x03, 0x00, 0x00, 0xff,
+	0xff, 0x41, 0x42, 0x44, 0x21, 0xaf, 0x07, 0x00, 0x00,
 }
diff --git a/server/project/project.pb.gw.go b/server/project/project.pb.gw.go
index 6b128b882233a..3006445ae38ae 100644
--- a/server/project/project.pb.gw.go
+++ b/server/project/project.pb.gw.go
@@ -70,10 +70,6 @@ func request_ProjectService_CreateToken_0(ctx context.Context, marshaler runtime
 
 }
 
-var (
-	filter_ProjectService_DeleteToken_0 = &utilities.DoubleArray{Encoding: map[string]int{"project": 0, "role": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}}
-)
-
 func request_ProjectService_DeleteToken_0(ctx context.Context, marshaler runtime.Marshaler, client ProjectServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) {
 	var protoReq ProjectTokenDeleteRequest
 	var metadata runtime.ServerMetadata
@@ -107,8 +103,15 @@ func request_ProjectService_DeleteToken_0(ctx context.Context, marshaler runtime
 		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "role", err)
 	}
 
-	if err := runtime.PopulateQueryParameters(&protoReq, req.URL.Query(), filter_ProjectService_DeleteToken_0); err != nil {
-		return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err)
+	val, ok = pathParams["iat"]
+	if !ok {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "missing parameter %s", "iat")
+	}
+
+	protoReq.Iat, err = runtime.Int64(val)
+
+	if err != nil {
+		return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "iat", err)
 	}
 
 	msg, err := client.DeleteToken(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD))
@@ -534,7 +537,7 @@ func RegisterProjectServiceHandlerClient(ctx context.Context, mux *runtime.Serve
 var (
 	pattern_ProjectService_CreateToken_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6}, []string{"api", "v1", "projects", "project", "roles", "role", "token"}, ""))
 
-	pattern_ProjectService_DeleteToken_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6}, []string{"api", "v1", "projects", "project", "roles", "role", "token"}, ""))
+	pattern_ProjectService_DeleteToken_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2, 1, 0, 4, 1, 5, 3, 2, 4, 1, 0, 4, 1, 5, 5, 2, 6, 1, 0, 4, 1, 5, 7}, []string{"api", "v1", "projects", "project", "roles", "role", "token", "iat"}, ""))
 
 	pattern_ProjectService_Create_0 = runtime.MustPattern(runtime.NewPattern(1, []int{2, 0, 2, 1, 2, 2}, []string{"api", "v1", "projects"}, ""))
 
diff --git a/server/project/project.proto b/server/project/project.proto
index 5cd75d61485fc..510d57c9e724a 100644
--- a/server/project/project.proto
+++ b/server/project/project.proto
@@ -63,7 +63,7 @@ service ProjectService {
 
     // Delete a new project token.
   rpc DeleteToken(ProjectTokenDeleteRequest) returns (EmptyResponse) {
-    option (google.api.http).delete = "/api/v1/projects/{project}/roles/{role}/token";
+    option (google.api.http).delete = "/api/v1/projects/{project}/roles/{role}/token/{iat}";
   }
 
   // Create a new project.
diff --git a/server/swagger.json b/server/swagger.json
index 54081f346801e..35a9804a9e060 100644
--- a/server/swagger.json
+++ b/server/swagger.json
@@ -832,7 +832,9 @@
             }
           }
         }
-      },
+      }
+    },
+    "/api/v1/projects/{project}/roles/{role}/token/{iat}": {
       "delete": {
         "tags": [
           "ProjectService"
@@ -851,6 +853,13 @@
             "name": "role",
             "in": "path",
             "required": true
+          },
+          {
+            "type": "string",
+            "format": "int64",
+            "name": "iat",
+            "in": "path",
+            "required": true
           }
         ],
         "responses": {