diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index e28402c..a050bc2 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -2,13 +2,13 @@ name: CI
 on:
   push:
     branches:
-      - master
+      - main
     tags:
       - '*.*.*' # semver, will override latest
       - '*-preview' # preview, won't override latest
   pull_request:
     branches:
-      - master
+      - main
   workflow_dispatch: # Allow manual trigger
 
 jobs:
@@ -118,11 +118,13 @@ jobs:
       - name: Docker login
         uses: docker/login-action@v3
         with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GH_TOKEN }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
         with:
@@ -132,8 +134,7 @@ jobs:
         run: make VERSION=${{ steps.extract_ref.outputs.GIT_REF }} deploy-docker
 
       - name: Deploy on GitHub releases
-        uses: softprops/action-gh-release@v1
+        uses: softprops/action-gh-release@v2
         with:
           files: build/smocker.tar.gz
-        env:
-          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          token: ${{ secrets.GH_TOKEN }}
diff --git a/.gitignore b/.gitignore
index 5bf8af4..fe121a1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,5 +7,4 @@ node_modules/
 sessions/
 smocker
 smocker.test
-vendor/
 yarn-error.log
diff --git a/Dockerfile b/Dockerfile
index 1fafbb5..38ee85e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,9 @@
-FROM golang:1.18-alpine AS build-backend
+ARG GO_VERSION=1.22
+FROM golang:${GO_VERSION}-alpine AS build-backend
 RUN apk add --no-cache make
 ARG VERSION=snapshot
 ARG COMMIT
-WORKDIR /go/src/github.com/Thiht/smocker
+WORKDIR /go/src/smocker
 COPY go.mod go.sum ./
 RUN go mod download
 COPY Makefile main.go ./
@@ -13,5 +14,5 @@ FROM alpine
 WORKDIR /opt
 EXPOSE 8080 8081
 COPY build/client client/
-COPY --from=build-backend /go/src/github.com/Thiht/smocker/build/* /opt/
+COPY --from=build-backend /go/src/smocker/build/* /opt/
 CMD ["/opt/smocker"]
diff --git a/Makefile b/Makefile
index c82d4c4..3b2a60a 100644
--- a/Makefile
+++ b/Makefile
@@ -15,8 +15,7 @@ ifeq ($(RELEASE), 1)
 endif
 GO_LDFLAGS:=-ldflags="$(GO_LDFLAGS)"
 
-DOCKER_ACCOUNT?=thiht
-DOCKER_IMAGE=$(DOCKER_ACCOUNT)/$(APPNAME)
+DOCKER_IMAGE=ghcr.io/smocker-dev/smocker
 
 # See: https://docs.docker.com/engine/reference/commandline/tag/#extended-description
 # A tag name must be valid ASCII and may contain lowercase and uppercase letters, digits, underscores, periods and dashes.
@@ -63,7 +62,7 @@ start: $(REFLEX)
 
 .PHONY: build
 build:
-	go build $(GO_LDFLAGS) -o ./build/$(APPNAME)
+	go build -trimpath $(GO_LDFLAGS) -o ./build/$(APPNAME)
 
 .PHONY: lint
 lint: $(GOLANGCILINT)
diff --git a/README.md b/README.md
index 092ce27..6c627c0 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,11 @@
   <img src="./docs/logo-horizontal.png" alt="Smocker" height="100" title="Smocker logo by mandyellow" />
 </h1>
 
-[![CI](https://github.com/Thiht/smocker/actions/workflows/main.yml/badge.svg)](https://github.com/Thiht/smocker/actions/workflows/main.yml)
-[![Docker Repository](https://img.shields.io/badge/docker-thiht%2Fsmocker-blue?logo=docker)](https://hub.docker.com/r/thiht/smocker)
-[![Github Release](https://img.shields.io/github/v/release/Thiht/smocker.svg?logo=github)](https://github.com/Thiht/smocker/releases/latest)
-[![Go Report Card](https://goreportcard.com/badge/github.com/Thiht/smocker)](https://goreportcard.com/report/github.com/Thiht/smocker)
-[![License](https://img.shields.io/github/license/Thiht/smocker?logo=open-source-initiative)](https://github.com/Thiht/smocker/blob/master/LICENSE)
+[![CI](https://github.com/smocker-dev/smocker/actions/workflows/main.yml/badge.svg)](https://github.com/smocker-dev/smocker/actions/workflows/main.yml)
+<!-- TODO: replace with ghcr badge [![Docker Repository](https://img.shields.io/badge/docker-thiht%2Fsmocker-blue?logo=docker)](https://hub.docker.com/r/thiht/smocker) -->
+[![Github Release](https://img.shields.io/github/v/release/smocker-dev/smocker.svg?logo=github)](https://github.com/smocker-dev/smocker/releases/latest)
+[![Go Report Card](https://goreportcard.com/badge/github.com/smocker-dev/smocker)](https://goreportcard.com/report/github.com/smocker-dev/smocker)
+[![License](https://img.shields.io/github/license/smocker-dev/smocker?logo=open-source-initiative)](https://github.com/smocker-dev/smocker/blob/main/LICENSE)
 
 **Smocker** (server mock) is a simple and efficient HTTP mock server.
 
@@ -40,7 +40,7 @@ docker run -d \
   -p 8080:8080 \
   -p 8081:8081 \
   --name smocker \
-  thiht/smocker
+  ghcr.io/smocker-dev/smocker
 ```
 
 ### Manual Deployment
@@ -48,7 +48,7 @@ docker run -d \
 ```sh
 # This will be the deployment folder for the Smocker instance
 mkdir -p /opt/smocker && cd /opt/smocker
-wget -P /tmp https://github.com/Thiht/smocker/releases/latest/download/smocker.tar.gz
+wget -P /tmp https://github.com/smocker-dev/smocker/releases/latest/download/smocker.tar.gz
 tar xf /tmp/smocker.tar.gz
 nohup ./smocker -mock-server-listen-port=8080 -config-listen-port=8081 &
 ```
diff --git a/client/components/App.tsx b/client/components/App.tsx
index e937ac9..359abba 100644
--- a/client/components/App.tsx
+++ b/client/components/App.tsx
@@ -47,7 +47,7 @@ const App = () => (
               Smocker version {window.version} &ndash; MIT Licensed
               <br />
               <a
-                href="https://github.com/Thiht/smocker"
+                href="https://github.com/smocker-dev/smocker"
                 title="Smocker on GitHub"
                 target="_blank"
                 rel="noreferrer"
diff --git a/go.mod b/go.mod
index 2b73d9a..b3a3fad 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/Thiht/smocker
+module github.com/smocker-dev/smocker
 
 go 1.15
 
diff --git a/main.go b/main.go
index e834bf6..f8036ab 100644
--- a/main.go
+++ b/main.go
@@ -3,10 +3,10 @@ package main
 import (
 	"os"
 
-	"github.com/Thiht/smocker/server"
-	"github.com/Thiht/smocker/server/config"
 	"github.com/namsral/flag"
 	log "github.com/sirupsen/logrus"
+	"github.com/smocker-dev/smocker/server"
+	"github.com/smocker-dev/smocker/server/config"
 )
 
 var appName, buildVersion, buildCommit, buildDate string // nolint
diff --git a/server/admin_server.go b/server/admin_server.go
index 0123849..8789195 100644
--- a/server/admin_server.go
+++ b/server/admin_server.go
@@ -7,13 +7,13 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/Thiht/smocker/server/config"
-	"github.com/Thiht/smocker/server/handlers"
-	"github.com/Thiht/smocker/server/services"
 	"github.com/facebookgo/grace/gracehttp"
 	"github.com/labstack/echo/v4"
 	"github.com/labstack/echo/v4/middleware"
 	log "github.com/sirupsen/logrus"
+	"github.com/smocker-dev/smocker/server/config"
+	"github.com/smocker-dev/smocker/server/handlers"
+	"github.com/smocker-dev/smocker/server/services"
 )
 
 // TemplateRenderer is a custom html/template renderer for Echo framework
diff --git a/server/handlers/admin.go b/server/handlers/admin.go
index 6807e6e..3ad3cdc 100644
--- a/server/handlers/admin.go
+++ b/server/handlers/admin.go
@@ -4,10 +4,10 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/Thiht/smocker/server/services"
-	"github.com/Thiht/smocker/server/types"
 	"github.com/labstack/echo/v4"
 	log "github.com/sirupsen/logrus"
+	"github.com/smocker-dev/smocker/server/services"
+	"github.com/smocker-dev/smocker/server/types"
 )
 
 type Admin struct {
diff --git a/server/handlers/mocks.go b/server/handlers/mocks.go
index 6034967..b8f1b0f 100644
--- a/server/handlers/mocks.go
+++ b/server/handlers/mocks.go
@@ -7,11 +7,11 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Thiht/smocker/server/services"
-	"github.com/Thiht/smocker/server/templates"
-	"github.com/Thiht/smocker/server/types"
 	"github.com/labstack/echo/v4"
 	log "github.com/sirupsen/logrus"
+	"github.com/smocker-dev/smocker/server/services"
+	"github.com/smocker-dev/smocker/server/templates"
+	"github.com/smocker-dev/smocker/server/types"
 	"gopkg.in/yaml.v3"
 )
 
diff --git a/server/middlewares.go b/server/middlewares.go
index af744ee..0675b95 100644
--- a/server/middlewares.go
+++ b/server/middlewares.go
@@ -12,10 +12,10 @@ import (
 	"runtime"
 	"time"
 
-	"github.com/Thiht/smocker/server/services"
-	"github.com/Thiht/smocker/server/types"
 	"github.com/labstack/echo/v4"
 	log "github.com/sirupsen/logrus"
+	"github.com/smocker-dev/smocker/server/services"
+	"github.com/smocker-dev/smocker/server/types"
 )
 
 type bodyDumpResponseWriter struct {
diff --git a/server/mock_server.go b/server/mock_server.go
index f3878aa..b71ecc8 100644
--- a/server/mock_server.go
+++ b/server/mock_server.go
@@ -4,11 +4,11 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/Thiht/smocker/server/config"
-	"github.com/Thiht/smocker/server/handlers"
-	"github.com/Thiht/smocker/server/services"
 	"github.com/labstack/echo/v4"
 	log "github.com/sirupsen/logrus"
+	"github.com/smocker-dev/smocker/server/config"
+	"github.com/smocker-dev/smocker/server/handlers"
+	"github.com/smocker-dev/smocker/server/services"
 )
 
 func NewMockServer(cfg config.Config) (*http.Server, services.Mocks) {
diff --git a/server/services/graphs.go b/server/services/graphs.go
index 8e6868d..3362226 100644
--- a/server/services/graphs.go
+++ b/server/services/graphs.go
@@ -6,7 +6,7 @@ import (
 	"sort"
 	"time"
 
-	"github.com/Thiht/smocker/server/types"
+	"github.com/smocker-dev/smocker/server/types"
 )
 
 const (
diff --git a/server/services/mocks.go b/server/services/mocks.go
index 00436d2..dcaf859 100644
--- a/server/services/mocks.go
+++ b/server/services/mocks.go
@@ -7,7 +7,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Thiht/smocker/server/types"
+	"github.com/smocker-dev/smocker/server/types"
 	"github.com/teris-io/shortid"
 )
 
diff --git a/server/services/persistence.go b/server/services/persistence.go
index e583c8b..ddd6237 100644
--- a/server/services/persistence.go
+++ b/server/services/persistence.go
@@ -6,8 +6,8 @@ import (
 	"path/filepath"
 	"sync"
 
-	"github.com/Thiht/smocker/server/types"
 	log "github.com/sirupsen/logrus"
+	"github.com/smocker-dev/smocker/server/types"
 	"golang.org/x/sync/errgroup"
 	"gopkg.in/yaml.v3"
 )
diff --git a/server/templates/go_template.go b/server/templates/go_template.go
index 4fa2741..f680743 100644
--- a/server/templates/go_template.go
+++ b/server/templates/go_template.go
@@ -7,8 +7,8 @@ import (
 	"text/template"
 
 	"github.com/Masterminds/sprig/v3"
-	"github.com/Thiht/smocker/server/types"
 	log "github.com/sirupsen/logrus"
+	"github.com/smocker-dev/smocker/server/types"
 	"gopkg.in/yaml.v3"
 )
 
diff --git a/server/templates/interface.go b/server/templates/interface.go
index f652ec8..a2e929c 100644
--- a/server/templates/interface.go
+++ b/server/templates/interface.go
@@ -3,7 +3,7 @@ package templates
 import (
 	"fmt"
 
-	"github.com/Thiht/smocker/server/types"
+	"github.com/smocker-dev/smocker/server/types"
 )
 
 type TemplateEngine interface {
diff --git a/server/templates/lua.go b/server/templates/lua.go
index c9c0c33..1fe3210 100644
--- a/server/templates/lua.go
+++ b/server/templates/lua.go
@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/Thiht/smocker/server/types"
 	goJson "github.com/layeh/gopher-json"
 	log "github.com/sirupsen/logrus"
+	"github.com/smocker-dev/smocker/server/types"
 	"github.com/yuin/gluamapper"
 	lua "github.com/yuin/gopher-lua"
 	luar "layeh.com/gopher-luar"
diff --git a/sonar-project.properties b/sonar-project.properties
index fe3e88f..8d26ab0 100644
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -1,4 +1,4 @@
-sonar.organization=thiht
+sonar.organization=smocker
 sonar.projectKey=Thiht_smocker
 sonar.projectName=Smocker