diff --git a/Dockerfile b/Dockerfile
index 3c590c29..bfe0582e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ COPY . .
 RUN go install github.com/actgardner/gogen-avro/v10/cmd/...@latest
 RUN go generate pkg/generator/generate.go
 RUN go get -u -d -v
-RUN CGO_ENABLED=1 GOOS=linux go build -tags static_all -v -ldflags="-X 'github.com/ugol/jr/pkg/cmd.Version=${VERSION}' -X 'github.com/ugol/jr/pkg/cmd.GoVersion=${GOVERSION}' -X 'github.com/ugol/jr/pkg/cmd.BuildUser=${USER}' -X 'github.com/ugol/jr/pkg/cmd.BuildTime=${TIME}'" -o build/jr jr.go
+RUN CGO_ENABLED=1 GOOS=linux go build -tags static_all -v -ldflags="-X 'github.com/jrnd-io/jr/pkg/cmd.Version=${VERSION}' -X 'github.com/jrnd-io/jr/pkg/cmd.GoVersion=${GOVERSION}' -X 'github.com/jrnd-io/jr/pkg/cmd.BuildUser=${USER}' -X 'github.com/jrnd-io/jr/pkg/cmd.BuildTime=${TIME}'" -o build/jr jr.go
 
 FROM registry.access.redhat.com/ubi9/ubi-micro
     
diff --git a/Dockerfile.alpine b/Dockerfile.alpine
index 3039453c..9be69812 100644
--- a/Dockerfile.alpine
+++ b/Dockerfile.alpine
@@ -24,7 +24,7 @@ WORKDIR /go/src/github.com/ugol/jr
 COPY . .
 
 RUN go get -u -d -v
-RUN CGO_ENABLED=1 GOOS=linux go build -tags musl -v -ldflags="-X 'github.com/ugol/jr/cmd.Version=${VERSION}' 'github.com/ugol/jr/pkg/cmd.GoVersion=${GOVERSION}' -X 'github.com/ugol/jr/cmd.BuildUser=${USER}' -X 'github.com/ugol/jr/cmd.BuildTime=${TIME}'" -o build/jr jr.go
+RUN CGO_ENABLED=1 GOOS=linux go build -tags musl -v -ldflags="-X 'github.com/jrnd-io/jr/cmd.Version=${VERSION}' 'github.com/jrnd-io/jr/pkg/cmd.GoVersion=${GOVERSION}' -X 'github.com/jrnd-io/jr/cmd.BuildUser=${USER}' -X 'github.com/jrnd-io/jr/cmd.BuildTime=${TIME}'" -o build/jr jr.go
 
 FROM alpine
 COPY --from=builder /etc/passwd /etc/passwd
diff --git a/Dockerfile.scratch b/Dockerfile.scratch
index 3636d5e7..99c6f4e0 100644
--- a/Dockerfile.scratch
+++ b/Dockerfile.scratch
@@ -25,7 +25,7 @@ COPY . .
 RUN go get -u -d -v
 RUN CGO_ENABLED=1 GOOS=linux go build \
      -tags musl -v \
-     -ldflags="-X 'github.com/ugol/jr/cmd.Version=${VERSION}' 'github.com/ugol/jr/pkg/cmd.GoVersion=${GOVERSION}' -X 'github.com/ugol/jr/cmd.BuildUser=${USER}' -X 'github.com/ugol/jr/cmd.BuildTime=${TIME}' -linkmode external -w -s -extldflags '-static'" \
+     -ldflags="-X 'github.com/jrnd-io/jr/cmd.Version=${VERSION}' 'github.com/jrnd-io/jr/pkg/cmd.GoVersion=${GOVERSION}' -X 'github.com/jrnd-io/jr/cmd.BuildUser=${USER}' -X 'github.com/ugol/jr/cmd.BuildTime=${TIME}' -linkmode external -w -s -extldflags '-static'" \
      -a -o build/jr jr.go
 
 FROM scratch
diff --git a/Makefile b/Makefile
index 77bc59a9..7d3f1435 100644
--- a/Makefile
+++ b/Makefile
@@ -63,10 +63,10 @@ generate:
 
 compile:
 	@echo "Compiling"
-	go build -v -ldflags="-X 'github.com/ugol/jr/pkg/cmd.Version=$(VERSION)' \
-	-X 'github.com/ugol/jr/pkg/cmd.GoVersion=$(GOVERSION)' \
-	-X 'github.com/ugol/jr/pkg/cmd.BuildUser=$(USER)' \
-	-X 'github.com/ugol/jr/pkg/cmd.BuildTime=$(TIME)'" \
+	go build -v -ldflags="-X 'github.com/jrnd-io/jr/pkg/cmd.Version=$(VERSION)' \
+	-X 'github.com/jrnd-io/jr/pkg/cmd.GoVersion=$(GOVERSION)' \
+	-X 'github.com/jrnd-io/jr/pkg/cmd.BuildUser=$(USER)' \
+	-X 'github.com/jrnd-io/jr/pkg/cmd.BuildTime=$(TIME)'" \
 	-o build/jr jr.go
 
 run: compile
diff --git a/go.mod b/go.mod
index a73ceb5a..f5624723 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/ugol/jr
+module github.com/jrnd-io/jr
 
 go 1.22.4
 
diff --git a/jr.go b/jr.go
index a8d62482..c2ee1c8b 100644
--- a/jr.go
+++ b/jr.go
@@ -46,7 +46,7 @@ Using --duration option you can time bound the entire object creation. This exam
 package main
 
 import (
-	"github.com/ugol/jr/pkg/cmd"
+	"github.com/jrnd-io/jr/pkg/cmd"
 )
 
 func main() {
diff --git a/pkg/cmd/createTopic.go b/pkg/cmd/createTopic.go
index e40f49df..e4f023b4 100644
--- a/pkg/cmd/createTopic.go
+++ b/pkg/cmd/createTopic.go
@@ -21,9 +21,9 @@
 package cmd
 
 import (
+	"github.com/jrnd-io/jr/pkg/constants"
+	"github.com/jrnd-io/jr/pkg/producers/kafka"
 	"github.com/spf13/cobra"
-	"github.com/ugol/jr/pkg/constants"
-	"github.com/ugol/jr/pkg/producers/kafka"
 )
 
 var createTopicCmd = &cobra.Command{
diff --git a/pkg/cmd/emitter.go b/pkg/cmd/emitter.go
index aa554b7f..6d081f08 100644
--- a/pkg/cmd/emitter.go
+++ b/pkg/cmd/emitter.go
@@ -21,8 +21,8 @@
 package cmd
 
 import (
+	"github.com/jrnd-io/jr/pkg/emitter"
 	"github.com/spf13/cobra"
-	"github.com/ugol/jr/pkg/emitter"
 )
 
 var emitterCmd = &cobra.Command{
diff --git a/pkg/cmd/emitterRun.go b/pkg/cmd/emitterRun.go
index 0a437627..e5902b9b 100644
--- a/pkg/cmd/emitterRun.go
+++ b/pkg/cmd/emitterRun.go
@@ -21,8 +21,8 @@
 package cmd
 
 import (
+	"github.com/jrnd-io/jr/pkg/emitter"
 	"github.com/spf13/cobra"
-	"github.com/ugol/jr/pkg/emitter"
 )
 
 var emitterRunCmd = &cobra.Command{
diff --git a/pkg/cmd/functionList.go b/pkg/cmd/functionList.go
index c426d62e..acd30b7e 100644
--- a/pkg/cmd/functionList.go
+++ b/pkg/cmd/functionList.go
@@ -22,8 +22,8 @@ package cmd
 
 import (
 	"fmt"
+	"github.com/jrnd-io/jr/pkg/functions"
 	"github.com/spf13/cobra"
-	"github.com/ugol/jr/pkg/functions"
 	"os"
 	"os/exec"
 	"slices"
diff --git a/pkg/cmd/root.go b/pkg/cmd/root.go
index 47986bba..363b8284 100644
--- a/pkg/cmd/root.go
+++ b/pkg/cmd/root.go
@@ -26,14 +26,14 @@ import (
 	"strings"
 	"time"
 
+	"github.com/jrnd-io/jr/pkg/configuration"
+	"github.com/jrnd-io/jr/pkg/constants"
+	"github.com/jrnd-io/jr/pkg/functions"
 	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
-	"github.com/ugol/jr/pkg/configuration"
-	"github.com/ugol/jr/pkg/constants"
-	"github.com/ugol/jr/pkg/functions"
 )
 
 var logLevel = constants.DEFAULT_LOG_LEVEL
diff --git a/pkg/cmd/server.go b/pkg/cmd/server.go
index 6332d7bf..a3c15003 100644
--- a/pkg/cmd/server.go
+++ b/pkg/cmd/server.go
@@ -38,12 +38,12 @@ import (
 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
 	"github.com/gorilla/sessions"
+	"github.com/jrnd-io/jr/pkg/configuration"
+	"github.com/jrnd-io/jr/pkg/constants"
+	"github.com/jrnd-io/jr/pkg/emitter"
+	"github.com/jrnd-io/jr/pkg/functions"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
-	"github.com/ugol/jr/pkg/configuration"
-	"github.com/ugol/jr/pkg/constants"
-	"github.com/ugol/jr/pkg/emitter"
-	"github.com/ugol/jr/pkg/functions"
 )
 
 //go:embed html/index.html
diff --git a/pkg/cmd/templateList.go b/pkg/cmd/templateList.go
index 173aa9f9..525dd3f3 100644
--- a/pkg/cmd/templateList.go
+++ b/pkg/cmd/templateList.go
@@ -23,9 +23,9 @@ package cmd
 import (
 	"bytes"
 	"fmt"
+	"github.com/jrnd-io/jr/pkg/constants"
+	"github.com/jrnd-io/jr/pkg/functions"
 	"github.com/spf13/cobra"
-	"github.com/ugol/jr/pkg/constants"
-	"github.com/ugol/jr/pkg/functions"
 	"os"
 	"path/filepath"
 	"strings"
diff --git a/pkg/cmd/templateRun.go b/pkg/cmd/templateRun.go
index b5027f19..1ea0f95b 100644
--- a/pkg/cmd/templateRun.go
+++ b/pkg/cmd/templateRun.go
@@ -23,13 +23,13 @@ package cmd
 import (
 	"time"
 
+	"github.com/jrnd-io/jr/pkg/configuration"
+	"github.com/jrnd-io/jr/pkg/constants"
+	"github.com/jrnd-io/jr/pkg/emitter"
+	"github.com/jrnd-io/jr/pkg/functions"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
-	"github.com/ugol/jr/pkg/configuration"
-	"github.com/ugol/jr/pkg/constants"
-	"github.com/ugol/jr/pkg/emitter"
-	"github.com/ugol/jr/pkg/functions"
 )
 
 var templateRunCmd = &cobra.Command{
diff --git a/pkg/cmd/templateShow.go b/pkg/cmd/templateShow.go
index 67c9d5d5..58ef2dc1 100644
--- a/pkg/cmd/templateShow.go
+++ b/pkg/cmd/templateShow.go
@@ -26,9 +26,9 @@ import (
 	"runtime"
 	"strings"
 
+	"github.com/jrnd-io/jr/pkg/constants"
 	"github.com/rs/zerolog/log"
 	"github.com/spf13/cobra"
-	"github.com/ugol/jr/pkg/constants"
 )
 
 var templateShowCmd = &cobra.Command{
diff --git a/pkg/emitter/emitter.go b/pkg/emitter/emitter.go
index 5d54f587..1a9eb143 100644
--- a/pkg/emitter/emitter.go
+++ b/pkg/emitter/emitter.go
@@ -25,24 +25,24 @@ import (
 	"os"
 	"time"
 
+	"github.com/jrnd-io/jr/pkg/configuration"
+	"github.com/jrnd-io/jr/pkg/constants"
+	"github.com/jrnd-io/jr/pkg/ctx"
+	"github.com/jrnd-io/jr/pkg/functions"
+	"github.com/jrnd-io/jr/pkg/producers/azblobstorage"
+	"github.com/jrnd-io/jr/pkg/producers/azcosmosdb"
+	"github.com/jrnd-io/jr/pkg/producers/cassandra"
+	"github.com/jrnd-io/jr/pkg/producers/console"
+	"github.com/jrnd-io/jr/pkg/producers/elastic"
+	"github.com/jrnd-io/jr/pkg/producers/gcs"
+	"github.com/jrnd-io/jr/pkg/producers/http"
+	"github.com/jrnd-io/jr/pkg/producers/kafka"
+	"github.com/jrnd-io/jr/pkg/producers/mongoDB"
+	"github.com/jrnd-io/jr/pkg/producers/redis"
+	"github.com/jrnd-io/jr/pkg/producers/s3"
+	"github.com/jrnd-io/jr/pkg/producers/server"
+	"github.com/jrnd-io/jr/pkg/tpl"
 	"github.com/rs/zerolog/log"
-	"github.com/ugol/jr/pkg/configuration"
-	"github.com/ugol/jr/pkg/constants"
-	"github.com/ugol/jr/pkg/ctx"
-	"github.com/ugol/jr/pkg/functions"
-	"github.com/ugol/jr/pkg/producers/azblobstorage"
-	"github.com/ugol/jr/pkg/producers/azcosmosdb"
-	"github.com/ugol/jr/pkg/producers/cassandra"
-	"github.com/ugol/jr/pkg/producers/console"
-	"github.com/ugol/jr/pkg/producers/elastic"
-	"github.com/ugol/jr/pkg/producers/gcs"
-	"github.com/ugol/jr/pkg/producers/http"
-	"github.com/ugol/jr/pkg/producers/kafka"
-	"github.com/ugol/jr/pkg/producers/mongoDB"
-	"github.com/ugol/jr/pkg/producers/redis"
-	"github.com/ugol/jr/pkg/producers/s3"
-	"github.com/ugol/jr/pkg/producers/server"
-	"github.com/ugol/jr/pkg/tpl"
 )
 
 type Emitter struct {
diff --git a/pkg/emitter/loop.go b/pkg/emitter/loop.go
index 6e45de07..19e6efb0 100644
--- a/pkg/emitter/loop.go
+++ b/pkg/emitter/loop.go
@@ -23,9 +23,9 @@ package emitter
 import (
 	"context"
 	"fmt"
-	"github.com/ugol/jr/pkg/configuration"
-	"github.com/ugol/jr/pkg/ctx"
-	"github.com/ugol/jr/pkg/functions"
+	"github.com/jrnd-io/jr/pkg/configuration"
+	"github.com/jrnd-io/jr/pkg/ctx"
+	"github.com/jrnd-io/jr/pkg/functions"
 	"io"
 	"os"
 	"os/signal"
diff --git a/pkg/functions/address.go b/pkg/functions/address.go
index 8f5504da..fdd746b2 100644
--- a/pkg/functions/address.go
+++ b/pkg/functions/address.go
@@ -22,7 +22,7 @@ package functions
 
 import (
 	"fmt"
-	"github.com/ugol/jr/pkg/ctx"
+	"github.com/jrnd-io/jr/pkg/ctx"
 	"math"
 )
 
diff --git a/pkg/functions/functions.go b/pkg/functions/functions.go
index f87fecc7..07089277 100644
--- a/pkg/functions/functions.go
+++ b/pkg/functions/functions.go
@@ -33,9 +33,9 @@ import (
 	"text/template"
 
 	"github.com/google/uuid"
+	"github.com/jrnd-io/jr/pkg/constants"
+	"github.com/jrnd-io/jr/pkg/ctx"
 	"github.com/rs/zerolog/log"
-	"github.com/ugol/jr/pkg/constants"
-	"github.com/ugol/jr/pkg/ctx"
 	"golang.org/x/text/cases"
 	"golang.org/x/text/language"
 )
diff --git a/pkg/functions/helper.go b/pkg/functions/helper.go
index 257abcbe..c13f527b 100644
--- a/pkg/functions/helper.go
+++ b/pkg/functions/helper.go
@@ -25,8 +25,8 @@ import (
 	"regexp"
 	"text/template"
 
+	"github.com/jrnd-io/jr/pkg/ctx"
 	"github.com/rs/zerolog/log"
-	"github.com/ugol/jr/pkg/ctx"
 )
 
 func ExecuteTemplate(key *template.Template, value *template.Template, oneline bool) (string, string, error) {
diff --git a/pkg/functions/people.go b/pkg/functions/people.go
index 18e9a668..86963292 100644
--- a/pkg/functions/people.go
+++ b/pkg/functions/people.go
@@ -25,8 +25,8 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/jrnd-io/jr/pkg/ctx"
 	"github.com/squeeze69/generacodicefiscale"
-	"github.com/ugol/jr/pkg/ctx"
 
 	"github.com/rs/zerolog/log"
 )
diff --git a/pkg/functions/phone.go b/pkg/functions/phone.go
index 8819eeb5..a3c352bd 100644
--- a/pkg/functions/phone.go
+++ b/pkg/functions/phone.go
@@ -20,7 +20,7 @@
 
 package functions
 
-import "github.com/ugol/jr/pkg/ctx"
+import "github.com/jrnd-io/jr/pkg/ctx"
 
 // CountryCode returns a random Country Code prefix
 func CountryCode() string {
diff --git a/pkg/functions/utilities.go b/pkg/functions/utilities.go
index 06a788b2..de17693b 100644
--- a/pkg/functions/utilities.go
+++ b/pkg/functions/utilities.go
@@ -23,7 +23,7 @@ package functions
 import (
 	"fmt"
 	"github.com/google/uuid"
-	"github.com/ugol/jr/pkg/ctx"
+	"github.com/jrnd-io/jr/pkg/ctx"
 )
 
 // Counter creates a counter named c, starting from start and incrementing by step
diff --git a/pkg/functions_test/finance_test.go b/pkg/functions_test/finance_test.go
index 348a5a0a..0ff3bf97 100644
--- a/pkg/functions_test/finance_test.go
+++ b/pkg/functions_test/finance_test.go
@@ -21,7 +21,7 @@
 package functions_test
 
 import (
-	"github.com/ugol/jr/pkg/functions"
+	"github.com/jrnd-io/jr/pkg/functions"
 	"testing"
 )
 
diff --git a/pkg/functions_test/functions_test.go b/pkg/functions_test/functions_test.go
index 5ece54ef..ce8dcb09 100644
--- a/pkg/functions_test/functions_test.go
+++ b/pkg/functions_test/functions_test.go
@@ -23,8 +23,8 @@ package functions_test
 import (
 	"bytes"
 	"fmt"
-	"github.com/ugol/jr/pkg/ctx"
-	"github.com/ugol/jr/pkg/functions"
+	"github.com/jrnd-io/jr/pkg/ctx"
+	"github.com/jrnd-io/jr/pkg/functions"
 	"testing"
 	"text/template"
 )
diff --git a/pkg/functions_test/regex_test.go b/pkg/functions_test/regex_test.go
index 4182a635..a79e1937 100644
--- a/pkg/functions_test/regex_test.go
+++ b/pkg/functions_test/regex_test.go
@@ -23,7 +23,7 @@
 package functions_test
 
 import (
-	"github.com/ugol/jr/pkg/functions"
+	"github.com/jrnd-io/jr/pkg/functions"
 	"regexp"
 	"testing"
 )
diff --git a/pkg/functions_test/templates_test.go b/pkg/functions_test/templates_test.go
index ae370eb2..e4d87272 100644
--- a/pkg/functions_test/templates_test.go
+++ b/pkg/functions_test/templates_test.go
@@ -26,7 +26,7 @@ import (
 	"testing"
 	"text/template"
 
-	"github.com/ugol/jr/pkg/functions"
+	"github.com/jrnd-io/jr/pkg/functions"
 )
 
 func TestSimpleContext(t *testing.T) {
diff --git a/pkg/producers/console/ConsoleProducer.go b/pkg/producers/console/ConsoleProducer.go
index 892d812d..79c0f10d 100644
--- a/pkg/producers/console/ConsoleProducer.go
+++ b/pkg/producers/console/ConsoleProducer.go
@@ -22,7 +22,7 @@ package console
 
 import (
 	"fmt"
-	"github.com/ugol/jr/pkg/tpl"
+	"github.com/jrnd-io/jr/pkg/tpl"
 )
 
 type ConsoleProducer struct {
diff --git a/pkg/producers/http/producer_test.go b/pkg/producers/http/producer_test.go
index ec374b33..7b3c1ea9 100644
--- a/pkg/producers/http/producer_test.go
+++ b/pkg/producers/http/producer_test.go
@@ -30,7 +30,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/jarcoal/httpmock"
-	phttp "github.com/ugol/jr/pkg/producers/http"
+	phttp "github.com/jrnd-io/jr/pkg/producers/http"
 )
 
 var defaultBody = []byte("{\"property\": \"value\"}")
diff --git a/pkg/producers/kafka/kafkaProducer.go b/pkg/producers/kafka/kafkaProducer.go
index 5a061f33..56484b70 100644
--- a/pkg/producers/kafka/kafkaProducer.go
+++ b/pkg/producers/kafka/kafkaProducer.go
@@ -44,7 +44,7 @@ import (
 	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde"
 	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde/avrov2"
 	"github.com/confluentinc/confluent-kafka-go/v2/schemaregistry/serde/jsonschema"
-	"github.com/ugol/jr/pkg/types"
+	"github.com/jrnd-io/jr/pkg/types"
 
 	"github.com/rs/zerolog/log"
 )
diff --git a/pkg/producers/server/JsonProducer.go b/pkg/producers/server/JsonProducer.go
index 2064e39e..cf042f8d 100644
--- a/pkg/producers/server/JsonProducer.go
+++ b/pkg/producers/server/JsonProducer.go
@@ -23,8 +23,8 @@ package server
 import (
 	"net/http"
 
+	"github.com/jrnd-io/jr/pkg/tpl"
 	"github.com/rs/zerolog/log"
-	"github.com/ugol/jr/pkg/tpl"
 )
 
 type JsonProducer struct {
diff --git a/pkg/producers/test/TestProducer.go b/pkg/producers/test/TestProducer.go
index 2830aa04..55fc9713 100644
--- a/pkg/producers/test/TestProducer.go
+++ b/pkg/producers/test/TestProducer.go
@@ -23,8 +23,8 @@ package test
 import (
 	"bytes"
 
+	"github.com/jrnd-io/jr/pkg/tpl"
 	"github.com/rs/zerolog/log"
-	"github.com/ugol/jr/pkg/tpl"
 )
 
 type TestProducer struct {