diff --git a/chaoscenter/graphql/definitions/shared/environment.graphqls b/chaoscenter/graphql/definitions/shared/environment.graphqls
index 2556db58c5d..cce007be9fd 100644
--- a/chaoscenter/graphql/definitions/shared/environment.graphqls
+++ b/chaoscenter/graphql/definitions/shared/environment.graphqls
@@ -50,11 +50,11 @@ input EnvironmentFilterInput {
     """
     Type name of environment
     """
-    type: String
+    type: EnvironmentType
     """
     Tags of an environment
     """
-    tags: [EnvironmentType]
+    tags: [String!]
 }
 enum EnvironmentSortingField {
     NAME
diff --git a/chaoscenter/graphql/server/graph/generated/generated.go b/chaoscenter/graphql/server/graph/generated/generated.go
index 537fb7bcc81..b31d43f38dc 100644
--- a/chaoscenter/graphql/server/graph/generated/generated.go
+++ b/chaoscenter/graphql/server/graph/generated/generated.go
@@ -6617,11 +6617,11 @@ input EnvironmentFilterInput {
     """
     Type name of environment
     """
-    type: String
+    type: EnvironmentType
     """
     Tags of an environment
     """
-    tags: [EnvironmentType]
+    tags: [String!]
 }
 enum EnvironmentSortingField {
     NAME
@@ -27688,13 +27688,13 @@ func (ec *executionContext) unmarshalInputEnvironmentFilterInput(ctx context.Con
 			}
 		case "type":
 			var err error
-			it.Type, err = ec.unmarshalOString2ᚖstring(ctx, v)
+			it.Type, err = ec.unmarshalOEnvironmentType2ᚖgithubᚗcomᚋlitmuschaosᚋlitmusᚋchaoscenterᚋgraphqlᚋserverᚋgraphᚋmodelᚐEnvironmentType(ctx, v)
 			if err != nil {
 				return it, err
 			}
 		case "tags":
 			var err error
-			it.Tags, err = ec.unmarshalOEnvironmentType2ᚕᚖgithubᚗcomᚋlitmuschaosᚋlitmusᚋchaoscenterᚋgraphqlᚋserverᚋgraphᚋmodelᚐEnvironmentType(ctx, v)
+			it.Tags, err = ec.unmarshalOString2ᚕstringᚄ(ctx, v)
 			if err != nil {
 				return it, err
 			}
@@ -35784,66 +35784,6 @@ func (ec *executionContext) marshalOEnvironmentType2githubᚗcomᚋlitmuschaos
 	return v
 }
 
-func (ec *executionContext) unmarshalOEnvironmentType2ᚕᚖgithubᚗcomᚋlitmuschaosᚋlitmusᚋchaoscenterᚋgraphqlᚋserverᚋgraphᚋmodelᚐEnvironmentType(ctx context.Context, v interface{}) ([]*model.EnvironmentType, error) {
-	var vSlice []interface{}
-	if v != nil {
-		if tmp1, ok := v.([]interface{}); ok {
-			vSlice = tmp1
-		} else {
-			vSlice = []interface{}{v}
-		}
-	}
-	var err error
-	res := make([]*model.EnvironmentType, len(vSlice))
-	for i := range vSlice {
-		res[i], err = ec.unmarshalOEnvironmentType2ᚖgithubᚗcomᚋlitmuschaosᚋlitmusᚋchaoscenterᚋgraphqlᚋserverᚋgraphᚋmodelᚐEnvironmentType(ctx, vSlice[i])
-		if err != nil {
-			return nil, err
-		}
-	}
-	return res, nil
-}
-
-func (ec *executionContext) marshalOEnvironmentType2ᚕᚖgithubᚗcomᚋlitmuschaosᚋlitmusᚋchaoscenterᚋgraphqlᚋserverᚋgraphᚋmodelᚐEnvironmentType(ctx context.Context, sel ast.SelectionSet, v []*model.EnvironmentType) graphql.Marshaler {
-	if v == nil {
-		return graphql.Null
-	}
-	ret := make(graphql.Array, len(v))
-	var wg sync.WaitGroup
-	isLen1 := len(v) == 1
-	if !isLen1 {
-		wg.Add(len(v))
-	}
-	for i := range v {
-		i := i
-		fc := &graphql.FieldContext{
-			Index:  &i,
-			Result: &v[i],
-		}
-		ctx := graphql.WithFieldContext(ctx, fc)
-		f := func(i int) {
-			defer func() {
-				if r := recover(); r != nil {
-					ec.Error(ctx, ec.Recover(ctx, r))
-					ret = nil
-				}
-			}()
-			if !isLen1 {
-				defer wg.Done()
-			}
-			ret[i] = ec.marshalOEnvironmentType2ᚖgithubᚗcomᚋlitmuschaosᚋlitmusᚋchaoscenterᚋgraphqlᚋserverᚋgraphᚋmodelᚐEnvironmentType(ctx, sel, v[i])
-		}
-		if isLen1 {
-			f(i)
-		} else {
-			go f(i)
-		}
-
-	}
-	wg.Wait()
-	return ret
-}
-
 func (ec *executionContext) unmarshalOEnvironmentType2ᚖgithubᚗcomᚋlitmuschaosᚋlitmusᚋchaoscenterᚋgraphqlᚋserverᚋgraphᚋmodelᚐEnvironmentType(ctx context.Context, v interface{}) (*model.EnvironmentType, error) {
 	if v == nil {
 		return nil, nil
diff --git a/chaoscenter/graphql/server/graph/model/models_gen.go b/chaoscenter/graphql/server/graph/model/models_gen.go
index 396dfd7733f..34abefccfc0 100644
--- a/chaoscenter/graphql/server/graph/model/models_gen.go
+++ b/chaoscenter/graphql/server/graph/model/models_gen.go
@@ -355,9 +355,9 @@ type EnvironmentFilterInput struct {
 	// ID of the environment
 	Description *string `json:"description"`
 	// Type name of environment
-	Type *string `json:"type"`
+	Type *EnvironmentType `json:"type"`
 	// Tags of an environment
-	Tags []*EnvironmentType `json:"tags"`
+	Tags []string `json:"tags"`
 }
 
 // Defines sorting options for experiment
diff --git a/chaoscenter/web/src/api/entities/environment.ts b/chaoscenter/web/src/api/entities/environment.ts
index eaed97c2de1..7341b84f50e 100644
--- a/chaoscenter/web/src/api/entities/environment.ts
+++ b/chaoscenter/web/src/api/entities/environment.ts
@@ -15,7 +15,7 @@ export interface Environment extends Audit, ResourceDetails {
 export interface EnvironmentFilterInput {
   name?: string;
   description?: string;
-  type?: string;
+  type?: EnvironmentType;
   tags?: Array<string>;
 }