diff --git a/database/mysql.go b/database/mysql.go
index 96882b1e..f721d2c3 100644
--- a/database/mysql.go
+++ b/database/mysql.go
@@ -2,7 +2,8 @@ package database
 
 import (
 	"database/sql"
-	"github.com/castawaylabs/semaphore/util"
+
+	"github.com/ansible-semaphore/semaphore/util"
 	_ "github.com/go-sql-driver/mysql" // imports mysql driver
 	"gopkg.in/gorp.v1"
 )
diff --git a/database/redis.go b/database/redis.go
index ce6d86d7..e03a0b1f 100644
--- a/database/redis.go
+++ b/database/redis.go
@@ -2,9 +2,10 @@ package database
 
 import (
 	"fmt"
-	"github.com/castawaylabs/semaphore/util"
-	"gopkg.in/redis.v3"
 	"time"
+
+	"github.com/ansible-semaphore/semaphore/util"
+	"gopkg.in/redis.v3"
 )
 
 // Redis pool
diff --git a/main.go b/main.go
index e20dd8fc..8c33c326 100644
--- a/main.go
+++ b/main.go
@@ -2,11 +2,12 @@ package main
 
 import (
 	"fmt"
+
+	"github.com/ansible-semaphore/semaphore/database"
+	"github.com/ansible-semaphore/semaphore/migration"
+	"github.com/ansible-semaphore/semaphore/routes"
+	"github.com/ansible-semaphore/semaphore/util"
 	"github.com/bugsnag/bugsnag-go"
-	"github.com/castawaylabs/semaphore/database"
-	"github.com/castawaylabs/semaphore/migration"
-	"github.com/castawaylabs/semaphore/routes"
-	"github.com/castawaylabs/semaphore/util"
 	"github.com/gin-gonic/gin"
 )
 
diff --git a/migration/migrations.go b/migration/migrations.go
index 7211db5b..93dc6062 100644
--- a/migration/migrations.go
+++ b/migration/migrations.go
@@ -2,10 +2,11 @@ package migration
 
 import (
 	"fmt"
-	"github.com/castawaylabs/semaphore/database"
-	"github.com/castawaylabs/semaphore/util"
-	"github.com/go-sql-driver/mysql"
 	"time"
+
+	"github.com/ansible-semaphore/semaphore/database"
+	"github.com/ansible-semaphore/semaphore/util"
+	"github.com/go-sql-driver/mysql"
 )
 
 func (version *DBVersion) CheckExists() (bool, error) {
diff --git a/migration/versionHistory.go b/migration/versionHistory.go
index 608df4c4..54b5036c 100644
--- a/migration/versionHistory.go
+++ b/migration/versionHistory.go
@@ -2,9 +2,10 @@ package migration
 
 import (
 	"fmt"
-	"github.com/castawaylabs/semaphore/util"
 	"strings"
 	"time"
+
+	"github.com/ansible-semaphore/semaphore/util"
 )
 
 type DBVersion struct {
diff --git a/playbooks/playbook.yml b/playbooks/playbook.yml
index 2078ae02..f5a764ec 100644
--- a/playbooks/playbook.yml
+++ b/playbooks/playbook.yml
@@ -25,7 +25,7 @@
             - bower
 
       # source is copied using ansible.
-      #- git: repo=https://github.com/CastawayLabs/semaphore dest={{ homedir }}
+      #- git: repo=https://github.com/ansible-semaphore/semaphore dest={{ homedir }}
       - file: src=/usr/bin/nodejs dest=/usr/bin/node state=link
       - shell: bower install --allow-root && npm install > {{ homedir }}/somelog.txt
         args:
diff --git a/routes/auth.go b/routes/auth.go
index f3705dc8..9ebb37df 100644
--- a/routes/auth.go
+++ b/routes/auth.go
@@ -4,15 +4,16 @@ import (
 	"crypto/rand"
 	"encoding/base64"
 	"fmt"
-	"github.com/castawaylabs/semaphore/database"
-	"github.com/castawaylabs/semaphore/models"
-	"github.com/castawaylabs/semaphore/util"
-	"github.com/gin-gonic/gin"
-	"gopkg.in/redis.v3"
 	"io"
 	"net/http"
 	"net/url"
 	"time"
+
+	"github.com/ansible-semaphore/semaphore/database"
+	"github.com/ansible-semaphore/semaphore/models"
+	"github.com/ansible-semaphore/semaphore/util"
+	"github.com/gin-gonic/gin"
+	"gopkg.in/redis.v3"
 )
 
 func resetSessionExpiry(sessionID string) {
diff --git a/routes/main.go b/routes/main.go
index db24fa90..64e67e5c 100644
--- a/routes/main.go
+++ b/routes/main.go
@@ -1,9 +1,10 @@
 package routes
 
 import (
-	"github.com/castawaylabs/semaphore/util"
-	"github.com/gin-gonic/gin"
 	"strings"
+
+	"github.com/ansible-semaphore/semaphore/util"
+	"github.com/gin-gonic/gin"
 )
 
 // Declare all routes
diff --git a/util/config.go b/util/config.go
index 6cff54c7..1143f960 100644
--- a/util/config.go
+++ b/util/config.go
@@ -4,10 +4,11 @@ import (
 	"encoding/json"
 	"flag"
 	"fmt"
+	"os"
+
 	"github.com/bugsnag/bugsnag-go"
 	"github.com/gin-gonic/gin"
 	"github.com/mattbaird/gochimp"
-	"os"
 )
 
 var mandrillAPI *gochimp.MandrillAPI
@@ -93,7 +94,7 @@ func init() {
 		ReleaseStage:        stage,
 		NotifyReleaseStages: []string{"production"},
 		AppVersion:          Version,
-		ProjectPackages:     []string{"github.com/castawaylabs/semaphore/**"},
+		ProjectPackages:     []string{"github.com/ansible-semaphore/semaphore/**"},
 	})
 }