diff --git a/.golangci.yml b/.golangci.yml
index a75024d9f..a8ee70a8f 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -29,7 +29,7 @@ linters:
     - dupl
     - errcheck
     - gocritic
-    # - gofmt; disabled because it conflicts with goheader
+    - gofmt
     - goheader
     - gosec
     - gosimple
diff --git a/entgql/internal/todo/server/server.go b/entgql/internal/todo/server/server.go
index 09f43e05f..bac09a742 100644
--- a/entgql/internal/todo/server/server.go
+++ b/entgql/internal/todo/server/server.go
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package main
 
 import (
diff --git a/entgql/internal/todofed/server/server.go b/entgql/internal/todofed/server/server.go
index 503f8ec53..bb744e046 100644
--- a/entgql/internal/todofed/server/server.go
+++ b/entgql/internal/todofed/server/server.go
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package main
 
 import (
diff --git a/entgql/internal/todopulid/server/server.go b/entgql/internal/todopulid/server/server.go
index ad8895878..22208d555 100644
--- a/entgql/internal/todopulid/server/server.go
+++ b/entgql/internal/todopulid/server/server.go
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package main
 
 import (
diff --git a/entgql/internal/todouuid/server/server.go b/entgql/internal/todouuid/server/server.go
index f5d7f9034..12d0add36 100644
--- a/entgql/internal/todouuid/server/server.go
+++ b/entgql/internal/todouuid/server/server.go
@@ -11,6 +11,7 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+
 package main
 
 import (