diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 365fc4f712c..2874e11fe58 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -329,12 +329,12 @@ jobs:
             pyroscope_env: ci-smoke-ocr-evm-simulated
           - name: ocr2
             nodes: 6
-            os: ubuntu-latest-16cores-64GB
+            os: ubuntu-latest
             file: ocr2
             pyroscope_env: ci-smoke-ocr2-evm-simulated
           - name: ocr2
             nodes: 6
-            os: ubuntu-latest-16cores-64GB
+            os: ubuntu-latest
             pyroscope_env: ci-smoke-ocr2-plugins-evm-simulated
             tag_suffix: "-plugins"
           - name: runlog
diff --git a/core/services/relay/evm/types/gen/bytes.tmpl b/core/services/relay/evm/types/gen/bytes.go.tmpl
similarity index 100%
rename from core/services/relay/evm/types/gen/bytes.tmpl
rename to core/services/relay/evm/types/gen/bytes.go.tmpl
diff --git a/core/services/relay/evm/types/gen/ints.tmpl b/core/services/relay/evm/types/gen/ints.go.tmpl
similarity index 100%
rename from core/services/relay/evm/types/gen/ints.tmpl
rename to core/services/relay/evm/types/gen/ints.go.tmpl
diff --git a/core/services/relay/evm/types/gen/main.go b/core/services/relay/evm/types/gen/main.go
index 3d3df924985..84e7c008ee0 100644
--- a/core/services/relay/evm/types/gen/main.go
+++ b/core/services/relay/evm/types/gen/main.go
@@ -66,8 +66,8 @@ type ByteType struct {
 	Size int
 }
 
-//go:embed bytes.tmpl
+//go:embed bytes.go.tmpl
 var bytesTemplate string
 
-//go:embed ints.tmpl
+//go:embed ints.go.tmpl
 var intsTemplate string
diff --git a/core/services/relay/evm/types/int_types_test.go b/core/services/relay/evm/types/int_types_test.go
index 1227773ce90..6930287c869 100644
--- a/core/services/relay/evm/types/int_types_test.go
+++ b/core/services/relay/evm/types/int_types_test.go
@@ -1,12 +1,12 @@
 package types
 
 import (
+	"errors"
 	"fmt"
 	"math/big"
 	"reflect"
 	"testing"
 
-	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"