diff --git a/README.md b/README.md
index 1a694d3..b0cfa6d 100644
--- a/README.md
+++ b/README.md
@@ -19,13 +19,13 @@ for the signing operations. The instructions below have been tested on Debian
 2. Clone the repository
 
     ```
-    git clone https://git.dittberner.info/jan/browser_csr_generation.git
+    git clone https://code.cacert.org/jandd/poc-browser-csr-generation.git
     ```
 
 3. Get dependencies and build assets
 
     ```
-    cd browser_csr_generation
+    cd poc-browser-csr-generation
     npm install --user gulp-cli
     npm install
     ./node_modules/.bin/gulp
diff --git a/cmd/goose/main.go b/cmd/goose/main.go
index 67d49df..b106f98 100644
--- a/cmd/goose/main.go
+++ b/cmd/goose/main.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-	_ "git.dittberner.info/jan/browser_csr_generation/migrations"
+	_ "code.cacert.org/jandd/poc-browser-csr-generation/migrations"
 )
 
 func main() {
diff --git a/go.mod b/go.mod
index 0ff33f2..1b3cb43 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module git.dittberner.info/jan/browser_csr_generation
+module code.cacert.org/jandd/poc-browser-csr-generation
 
 go 1.13
 
diff --git a/main.go b/main.go
index ddb955c..d048c0e 100644
--- a/main.go
+++ b/main.go
@@ -22,7 +22,7 @@ import (
 	log "github.com/sirupsen/logrus"
 	"golang.org/x/text/language"
 
-	"git.dittberner.info/jan/browser_csr_generation/handlers"
+	"code.cacert.org/jandd/poc-browser-csr-generation/handlers"
 )
 
 func main() {
diff --git a/package.json b/package.json
index ed07804..b3705ff 100644
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
   "description": "Browser based CSR and PKCS#12 generation in JavaScript",
   "repository": {
     "type": "git",
-    "url": "https://git.dittberner.info/jan/browser_csr_generation.git"
+    "url": "https://code.cacert.org/jandd/poc-browser-csr-generation.git"
   },
   "keywords": [
     "pkcs10",