diff --git a/Makefile b/Makefile
index cf8d289d..fe2d08a5 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ GOBUILD=CGO_ENABLED=0 installsuffix=cgo go build -trimpath
 TOOLS_MOD_DIR = ./internal/tools
 JAEGER_VERSION ?= 1.24.0
 
-DOCKER_REPO ?= ghcr.io/pavolloffay/jaeger-clickhouse
+DOCKER_REPO ?= ghcr.io/jaegertracing/jaeger-clickhouse
 DOCKER_TAG ?= latest
 
 .PHONY: build
@@ -28,7 +28,7 @@ run-hotrod:
 .PHONY: fmt
 fmt:
 	go fmt ./...
-	goimports -w  -local github.com/pavolloffay/jaeger-clickhouse ./
+	goimports -w  -local github.com/jaegertracing/jaeger-clickhouse ./
 
 .PHONY: lint
 lint:
diff --git a/cmd/jaeger-clickhouse/main.go b/cmd/jaeger-clickhouse/main.go
index 8c60b4da..27c6d2f9 100644
--- a/cmd/jaeger-clickhouse/main.go
+++ b/cmd/jaeger-clickhouse/main.go
@@ -16,7 +16,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"gopkg.in/yaml.v3"
 
-	"github.com/pavolloffay/jaeger-clickhouse/storage"
+	"github.com/jaegertracing/jaeger-clickhouse/storage"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
index 9caa356f..11f6f8d3 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/pavolloffay/jaeger-clickhouse
+module github.com/jaegertracing/jaeger-clickhouse
 
 go 1.16
 
diff --git a/guide-kubernetes.md b/guide-kubernetes.md
index 5eeac242..0a116dc3 100644
--- a/guide-kubernetes.md
+++ b/guide-kubernetes.md
@@ -64,7 +64,7 @@ spec:
   storage:
     type: grpc-plugin
     grpcPlugin:
-      image: ghcr.io/pavolloffay/jaeger-clickhouse:0.5.1
+      image: ghcr.io/jaegertracing/jaeger-clickhouse:0.7.0
     options:
       grpc-storage-plugin:
         binary: /plugin/jaeger-clickhouse
diff --git a/internal/tools/go.mod b/internal/tools/go.mod
index 06efeb1a..0356ffa8 100644
--- a/internal/tools/go.mod
+++ b/internal/tools/go.mod
@@ -1,4 +1,4 @@
-module github.com/pavolloffay/jaeger-clickhouse/internal/tools
+module github.com/jaegertracing/jaeger-clickhouse/internal/tools
 
 go 1.16
 
diff --git a/storage/clickhousespanstore/writer_test.go b/storage/clickhousespanstore/writer_test.go
index c4106e34..a73b7161 100644
--- a/storage/clickhousespanstore/writer_test.go
+++ b/storage/clickhousespanstore/writer_test.go
@@ -20,7 +20,7 @@ import (
 	"github.com/gogo/protobuf/proto"
 	"github.com/jaegertracing/jaeger/model"
 
-	"github.com/pavolloffay/jaeger-clickhouse/storage/clickhousespanstore/mocks"
+	"github.com/jaegertracing/jaeger-clickhouse/storage/clickhousespanstore/mocks"
 )
 
 const (
diff --git a/storage/config.go b/storage/config.go
index 9bbd8db2..946b6bd3 100644
--- a/storage/config.go
+++ b/storage/config.go
@@ -3,7 +3,7 @@ package storage
 import (
 	"time"
 
-	"github.com/pavolloffay/jaeger-clickhouse/storage/clickhousespanstore"
+	"github.com/jaegertracing/jaeger-clickhouse/storage/clickhousespanstore"
 )
 
 type EncodingType string
diff --git a/storage/config_test.go b/storage/config_test.go
index b2f017fd..dbfc0753 100644
--- a/storage/config_test.go
+++ b/storage/config_test.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/pavolloffay/jaeger-clickhouse/storage/clickhousespanstore"
+	"github.com/jaegertracing/jaeger-clickhouse/storage/clickhousespanstore"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/storage/store.go b/storage/store.go
index 1a8bf016..f546f89a 100644
--- a/storage/store.go
+++ b/storage/store.go
@@ -12,7 +12,7 @@ import (
 	"path/filepath"
 	"sort"
 
-	jaegerclickhouse "github.com/pavolloffay/jaeger-clickhouse"
+	jaegerclickhouse "github.com/jaegertracing/jaeger-clickhouse"
 
 	"github.com/ClickHouse/clickhouse-go"
 	"github.com/hashicorp/go-hclog"
@@ -20,8 +20,8 @@ import (
 	"github.com/jaegertracing/jaeger/storage/dependencystore"
 	"github.com/jaegertracing/jaeger/storage/spanstore"
 
-	"github.com/pavolloffay/jaeger-clickhouse/storage/clickhousedependencystore"
-	"github.com/pavolloffay/jaeger-clickhouse/storage/clickhousespanstore"
+	"github.com/jaegertracing/jaeger-clickhouse/storage/clickhousedependencystore"
+	"github.com/jaegertracing/jaeger-clickhouse/storage/clickhousespanstore"
 )
 
 type Store struct {