diff --git a/plugin/resolvergen/testdata/filetemplate/gqlgen.yml b/plugin/resolvergen/testdata/filetemplate/gqlgen.yml
index 49e6ff3326..9b510ff997 100644
--- a/plugin/resolvergen/testdata/filetemplate/gqlgen.yml
+++ b/plugin/resolvergen/testdata/filetemplate/gqlgen.yml
@@ -14,3 +14,5 @@ resolver:
 models:
   Resolver:
     model: github.com/99designs/gqlgen/plugin/resolvergen/testdata/singlefile/out.Resolver
+
+omit_gqlgen_version_in_file_notice: true
diff --git a/plugin/resolvergen/testdata/filetemplate/out/schema.custom.go b/plugin/resolvergen/testdata/filetemplate/out/schema.custom.go
index fc79e6b31c..caed384f58 100644
--- a/plugin/resolvergen/testdata/filetemplate/out/schema.custom.go
+++ b/plugin/resolvergen/testdata/filetemplate/out/schema.custom.go
@@ -2,7 +2,7 @@ package customresolver
 
 // This file will be automatically regenerated based on the schema, any resolver implementations
 // will be copied through when generating and any unknown code will be moved to the end.
-// Code generated by github.com/99designs/gqlgen version v0.17.44-dev
+// Code generated by github.com/99designs/gqlgen
 
 import (
 	"context"
@@ -30,10 +30,8 @@ func (r *CustomResolverType) Resolver() customresolver.ResolverResolver {
 	return &resolverCustomResolverType{r}
 }
 
-type (
-	queryCustomResolverType    struct{ *CustomResolverType }
-	resolverCustomResolverType struct{ *CustomResolverType }
-)
+type queryCustomResolverType struct{ *CustomResolverType }
+type resolverCustomResolverType struct{ *CustomResolverType }
 
 // !!! WARNING !!!
 // The code below was going to be deleted when updating resolvers. It has been copied here so you have
diff --git a/plugin/resolvergen/testdata/followschema/gqlgen.yml b/plugin/resolvergen/testdata/followschema/gqlgen.yml
index fd320dd798..b6d3ac34c9 100644
--- a/plugin/resolvergen/testdata/followschema/gqlgen.yml
+++ b/plugin/resolvergen/testdata/followschema/gqlgen.yml
@@ -13,3 +13,5 @@ resolver:
 models:
   Resolver:
     model: github.com/99designs/gqlgen/plugin/resolvergen/testdata/singlefile/out.Resolver
+
+omit_gqlgen_version_in_file_notice: true
diff --git a/plugin/resolvergen/testdata/followschema/out/schema.resolvers.go b/plugin/resolvergen/testdata/followschema/out/schema.resolvers.go
index e28b5149fa..1efcef81c4 100644
--- a/plugin/resolvergen/testdata/followschema/out/schema.resolvers.go
+++ b/plugin/resolvergen/testdata/followschema/out/schema.resolvers.go
@@ -2,7 +2,7 @@ package customresolver
 
 // This file will be automatically regenerated based on the schema, any resolver implementations
 // will be copied through when generating and any unknown code will be moved to the end.
-// Code generated by github.com/99designs/gqlgen version v0.17.44-dev
+// Code generated by github.com/99designs/gqlgen
 
 import (
 	"context"
@@ -30,10 +30,8 @@ func (r *CustomResolverType) Resolver() customresolver.ResolverResolver {
 	return &resolverCustomResolverType{r}
 }
 
-type (
-	queryCustomResolverType    struct{ *CustomResolverType }
-	resolverCustomResolverType struct{ *CustomResolverType }
-)
+type queryCustomResolverType struct{ *CustomResolverType }
+type resolverCustomResolverType struct{ *CustomResolverType }
 
 // !!! WARNING !!!
 // The code below was going to be deleted when updating resolvers. It has been copied here so you have
diff --git a/plugin/resolvergen/testdata/omit_template_comment/gqlgen.yml b/plugin/resolvergen/testdata/omit_template_comment/gqlgen.yml
index 68c4cacc06..531c7e1b57 100644
--- a/plugin/resolvergen/testdata/omit_template_comment/gqlgen.yml
+++ b/plugin/resolvergen/testdata/omit_template_comment/gqlgen.yml
@@ -14,3 +14,5 @@ resolver:
 models:
   Resolver:
     model: github.com/99designs/gqlgen/plugin/resolvergen/testdata/singlefile/out.Resolver
+
+omit_gqlgen_version_in_file_notice: true
diff --git a/plugin/resolvergen/testdata/omit_template_comment/out/schema.resolvers.go b/plugin/resolvergen/testdata/omit_template_comment/out/schema.resolvers.go
index fe7138fc74..86cf8b95ee 100644
--- a/plugin/resolvergen/testdata/omit_template_comment/out/schema.resolvers.go
+++ b/plugin/resolvergen/testdata/omit_template_comment/out/schema.resolvers.go
@@ -2,7 +2,7 @@ package out
 
 // This file will be automatically regenerated based on the schema, any resolver implementations
 // will be copied through when generating and any unknown code will be moved to the end.
-// Code generated by github.com/99designs/gqlgen version v0.17.44-dev
+// Code generated by github.com/99designs/gqlgen
 
 import (
 	"context"
@@ -26,7 +26,5 @@ func (r *CustomResolverType) Resolver() customresolver.ResolverResolver {
 	return &resolverCustomResolverType{r}
 }
 
-type (
-	queryCustomResolverType    struct{ *CustomResolverType }
-	resolverCustomResolverType struct{ *CustomResolverType }
-)
+type queryCustomResolverType struct{ *CustomResolverType }
+type resolverCustomResolverType struct{ *CustomResolverType }
diff --git a/plugin/resolvergen/testdata/resolver_implementor/gqlgen.yml b/plugin/resolvergen/testdata/resolver_implementor/gqlgen.yml
index 833f78cf09..989723b6b8 100644
--- a/plugin/resolvergen/testdata/resolver_implementor/gqlgen.yml
+++ b/plugin/resolvergen/testdata/resolver_implementor/gqlgen.yml
@@ -13,3 +13,5 @@ resolver:
 models:
   Resolver:
     model: github.com/99designs/gqlgen/plugin/resolvergen/testdata/resolver_implementor/out.Resolver
+
+omit_gqlgen_version_in_file_notice: true
diff --git a/plugin/resolvergen/testdata/resolver_implementor/out/schema.resolvers.go b/plugin/resolvergen/testdata/resolver_implementor/out/schema.resolvers.go
index 3b0d9eb295..e30aae6aac 100644
--- a/plugin/resolvergen/testdata/resolver_implementor/out/schema.resolvers.go
+++ b/plugin/resolvergen/testdata/resolver_implementor/out/schema.resolvers.go
@@ -2,7 +2,7 @@ package customresolver
 
 // This file will be automatically regenerated based on the schema, any resolver implementations
 // will be copied through when generating and any unknown code will be moved to the end.
-// Code generated by github.com/99designs/gqlgen version v0.17.44-dev
+// Code generated by github.com/99designs/gqlgen
 
 import (
 	"context"
@@ -24,7 +24,5 @@ func (r *CustomResolverType) Query() QueryResolver { return &queryCustomResolver
 // Resolver returns ResolverResolver implementation.
 func (r *CustomResolverType) Resolver() ResolverResolver { return &resolverCustomResolverType{r} }
 
-type (
-	queryCustomResolverType    struct{ *CustomResolverType }
-	resolverCustomResolverType struct{ *CustomResolverType }
-)
+type queryCustomResolverType struct{ *CustomResolverType }
+type resolverCustomResolverType struct{ *CustomResolverType }
diff --git a/plugin/resolvergen/testdata/resolvertemplate/gqlgen.yml b/plugin/resolvergen/testdata/resolvertemplate/gqlgen.yml
index c7ce0aaddd..4325b1c439 100644
--- a/plugin/resolvergen/testdata/resolvertemplate/gqlgen.yml
+++ b/plugin/resolvergen/testdata/resolvertemplate/gqlgen.yml
@@ -15,3 +15,5 @@ resolver:
 models:
   Resolver:
     model: github.com/99designs/gqlgen/plugin/resolvergen/testdata/singlefile/out.Resolver
+
+omit_gqlgen_version_in_file_notice: true
diff --git a/plugin/resolvergen/testdata/resolvertemplate/out/schema.resolvers.go b/plugin/resolvergen/testdata/resolvertemplate/out/schema.resolvers.go
index 1f5767f740..27460370f5 100644
--- a/plugin/resolvergen/testdata/resolvertemplate/out/schema.resolvers.go
+++ b/plugin/resolvergen/testdata/resolvertemplate/out/schema.resolvers.go
@@ -2,7 +2,7 @@ package out
 
 // This file will be automatically regenerated based on the schema, any resolver implementations
 // will be copied through when generating and any unknown code will be moved to the end.
-// Code generated by github.com/99designs/gqlgen version v0.17.44-dev
+// Code generated by github.com/99designs/gqlgen
 
 import (
 	"context"
@@ -31,7 +31,5 @@ func (r *CustomResolverType) Resolver() customresolver.ResolverResolver {
 	return &resolverCustomResolverType{r}
 }
 
-type (
-	queryCustomResolverType    struct{ *CustomResolverType }
-	resolverCustomResolverType struct{ *CustomResolverType }
-)
+type queryCustomResolverType struct{ *CustomResolverType }
+type resolverCustomResolverType struct{ *CustomResolverType }
diff --git a/plugin/resolvergen/testdata/singlefile/gqlgen.yml b/plugin/resolvergen/testdata/singlefile/gqlgen.yml
index 77261097f4..4118768760 100644
--- a/plugin/resolvergen/testdata/singlefile/gqlgen.yml
+++ b/plugin/resolvergen/testdata/singlefile/gqlgen.yml
@@ -12,3 +12,5 @@ resolver:
 models:
   Resolver:
     model: github.com/99designs/gqlgen/plugin/resolvergen/testdata/singlefile/out.Resolver
+
+omit_gqlgen_version_in_file_notice: true
diff --git a/plugin/resolvergen/testdata/singlefile/out/resolver.go b/plugin/resolvergen/testdata/singlefile/out/resolver.go
index 30261d7f4e..844b077c4a 100644
--- a/plugin/resolvergen/testdata/singlefile/out/resolver.go
+++ b/plugin/resolvergen/testdata/singlefile/out/resolver.go
@@ -24,7 +24,5 @@ func (r *CustomResolverType) Query() QueryResolver { return &queryCustomResolver
 // Resolver returns ResolverResolver implementation.
 func (r *CustomResolverType) Resolver() ResolverResolver { return &resolverCustomResolverType{r} }
 
-type (
-	queryCustomResolverType    struct{ *CustomResolverType }
-	resolverCustomResolverType struct{ *CustomResolverType }
-)
+type queryCustomResolverType struct{ *CustomResolverType }
+type resolverCustomResolverType struct{ *CustomResolverType }