diff --git a/bin/configs/go-echo-server-petstore-new.yaml b/bin/configs/go-echo-server-petstore-new.yaml
index bfc2e946c58..d51837468e8 100644
--- a/bin/configs/go-echo-server-petstore-new.yaml
+++ b/bin/configs/go-echo-server-petstore-new.yaml
@@ -2,5 +2,8 @@ generatorName: go-echo-server
 outputDir: samples/server/petstore/go-echo-server
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
 templateDir: modules/openapi-generator/src/main/resources/go-echo-server
+gitHost: gitlab.com
+gitUserId: openapitools
+gitRepoId: petstore
 additionalProperties:
   hideGenerationTimestamp: "true"
diff --git a/modules/openapi-generator/src/main/resources/go-echo-server/api.mustache b/modules/openapi-generator/src/main/resources/go-echo-server/api.mustache
index 6045cae0816..37c3775eb15 100644
--- a/modules/openapi-generator/src/main/resources/go-echo-server/api.mustache
+++ b/modules/openapi-generator/src/main/resources/go-echo-server/api.mustache
@@ -1,7 +1,7 @@
 package handlers
 {{#operations}}
 import (
-    "github.com/{{{gitUserId}}}/{{{gitRepoId}}}/models"
+    "{{{gitHost}}}/{{{gitUserId}}}/{{{gitRepoId}}}/models"
     "github.com/labstack/echo/v4"
     "net/http"
 ){{#operation}}
diff --git a/modules/openapi-generator/src/main/resources/go-echo-server/go-mod.mustache b/modules/openapi-generator/src/main/resources/go-echo-server/go-mod.mustache
index c1a4ac15ece..d0121ca4671 100644
--- a/modules/openapi-generator/src/main/resources/go-echo-server/go-mod.mustache
+++ b/modules/openapi-generator/src/main/resources/go-echo-server/go-mod.mustache
@@ -1,4 +1,4 @@
-module github.com/{{{gitUserId}}}/{{{gitRepoId}}}
+module {{{gitHost}}}/{{{gitUserId}}}/{{{gitRepoId}}}
 
 go 1.16
 
diff --git a/modules/openapi-generator/src/main/resources/go-echo-server/main.mustache b/modules/openapi-generator/src/main/resources/go-echo-server/main.mustache
index 97736d7f083..000243ea05d 100644
--- a/modules/openapi-generator/src/main/resources/go-echo-server/main.mustache
+++ b/modules/openapi-generator/src/main/resources/go-echo-server/main.mustache
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/{{{gitUserId}}}/{{{gitRepoId}}}/handlers"
+	"{{{gitHost}}}/{{{gitUserId}}}/{{{gitRepoId}}}/handlers"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 )
diff --git a/samples/server/petstore/go-echo-server/go.mod b/samples/server/petstore/go-echo-server/go.mod
index 586002dcc6c..35af20db6ea 100644
--- a/samples/server/petstore/go-echo-server/go.mod
+++ b/samples/server/petstore/go-echo-server/go.mod
@@ -1,4 +1,4 @@
-module github.com/GIT_USER_ID/GIT_REPO_ID
+module gitlab.com/openapitools/petstore
 
 go 1.16
 
diff --git a/samples/server/petstore/go-echo-server/handlers/api_pet.go b/samples/server/petstore/go-echo-server/handlers/api_pet.go
index 7a538195159..af6117b162b 100644
--- a/samples/server/petstore/go-echo-server/handlers/api_pet.go
+++ b/samples/server/petstore/go-echo-server/handlers/api_pet.go
@@ -1,6 +1,6 @@
 package handlers
 import (
-    "github.com/GIT_USER_ID/GIT_REPO_ID/models"
+    "gitlab.com/openapitools/petstore/models"
     "github.com/labstack/echo/v4"
     "net/http"
 )
diff --git a/samples/server/petstore/go-echo-server/handlers/api_store.go b/samples/server/petstore/go-echo-server/handlers/api_store.go
index 90cf94597ea..a994e5020a7 100644
--- a/samples/server/petstore/go-echo-server/handlers/api_store.go
+++ b/samples/server/petstore/go-echo-server/handlers/api_store.go
@@ -1,6 +1,6 @@
 package handlers
 import (
-    "github.com/GIT_USER_ID/GIT_REPO_ID/models"
+    "gitlab.com/openapitools/petstore/models"
     "github.com/labstack/echo/v4"
     "net/http"
 )
diff --git a/samples/server/petstore/go-echo-server/handlers/api_user.go b/samples/server/petstore/go-echo-server/handlers/api_user.go
index c7893a407ef..8f695e3c7d3 100644
--- a/samples/server/petstore/go-echo-server/handlers/api_user.go
+++ b/samples/server/petstore/go-echo-server/handlers/api_user.go
@@ -1,6 +1,6 @@
 package handlers
 import (
-    "github.com/GIT_USER_ID/GIT_REPO_ID/models"
+    "gitlab.com/openapitools/petstore/models"
     "github.com/labstack/echo/v4"
     "net/http"
 )
diff --git a/samples/server/petstore/go-echo-server/main.go b/samples/server/petstore/go-echo-server/main.go
index 5a428d4bbf0..b96dcb776ef 100644
--- a/samples/server/petstore/go-echo-server/main.go
+++ b/samples/server/petstore/go-echo-server/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	"github.com/GIT_USER_ID/GIT_REPO_ID/handlers"
+	"gitlab.com/openapitools/petstore/handlers"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 )