diff --git a/flyteadmin/pkg/manager/mocks/metrics_interface.go b/flyteadmin/pkg/manager/mocks/metrics_interface.go
index fd5ae8f34c..a098a1e062 100644
--- a/flyteadmin/pkg/manager/mocks/metrics_interface.go
+++ b/flyteadmin/pkg/manager/mocks/metrics_interface.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v1.0.1. DO NOT EDIT.
+// Code generated by mockery v2.40.3. DO NOT EDIT.
 
 package mocks
 
@@ -15,29 +15,27 @@ type MetricsInterface struct {
 	mock.Mock
 }
 
-type MetricsInterface_GetExecutionMetrics struct {
-	*mock.Call
-}
-
-func (_m MetricsInterface_GetExecutionMetrics) Return(_a0 *admin.WorkflowExecutionGetMetricsResponse, _a1 error) *MetricsInterface_GetExecutionMetrics {
-	return &MetricsInterface_GetExecutionMetrics{Call: _m.Call.Return(_a0, _a1)}
+type MetricsInterface_Expecter struct {
+	mock *mock.Mock
 }
 
-func (_m *MetricsInterface) OnGetExecutionMetrics(ctx context.Context, request *admin.WorkflowExecutionGetMetricsRequest) *MetricsInterface_GetExecutionMetrics {
-	c_call := _m.On("GetExecutionMetrics", ctx, request)
-	return &MetricsInterface_GetExecutionMetrics{Call: c_call}
-}
-
-func (_m *MetricsInterface) OnGetExecutionMetricsMatch(matchers ...interface{}) *MetricsInterface_GetExecutionMetrics {
-	c_call := _m.On("GetExecutionMetrics", matchers...)
-	return &MetricsInterface_GetExecutionMetrics{Call: c_call}
+func (_m *MetricsInterface) EXPECT() *MetricsInterface_Expecter {
+	return &MetricsInterface_Expecter{mock: &_m.Mock}
 }
 
 // GetExecutionMetrics provides a mock function with given fields: ctx, request
 func (_m *MetricsInterface) GetExecutionMetrics(ctx context.Context, request *admin.WorkflowExecutionGetMetricsRequest) (*admin.WorkflowExecutionGetMetricsResponse, error) {
 	ret := _m.Called(ctx, request)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetExecutionMetrics")
+	}
+
 	var r0 *admin.WorkflowExecutionGetMetricsResponse
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *admin.WorkflowExecutionGetMetricsRequest) (*admin.WorkflowExecutionGetMetricsResponse, error)); ok {
+		return rf(ctx, request)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *admin.WorkflowExecutionGetMetricsRequest) *admin.WorkflowExecutionGetMetricsResponse); ok {
 		r0 = rf(ctx, request)
 	} else {
@@ -46,7 +44,6 @@ func (_m *MetricsInterface) GetExecutionMetrics(ctx context.Context, request *ad
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *admin.WorkflowExecutionGetMetricsRequest) error); ok {
 		r1 = rf(ctx, request)
 	} else {
@@ -55,3 +52,46 @@ func (_m *MetricsInterface) GetExecutionMetrics(ctx context.Context, request *ad
 
 	return r0, r1
 }
+
+// MetricsInterface_GetExecutionMetrics_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetExecutionMetrics'
+type MetricsInterface_GetExecutionMetrics_Call struct {
+	*mock.Call
+}
+
+// GetExecutionMetrics is a helper method to define mock.On call
+//   - ctx context.Context
+//   - request *admin.WorkflowExecutionGetMetricsRequest
+func (_e *MetricsInterface_Expecter) GetExecutionMetrics(ctx interface{}, request interface{}) *MetricsInterface_GetExecutionMetrics_Call {
+	return &MetricsInterface_GetExecutionMetrics_Call{Call: _e.mock.On("GetExecutionMetrics", ctx, request)}
+}
+
+func (_c *MetricsInterface_GetExecutionMetrics_Call) Run(run func(ctx context.Context, request *admin.WorkflowExecutionGetMetricsRequest)) *MetricsInterface_GetExecutionMetrics_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*admin.WorkflowExecutionGetMetricsRequest))
+	})
+	return _c
+}
+
+func (_c *MetricsInterface_GetExecutionMetrics_Call) Return(_a0 *admin.WorkflowExecutionGetMetricsResponse, _a1 error) *MetricsInterface_GetExecutionMetrics_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *MetricsInterface_GetExecutionMetrics_Call) RunAndReturn(run func(context.Context, *admin.WorkflowExecutionGetMetricsRequest) (*admin.WorkflowExecutionGetMetricsResponse, error)) *MetricsInterface_GetExecutionMetrics_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// NewMetricsInterface creates a new instance of MetricsInterface. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewMetricsInterface(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *MetricsInterface {
+	mock := &MetricsInterface{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}
diff --git a/flyteadmin/pkg/manager/mocks/version_interface.go b/flyteadmin/pkg/manager/mocks/version_interface.go
index 99de16b6ca..cfde799196 100644
--- a/flyteadmin/pkg/manager/mocks/version_interface.go
+++ b/flyteadmin/pkg/manager/mocks/version_interface.go
@@ -1,4 +1,4 @@
-// Code generated by mockery v1.0.1. DO NOT EDIT.
+// Code generated by mockery v2.40.3. DO NOT EDIT.
 
 package mocks
 
@@ -15,29 +15,27 @@ type VersionInterface struct {
 	mock.Mock
 }
 
-type VersionInterface_GetVersion struct {
-	*mock.Call
-}
-
-func (_m VersionInterface_GetVersion) Return(_a0 *admin.GetVersionResponse, _a1 error) *VersionInterface_GetVersion {
-	return &VersionInterface_GetVersion{Call: _m.Call.Return(_a0, _a1)}
+type VersionInterface_Expecter struct {
+	mock *mock.Mock
 }
 
-func (_m *VersionInterface) OnGetVersion(ctx context.Context, r *admin.GetVersionRequest) *VersionInterface_GetVersion {
-	c_call := _m.On("GetVersion", ctx, r)
-	return &VersionInterface_GetVersion{Call: c_call}
-}
-
-func (_m *VersionInterface) OnGetVersionMatch(matchers ...interface{}) *VersionInterface_GetVersion {
-	c_call := _m.On("GetVersion", matchers...)
-	return &VersionInterface_GetVersion{Call: c_call}
+func (_m *VersionInterface) EXPECT() *VersionInterface_Expecter {
+	return &VersionInterface_Expecter{mock: &_m.Mock}
 }
 
 // GetVersion provides a mock function with given fields: ctx, r
 func (_m *VersionInterface) GetVersion(ctx context.Context, r *admin.GetVersionRequest) (*admin.GetVersionResponse, error) {
 	ret := _m.Called(ctx, r)
 
+	if len(ret) == 0 {
+		panic("no return value specified for GetVersion")
+	}
+
 	var r0 *admin.GetVersionResponse
+	var r1 error
+	if rf, ok := ret.Get(0).(func(context.Context, *admin.GetVersionRequest) (*admin.GetVersionResponse, error)); ok {
+		return rf(ctx, r)
+	}
 	if rf, ok := ret.Get(0).(func(context.Context, *admin.GetVersionRequest) *admin.GetVersionResponse); ok {
 		r0 = rf(ctx, r)
 	} else {
@@ -46,7 +44,6 @@ func (_m *VersionInterface) GetVersion(ctx context.Context, r *admin.GetVersionR
 		}
 	}
 
-	var r1 error
 	if rf, ok := ret.Get(1).(func(context.Context, *admin.GetVersionRequest) error); ok {
 		r1 = rf(ctx, r)
 	} else {
@@ -55,3 +52,46 @@ func (_m *VersionInterface) GetVersion(ctx context.Context, r *admin.GetVersionR
 
 	return r0, r1
 }
+
+// VersionInterface_GetVersion_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'GetVersion'
+type VersionInterface_GetVersion_Call struct {
+	*mock.Call
+}
+
+// GetVersion is a helper method to define mock.On call
+//   - ctx context.Context
+//   - r *admin.GetVersionRequest
+func (_e *VersionInterface_Expecter) GetVersion(ctx interface{}, r interface{}) *VersionInterface_GetVersion_Call {
+	return &VersionInterface_GetVersion_Call{Call: _e.mock.On("GetVersion", ctx, r)}
+}
+
+func (_c *VersionInterface_GetVersion_Call) Run(run func(ctx context.Context, r *admin.GetVersionRequest)) *VersionInterface_GetVersion_Call {
+	_c.Call.Run(func(args mock.Arguments) {
+		run(args[0].(context.Context), args[1].(*admin.GetVersionRequest))
+	})
+	return _c
+}
+
+func (_c *VersionInterface_GetVersion_Call) Return(_a0 *admin.GetVersionResponse, _a1 error) *VersionInterface_GetVersion_Call {
+	_c.Call.Return(_a0, _a1)
+	return _c
+}
+
+func (_c *VersionInterface_GetVersion_Call) RunAndReturn(run func(context.Context, *admin.GetVersionRequest) (*admin.GetVersionResponse, error)) *VersionInterface_GetVersion_Call {
+	_c.Call.Return(run)
+	return _c
+}
+
+// NewVersionInterface creates a new instance of VersionInterface. It also registers a testing interface on the mock and a cleanup function to assert the mocks expectations.
+// The first argument is typically a *testing.T value.
+func NewVersionInterface(t interface {
+	mock.TestingT
+	Cleanup(func())
+}) *VersionInterface {
+	mock := &VersionInterface{}
+	mock.Mock.Test(t)
+
+	t.Cleanup(func() { mock.AssertExpectations(t) })
+
+	return mock
+}