diff --git a/Makefile b/Makefile
index 6b1009cc5..17c23e5ce 100644
--- a/Makefile
+++ b/Makefile
@@ -25,11 +25,11 @@ run: build
 
 docker-dep:
 # todo: need to create a dep tool image for this (or just ditch this)
-	docker run --rm -it -v ${CURDIR}:/go/src/gitlab.oracledx.com/odx/functions -w /go/src/gitlab.oracledx.com/odx/functions treeder/glide install -v
+	docker run --rm -it -v ${CURDIR}:/go/src/gitlab-odx.oracle.com/odx/functions -w /go/src/gitlab-odx.oracle.com/odx/functions treeder/glide install -v
 
 docker-build:
 	docker pull funcy/go:dev
-	docker run --rm -v ${CURDIR}:/go/src/gitlab.oracledx.com/odx/functions -w /go/src/gitlab.oracledx.com/odx/functions funcy/go:dev go build -o functions-alpine
+	docker run --rm -v ${CURDIR}:/go/src/gitlab-odx.oracle.com/odx/functions -w /go/src/gitlab-odx.oracle.com/odx/functions funcy/go:dev go build -o functions-alpine
 	docker build --build-arg HTTP_PROXY -t treeder/functions:latest .
 
 docker-run: docker-build
@@ -38,9 +38,9 @@ docker-run: docker-build
 docker-test:
 	docker run -ti --privileged --rm -e LOG_LEVEL=debug \
 	-v /var/run/docker.sock:/var/run/docker.sock \
-	-v ${CURDIR}:/go/src/gitlab.oracledx.com/odx/functions \
-	-w /go/src/gitlab.oracledx.com/odx/functions \
+	-v ${CURDIR}:/go/src/gitlab-odx.oracle.com/odx/functions \
+	-w /go/src/gitlab-odx.oracle.com/odx/functions \
 	funcy/go:dev go test \
-	-v $(shell docker run -ti -v ${CURDIR}:/go/src/gitlab.oracledx.com/odx/functions -w /go/src/gitlab.oracledx.com/odx/functions -e GOPATH=/go golang:alpine sh -c 'go list ./... | grep -v vendor | grep -v examples | grep -v tool | grep -v fn | grep -v datastore')
+	-v $(shell docker run -ti -v ${CURDIR}:/go/src/gitlab-odx.oracle.com/odx/functions -w /go/src/gitlab-odx.oracle.com/odx/functions -e GOPATH=/go golang:alpine sh -c 'go list ./... | grep -v vendor | grep -v examples | grep -v tool | grep -v fn | grep -v datastore')
 
 all: dep build
diff --git a/README.md b/README.md
index e820707b0..532075b73 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ export API_URL=http://129.146.10.253:80
 
 Download the pre-built CLI binary:
 
-1. Visit: https://gitlab.oracledx.com/odx/functions/tree/master/fn/releases/download/0.3.2
+1. Visit: https://gitlab-odx.oracle.com/odx/functions/tree/master/fn/releases/download/0.3.2
 2. Download the CLI for your platform
 3. Put in /usr/local/bin
 4. chmod +x
@@ -139,7 +139,7 @@ you can update your code and run `fn deploy myapp` again.
 
 - TODO: Slack or Discord community
 - Learn how to [contribute](CONTRIBUTING.md)
-- See [milestones](https://gitlab.oracledx.com/odx/functions/milestones) for detailed issues
+- See [milestones](https://gitlab-odx.oracle.com/odx/functions/milestones) for detailed issues
 
 
 ## User Interface
diff --git a/api/datastore/bolt/bolt.go b/api/datastore/bolt/bolt.go
index 82c4c76e8..30c22d93e 100644
--- a/api/datastore/bolt/bolt.go
+++ b/api/datastore/bolt/bolt.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/boltdb/bolt"
-	"gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoreutil"
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoreutil"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 type BoltDatastore struct {
diff --git a/api/datastore/bolt/bolt_test.go b/api/datastore/bolt/bolt_test.go
index cabe3b89e..68eefbb57 100644
--- a/api/datastore/bolt/bolt_test.go
+++ b/api/datastore/bolt/bolt_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoretest"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoretest"
 )
 
 const tmpBolt = "/tmp/func_test_bolt.db"
diff --git a/api/datastore/datastore.go b/api/datastore/datastore.go
index 313d676c5..14ba576c6 100644
--- a/api/datastore/datastore.go
+++ b/api/datastore/datastore.go
@@ -5,11 +5,11 @@ import (
 	"net/url"
 
 	"github.com/Sirupsen/logrus"
-	"gitlab.oracledx.com/odx/functions/api/datastore/bolt"
-	"gitlab.oracledx.com/odx/functions/api/datastore/mysql"
-	"gitlab.oracledx.com/odx/functions/api/datastore/postgres"
-	"gitlab.oracledx.com/odx/functions/api/datastore/redis"
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/bolt"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/mysql"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/postgres"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/redis"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 func New(dbURL string) (models.Datastore, error) {
diff --git a/api/datastore/internal/datastoretest/test.go b/api/datastore/internal/datastoretest/test.go
index 37ff1f972..6d154ed7e 100644
--- a/api/datastore/internal/datastoretest/test.go
+++ b/api/datastore/internal/datastoretest/test.go
@@ -6,7 +6,7 @@ import (
 	"log"
 	"testing"
 
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 
 	"net/http"
 	"net/url"
diff --git a/api/datastore/internal/datastoreutil/validator.go b/api/datastore/internal/datastoreutil/validator.go
index 75633ce80..83b0757e3 100644
--- a/api/datastore/internal/datastoreutil/validator.go
+++ b/api/datastore/internal/datastoreutil/validator.go
@@ -3,7 +3,7 @@ package datastoreutil
 import (
 	"context"
 
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 // Datastore is a copy of models.Datastore, with additional comments on parameter guarantees.
diff --git a/api/datastore/mock.go b/api/datastore/mock.go
index b4abd608e..a5a7a8185 100644
--- a/api/datastore/mock.go
+++ b/api/datastore/mock.go
@@ -3,8 +3,8 @@ package datastore
 import (
 	"context"
 
-	"gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoreutil"
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoreutil"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 type mock struct {
diff --git a/api/datastore/mock_test.go b/api/datastore/mock_test.go
index 063bad739..f7f2ed266 100644
--- a/api/datastore/mock_test.go
+++ b/api/datastore/mock_test.go
@@ -3,7 +3,7 @@ package datastore
 import (
 	"testing"
 
-	"gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoretest"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoretest"
 )
 
 func TestDatastore(t *testing.T) {
diff --git a/api/datastore/mysql/mysql.go b/api/datastore/mysql/mysql.go
index 44b55c854..85c11a70d 100644
--- a/api/datastore/mysql/mysql.go
+++ b/api/datastore/mysql/mysql.go
@@ -11,8 +11,8 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/go-sql-driver/mysql"
 	_ "github.com/go-sql-driver/mysql"
-	"gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoreutil"
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoreutil"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 const routesTableCreate = `CREATE TABLE IF NOT EXISTS routes (
diff --git a/api/datastore/mysql/mysql_test.go b/api/datastore/mysql/mysql_test.go
index 33c3e1734..78d58b8eb 100644
--- a/api/datastore/mysql/mysql_test.go
+++ b/api/datastore/mysql/mysql_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoretest"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoretest"
 )
 
 const tmpMysql = "mysql://root:root@tcp(%v:3307)/funcs"
diff --git a/api/datastore/postgres/postgres.go b/api/datastore/postgres/postgres.go
index fb920b788..25d210b1c 100644
--- a/api/datastore/postgres/postgres.go
+++ b/api/datastore/postgres/postgres.go
@@ -10,8 +10,8 @@ import (
 
 	"bytes"
 	"github.com/Sirupsen/logrus"
-	"gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoreutil"
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoreutil"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 	"github.com/lib/pq"
 	_ "github.com/lib/pq"
 )
diff --git a/api/datastore/postgres/postgres_test.go b/api/datastore/postgres/postgres_test.go
index 34a4ea5b2..ea2589c1c 100644
--- a/api/datastore/postgres/postgres_test.go
+++ b/api/datastore/postgres/postgres_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoretest"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoretest"
 )
 
 const tmpPostgres = "postgres://postgres@%v:15432/funcs?sslmode=disable"
diff --git a/api/datastore/redis/redis.go b/api/datastore/redis/redis.go
index 3de6dce11..ff9f216d4 100644
--- a/api/datastore/redis/redis.go
+++ b/api/datastore/redis/redis.go
@@ -12,8 +12,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/garyburd/redigo/redis"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoreutil"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoreutil"
 )
 
 type RedisDataStore struct {
diff --git a/api/datastore/redis/redis_test.go b/api/datastore/redis/redis_test.go
index 540d1fb8b..4b78305fd 100644
--- a/api/datastore/redis/redis_test.go
+++ b/api/datastore/redis/redis_test.go
@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/garyburd/redigo/redis"
-	"gitlab.oracledx.com/odx/functions/api/datastore/internal/datastoretest"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore/internal/datastoretest"
 )
 
 const tmpRedis = "redis://%v:6301/"
diff --git a/api/mqs/bolt.go b/api/mqs/bolt.go
index e294865cd..b0be7860e 100644
--- a/api/mqs/bolt.go
+++ b/api/mqs/bolt.go
@@ -13,8 +13,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/boltdb/bolt"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
 )
 
 type BoltDbMQ struct {
diff --git a/api/mqs/ironmq.go b/api/mqs/ironmq.go
index 38f1cd4a1..ec360d7f8 100644
--- a/api/mqs/ironmq.go
+++ b/api/mqs/ironmq.go
@@ -12,7 +12,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	mq_config "github.com/iron-io/iron_go3/config"
 	ironmq "github.com/iron-io/iron_go3/mq"
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 type assoc struct {
diff --git a/api/mqs/memory.go b/api/mqs/memory.go
index fe9ce9e30..07e84d43d 100644
--- a/api/mqs/memory.go
+++ b/api/mqs/memory.go
@@ -9,8 +9,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/google/btree"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
 )
 
 type MemoryMQ struct {
diff --git a/api/mqs/mock.go b/api/mqs/mock.go
index 1157e5c73..f5393b1cc 100644
--- a/api/mqs/mock.go
+++ b/api/mqs/mock.go
@@ -3,7 +3,7 @@ package mqs
 import (
 	"context"
 
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 type Mock struct {
diff --git a/api/mqs/new.go b/api/mqs/new.go
index afd337045..f2cbc5e4a 100644
--- a/api/mqs/new.go
+++ b/api/mqs/new.go
@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"github.com/Sirupsen/logrus"
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 // New will parse the URL and return the correct MQ implementation.
diff --git a/api/mqs/redis.go b/api/mqs/redis.go
index 3706c0438..288f0bb9e 100644
--- a/api/mqs/redis.go
+++ b/api/mqs/redis.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/garyburd/redigo/redis"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
 )
 
 type RedisMQ struct {
diff --git a/api/runner/async_runner.go b/api/runner/async_runner.go
index b19ec4d6a..a8f0e08cb 100644
--- a/api/runner/async_runner.go
+++ b/api/runner/async_runner.go
@@ -13,9 +13,9 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
 )
 
 func getTask(ctx context.Context, url string) (*models.Task, error) {
diff --git a/api/runner/async_runner_test.go b/api/runner/async_runner_test.go
index d7554336a..0df988090 100644
--- a/api/runner/async_runner_test.go
+++ b/api/runner/async_runner_test.go
@@ -15,9 +15,9 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/mqs"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/mqs"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
 )
 
 func setLogBuffer() *bytes.Buffer {
diff --git a/api/runner/common/environment.go b/api/runner/common/environment.go
index bb84dca0c..0c5a939ee 100644
--- a/api/runner/common/environment.go
+++ b/api/runner/common/environment.go
@@ -1,7 +1,7 @@
 package common
 
 import (
-	"gitlab.oracledx.com/odx/functions/api/runner/common/stats"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common/stats"
 )
 
 // An Environment is a long lived object that carries around 'configuration'
diff --git a/api/runner/drivers/docker/docker.go b/api/runner/drivers/docker/docker.go
index 345229066..47dc540f9 100644
--- a/api/runner/drivers/docker/docker.go
+++ b/api/runner/drivers/docker/docker.go
@@ -18,9 +18,9 @@ import (
 	manifest "github.com/docker/distribution/manifest/schema1"
 	"github.com/fsouza/go-dockerclient"
 	"github.com/heroku/docker-registry-client/registry"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
-	"gitlab.oracledx.com/odx/functions/api/runner/common/stats"
-	"gitlab.oracledx.com/odx/functions/api/runner/drivers"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common/stats"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/drivers"
 )
 
 const hubURL = "https://registry.hub.docker.com"
diff --git a/api/runner/drivers/docker/docker_client.go b/api/runner/drivers/docker/docker_client.go
index a31a2dbcc..fad6371e4 100644
--- a/api/runner/drivers/docker/docker_client.go
+++ b/api/runner/drivers/docker/docker_client.go
@@ -14,7 +14,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/fsouza/go-dockerclient"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
 )
 
 const (
diff --git a/api/runner/drivers/docker/docker_test.go b/api/runner/drivers/docker/docker_test.go
index f358a5162..6e489b5cd 100644
--- a/api/runner/drivers/docker/docker_test.go
+++ b/api/runner/drivers/docker/docker_test.go
@@ -10,8 +10,8 @@ import (
 	"time"
 
 	"github.com/vrischmann/envconfig"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
-	"gitlab.oracledx.com/odx/functions/api/runner/drivers"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/drivers"
 )
 
 type taskDockerTest struct {
diff --git a/api/runner/drivers/mock/mocker.go b/api/runner/drivers/mock/mocker.go
index cfced992b..ab8766074 100644
--- a/api/runner/drivers/mock/mocker.go
+++ b/api/runner/drivers/mock/mocker.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"gitlab.oracledx.com/odx/functions/api/runner/drivers"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/drivers"
 )
 
 func New() drivers.Driver {
diff --git a/api/runner/func_logger.go b/api/runner/func_logger.go
index 77237a283..630b495a9 100644
--- a/api/runner/func_logger.go
+++ b/api/runner/func_logger.go
@@ -6,7 +6,7 @@ import (
 
 	"context"
 	"github.com/Sirupsen/logrus"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
 )
 
 type FuncLogger interface {
diff --git a/api/runner/metric_logger.go b/api/runner/metric_logger.go
index be67ad27b..a6ab4811c 100644
--- a/api/runner/metric_logger.go
+++ b/api/runner/metric_logger.go
@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
 )
 
 type MetricLogger interface {
diff --git a/api/runner/protocol/default.go b/api/runner/protocol/default.go
index fbb2f4b86..80bceaa53 100644
--- a/api/runner/protocol/default.go
+++ b/api/runner/protocol/default.go
@@ -3,7 +3,7 @@ package protocol
 import (
 	"context"
 
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
 )
 
 // DefaultProtocol is the protocol used by cold-containers
diff --git a/api/runner/protocol/factory.go b/api/runner/protocol/factory.go
index 29b2d4ac9..4b2ae9892 100644
--- a/api/runner/protocol/factory.go
+++ b/api/runner/protocol/factory.go
@@ -5,8 +5,8 @@ import (
 	"errors"
 	"io"
 
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
 )
 
 var errInvalidProtocol = errors.New("Invalid Protocol")
diff --git a/api/runner/protocol/http.go b/api/runner/protocol/http.go
index 7e9890d66..d938e3f25 100644
--- a/api/runner/protocol/http.go
+++ b/api/runner/protocol/http.go
@@ -10,8 +10,8 @@ import (
 	"net/http/httputil"
 	"time"
 
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
 )
 
 // HTTPProtocol converts stdin/stdout streams into HTTP/1.1 compliant
diff --git a/api/runner/runner.go b/api/runner/runner.go
index 0ddde9f28..440670f17 100644
--- a/api/runner/runner.go
+++ b/api/runner/runner.go
@@ -14,12 +14,12 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
-	"gitlab.oracledx.com/odx/functions/api/runner/drivers"
-	driverscommon "gitlab.oracledx.com/odx/functions/api/runner/drivers"
-	"gitlab.oracledx.com/odx/functions/api/runner/drivers/docker"
-	"gitlab.oracledx.com/odx/functions/api/runner/drivers/mock"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/drivers"
+	driverscommon "gitlab-odx.oracle.com/odx/functions/api/runner/drivers"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/drivers/docker"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/drivers/mock"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
 )
 
 type Runner struct {
diff --git a/api/runner/runner_test.go b/api/runner/runner_test.go
index d6843d30d..3df9f5d65 100644
--- a/api/runner/runner_test.go
+++ b/api/runner/runner_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 	"time"
 
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
 )
 
 func TestRunnerHello(t *testing.T) {
diff --git a/api/runner/task.go b/api/runner/task.go
index b8c4b59c0..c717fee8b 100644
--- a/api/runner/task.go
+++ b/api/runner/task.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/docker/cli/cli/config/configfile"
 	docker "github.com/fsouza/go-dockerclient"
-	"gitlab.oracledx.com/odx/functions/api/runner/drivers"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/drivers"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
 )
 
 var registries dockerRegistries
diff --git a/api/runner/task/task.go b/api/runner/task/task.go
index ecf73a77c..f3bfa2fb5 100644
--- a/api/runner/task/task.go
+++ b/api/runner/task/task.go
@@ -5,7 +5,7 @@ import (
 	"io"
 	"time"
 
-	"gitlab.oracledx.com/odx/functions/api/runner/drivers"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/drivers"
 )
 
 type Config struct {
diff --git a/api/runner/worker.go b/api/runner/worker.go
index f514794f2..d5b13edd6 100644
--- a/api/runner/worker.go
+++ b/api/runner/worker.go
@@ -9,9 +9,9 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"gitlab.oracledx.com/odx/functions/api/runner/drivers"
-	"gitlab.oracledx.com/odx/functions/api/runner/protocol"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/drivers"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/protocol"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
 )
 
 // hot functions - theory of operation
diff --git a/api/server/app_listeners.go b/api/server/app_listeners.go
index 75858e659..e6fa5c1d2 100644
--- a/api/server/app_listeners.go
+++ b/api/server/app_listeners.go
@@ -3,7 +3,7 @@ package server
 import (
 	"context"
 
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 type AppListener interface {
diff --git a/api/server/apps_create.go b/api/server/apps_create.go
index 43ff4282f..7d63fadf8 100644
--- a/api/server/apps_create.go
+++ b/api/server/apps_create.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
 )
 
 func (s *Server) handleAppCreate(c *gin.Context) {
diff --git a/api/server/apps_delete.go b/api/server/apps_delete.go
index 62e10e2f9..4d8129758 100644
--- a/api/server/apps_delete.go
+++ b/api/server/apps_delete.go
@@ -5,9 +5,9 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
 )
 
 func (s *Server) handleAppDelete(c *gin.Context) {
diff --git a/api/server/apps_get.go b/api/server/apps_get.go
index 454fed2e7..d0cc480b2 100644
--- a/api/server/apps_get.go
+++ b/api/server/apps_get.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api"
+	"gitlab-odx.oracle.com/odx/functions/api"
 )
 
 func (s *Server) handleAppGet(c *gin.Context) {
diff --git a/api/server/apps_list.go b/api/server/apps_list.go
index 2414db4bd..54ea3e1ab 100644
--- a/api/server/apps_list.go
+++ b/api/server/apps_list.go
@@ -5,7 +5,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 func (s *Server) handleAppList(c *gin.Context) {
diff --git a/api/server/apps_test.go b/api/server/apps_test.go
index 752208c26..ee0c70e58 100644
--- a/api/server/apps_test.go
+++ b/api/server/apps_test.go
@@ -9,10 +9,10 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api/datastore"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/mqs"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/mqs"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
 )
 
 func setLogBuffer() *bytes.Buffer {
diff --git a/api/server/apps_update.go b/api/server/apps_update.go
index c6fdd97b7..ebe551b65 100644
--- a/api/server/apps_update.go
+++ b/api/server/apps_update.go
@@ -5,9 +5,9 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
 )
 
 func (s *Server) handleAppUpdate(c *gin.Context) {
diff --git a/api/server/error_response.go b/api/server/error_response.go
index c4b25bf9a..4fd4fbc5e 100644
--- a/api/server/error_response.go
+++ b/api/server/error_response.go
@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
 	"net/http"
 )
 
diff --git a/api/server/extension_points.go b/api/server/extension_points.go
index 4099cbaef..ae10040c4 100644
--- a/api/server/extension_points.go
+++ b/api/server/extension_points.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api"
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 type ApiHandlerFunc func(w http.ResponseWriter, r *http.Request)
diff --git a/api/server/internal/routecache/lru.go b/api/server/internal/routecache/lru.go
index 82e1b5983..4b3905aea 100644
--- a/api/server/internal/routecache/lru.go
+++ b/api/server/internal/routecache/lru.go
@@ -8,7 +8,7 @@ package routecache
 import (
 	"container/list"
 
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 // Cache holds an internal linkedlist for hotness management. It is not safe
diff --git a/api/server/middleware.go b/api/server/middleware.go
index a88d63daf..b2e604670 100644
--- a/api/server/middleware.go
+++ b/api/server/middleware.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 // Middleware is the interface required for implementing functions middlewar
diff --git a/api/server/routes_create.go b/api/server/routes_create.go
index 7ac5ddac0..561cd6071 100644
--- a/api/server/routes_create.go
+++ b/api/server/routes_create.go
@@ -5,9 +5,9 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
 )
 
 func (s *Server) handleRouteCreate(c *gin.Context) {
diff --git a/api/server/routes_delete.go b/api/server/routes_delete.go
index 6539758c0..c6a46707c 100644
--- a/api/server/routes_delete.go
+++ b/api/server/routes_delete.go
@@ -6,7 +6,7 @@ import (
 	"path"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api"
+	"gitlab-odx.oracle.com/odx/functions/api"
 )
 
 func (s *Server) handleRouteDelete(c *gin.Context) {
diff --git a/api/server/routes_get.go b/api/server/routes_get.go
index cfef2b750..09eec93ef 100644
--- a/api/server/routes_get.go
+++ b/api/server/routes_get.go
@@ -6,7 +6,7 @@ import (
 	"path"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api"
+	"gitlab-odx.oracle.com/odx/functions/api"
 )
 
 func (s *Server) handleRouteGet(c *gin.Context) {
diff --git a/api/server/routes_list.go b/api/server/routes_list.go
index 5b2df03a2..3ea13f465 100644
--- a/api/server/routes_list.go
+++ b/api/server/routes_list.go
@@ -5,8 +5,8 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api"
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 func (s *Server) handleRouteList(c *gin.Context) {
diff --git a/api/server/routes_test.go b/api/server/routes_test.go
index 623901079..715ce7696 100644
--- a/api/server/routes_test.go
+++ b/api/server/routes_test.go
@@ -6,9 +6,9 @@ import (
 	"strings"
 	"testing"
 
-	"gitlab.oracledx.com/odx/functions/api/datastore"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/mqs"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/mqs"
 )
 
 func TestRouteCreate(t *testing.T) {
diff --git a/api/server/routes_update.go b/api/server/routes_update.go
index f8ccb547f..9142707f9 100644
--- a/api/server/routes_update.go
+++ b/api/server/routes_update.go
@@ -6,9 +6,9 @@ import (
 	"path"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
 )
 
 func (s *Server) handleRouteUpdate(c *gin.Context) {
diff --git a/api/server/runner.go b/api/server/runner.go
index ae794bea7..c7701a7fa 100644
--- a/api/server/runner.go
+++ b/api/server/runner.go
@@ -15,11 +15,11 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/gin-gonic/gin"
 	uuid "github.com/satori/go.uuid"
-	"gitlab.oracledx.com/odx/functions/api"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/runner"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/runner"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
 )
 
 type runnerResponse struct {
diff --git a/api/server/runner_async_test.go b/api/server/runner_async_test.go
index aea12267d..faa281bd0 100644
--- a/api/server/runner_async_test.go
+++ b/api/server/runner_async_test.go
@@ -9,12 +9,12 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api/datastore"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/mqs"
-	"gitlab.oracledx.com/odx/functions/api/runner"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
-	"gitlab.oracledx.com/odx/functions/api/server/internal/routecache"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/mqs"
+	"gitlab-odx.oracle.com/odx/functions/api/runner"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/server/internal/routecache"
 )
 
 func testRouterAsync(ds models.Datastore, mq models.MessageQueue, rnr *runner.Runner, tasks chan task.Request, enqueue models.Enqueue) *gin.Engine {
diff --git a/api/server/runner_listeners.go b/api/server/runner_listeners.go
index 798e1b0ed..d9e6a3abb 100644
--- a/api/server/runner_listeners.go
+++ b/api/server/runner_listeners.go
@@ -2,7 +2,7 @@ package server
 
 import (
 	"context"
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 type RunnerListener interface {
diff --git a/api/server/runner_test.go b/api/server/runner_test.go
index 661e84caa..a5a62da18 100644
--- a/api/server/runner_test.go
+++ b/api/server/runner_test.go
@@ -7,11 +7,11 @@ import (
 	"strings"
 	"testing"
 
-	"gitlab.oracledx.com/odx/functions/api/datastore"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/mqs"
-	"gitlab.oracledx.com/odx/functions/api/runner"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/mqs"
+	"gitlab-odx.oracle.com/odx/functions/api/runner"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
 )
 
 func testRunner(t *testing.T) (*runner.Runner, context.CancelFunc) {
diff --git a/api/server/server.go b/api/server/server.go
index 73002ee95..00380de16 100644
--- a/api/server/server.go
+++ b/api/server/server.go
@@ -15,14 +15,14 @@ import (
 	"github.com/ccirello/supervisor"
 	"github.com/gin-gonic/gin"
 	"github.com/spf13/viper"
-	"gitlab.oracledx.com/odx/functions/api"
-	"gitlab.oracledx.com/odx/functions/api/datastore"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/mqs"
-	"gitlab.oracledx.com/odx/functions/api/runner"
-	"gitlab.oracledx.com/odx/functions/api/runner/common"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
-	"gitlab.oracledx.com/odx/functions/api/server/internal/routecache"
+	"gitlab-odx.oracle.com/odx/functions/api"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/mqs"
+	"gitlab-odx.oracle.com/odx/functions/api/runner"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/common"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/server/internal/routecache"
 )
 
 const (
diff --git a/api/server/server_test.go b/api/server/server_test.go
index 7c7d1da66..a45520286 100644
--- a/api/server/server_test.go
+++ b/api/server/server_test.go
@@ -12,12 +12,12 @@ import (
 	"testing"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api/datastore"
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/mqs"
-	"gitlab.oracledx.com/odx/functions/api/runner"
-	"gitlab.oracledx.com/odx/functions/api/runner/task"
-	"gitlab.oracledx.com/odx/functions/api/server/internal/routecache"
+	"gitlab-odx.oracle.com/odx/functions/api/datastore"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/mqs"
+	"gitlab-odx.oracle.com/odx/functions/api/runner"
+	"gitlab-odx.oracle.com/odx/functions/api/runner/task"
+	"gitlab-odx.oracle.com/odx/functions/api/server/internal/routecache"
 )
 
 var tmpBolt = "/tmp/func_test_bolt.db"
diff --git a/api/server/singleflight.go b/api/server/singleflight.go
index cd5184e67..1d1923fda 100644
--- a/api/server/singleflight.go
+++ b/api/server/singleflight.go
@@ -5,7 +5,7 @@ package server
 import (
 	"sync"
 
-	"gitlab.oracledx.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
 )
 
 // call is an in-flight or completed do call
diff --git a/api/server/version.go b/api/server/version.go
index 8e8d85107..104192399 100644
--- a/api/server/version.go
+++ b/api/server/version.go
@@ -4,7 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-	"gitlab.oracledx.com/odx/functions/api/version"
+	"gitlab-odx.oracle.com/odx/functions/api/version"
 )
 
 func handleVersion(c *gin.Context) {
diff --git a/examples/blog/database/post.go b/examples/blog/database/post.go
index 3b624431d..9737d05f9 100644
--- a/examples/blog/database/post.go
+++ b/examples/blog/database/post.go
@@ -3,7 +3,7 @@ package database
 import (
 	"errors"
 
-	"gitlab.oracledx.com/odx/functions/examples/blog/models"
+	"gitlab-odx.oracle.com/odx/functions/examples/blog/models"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 )
diff --git a/examples/blog/database/user.go b/examples/blog/database/user.go
index e2f35e1a2..325e80dcf 100644
--- a/examples/blog/database/user.go
+++ b/examples/blog/database/user.go
@@ -1,7 +1,7 @@
 package database
 
 import (
-	"gitlab.oracledx.com/odx/functions/examples/blog/models"
+	"gitlab-odx.oracle.com/odx/functions/examples/blog/models"
 	"gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"
 )
diff --git a/examples/blog/function.go b/examples/blog/function.go
index 1860a9402..4d9d98a40 100644
--- a/examples/blog/function.go
+++ b/examples/blog/function.go
@@ -5,9 +5,9 @@ import (
 	"fmt"
 	"os"
 
-	"gitlab.oracledx.com/odx/functions/examples/blog/database"
-	"gitlab.oracledx.com/odx/functions/examples/blog/models"
-	"gitlab.oracledx.com/odx/functions/examples/blog/routes"
+	"gitlab-odx.oracle.com/odx/functions/examples/blog/database"
+	"gitlab-odx.oracle.com/odx/functions/examples/blog/models"
+	"gitlab-odx.oracle.com/odx/functions/examples/blog/routes"
 )
 
 var noAuth = map[string]interface{}{}
diff --git a/examples/blog/routes/post_create.go b/examples/blog/routes/post_create.go
index b47b92be4..a406d6467 100644
--- a/examples/blog/routes/post_create.go
+++ b/examples/blog/routes/post_create.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"os"
 
-	"gitlab.oracledx.com/odx/functions/examples/blog/database"
-	"gitlab.oracledx.com/odx/functions/examples/blog/models"
+	"gitlab-odx.oracle.com/odx/functions/examples/blog/database"
+	"gitlab-odx.oracle.com/odx/functions/examples/blog/models"
 )
 
 func HandlePostCreate(db *database.Database, auth map[string]interface{}) {
diff --git a/examples/blog/routes/post_list.go b/examples/blog/routes/post_list.go
index 35873767a..6cb627137 100644
--- a/examples/blog/routes/post_list.go
+++ b/examples/blog/routes/post_list.go
@@ -1,7 +1,7 @@
 package route
 
 import (
-	"gitlab.oracledx.com/odx/functions/examples/blog/database"
+	"gitlab-odx.oracle.com/odx/functions/examples/blog/database"
 	"gopkg.in/mgo.v2/bson"
 )
 
diff --git a/examples/blog/routes/post_read.go b/examples/blog/routes/post_read.go
index 0836e97c8..410d75535 100644
--- a/examples/blog/routes/post_read.go
+++ b/examples/blog/routes/post_read.go
@@ -3,7 +3,7 @@ package route
 import (
 	"os"
 
-	"gitlab.oracledx.com/odx/functions/examples/blog/database"
+	"gitlab-odx.oracle.com/odx/functions/examples/blog/database"
 )
 
 func HandlePostRead(db *database.Database, auth map[string]interface{}) {
diff --git a/examples/blog/routes/server.go b/examples/blog/routes/server.go
index 9782764dc..b4bf9b6da 100644
--- a/examples/blog/routes/server.go
+++ b/examples/blog/routes/server.go
@@ -8,8 +8,8 @@ import (
 	"time"
 
 	"github.com/dgrijalva/jwt-go"
-	"gitlab.oracledx.com/odx/functions/examples/blog/database"
-	"gitlab.oracledx.com/odx/functions/examples/blog/models"
+	"gitlab-odx.oracle.com/odx/functions/examples/blog/database"
+	"gitlab-odx.oracle.com/odx/functions/examples/blog/models"
 	"golang.org/x/crypto/bcrypt"
 )
 
diff --git a/examples/extensions/main.go b/examples/extensions/main.go
index c08c3ff8a..14ac2d1a6 100644
--- a/examples/extensions/main.go
+++ b/examples/extensions/main.go
@@ -6,8 +6,8 @@ import (
 	"html"
 	"net/http"
 
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/server"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/server"
 )
 
 func main() {
diff --git a/examples/middleware/main.go b/examples/middleware/main.go
index 3852077b3..6e4da706a 100644
--- a/examples/middleware/main.go
+++ b/examples/middleware/main.go
@@ -9,8 +9,8 @@ import (
 	"strings"
 	"time"
 
-	"gitlab.oracledx.com/odx/functions/api/models"
-	"gitlab.oracledx.com/odx/functions/api/server"
+	"gitlab-odx.oracle.com/odx/functions/api/models"
+	"gitlab-odx.oracle.com/odx/functions/api/server"
 )
 
 func main() {
diff --git a/fn/Gopkg.lock b/fn/Gopkg.lock
index 207c0e8b8..05244e869 100644
--- a/fn/Gopkg.lock
+++ b/fn/Gopkg.lock
@@ -181,7 +181,7 @@ memo = "9e1d9db05f14e4fcb5786440592f93e0baab3f6b9ef00fc46cb39da2dd0d5fce"
   version = "v1.19.1"
 
 [[projects]]
-  name = "gitlab.oracledx.com/odx/functions"
+  name = "gitlab-odx.oracle.com/odx/functions"
   packages = ["api/version"]
   revision = "37b53a5820fd2f10a1afa3b04e2423408828afb5"
   version = "0.3.7"
diff --git a/fn/common.go b/fn/common.go
index f76c27435..d9f8d92e9 100644
--- a/fn/common.go
+++ b/fn/common.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"text/template"
 
-	"gitlab.oracledx.com/odx/functions/fn/langs"
+	"gitlab-odx.oracle.com/odx/functions/fn/langs"
 )
 
 const (
diff --git a/fn/init.go b/fn/init.go
index 18142a58b..a5f36721f 100644
--- a/fn/init.go
+++ b/fn/init.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 
 	"github.com/urfave/cli"
-	"gitlab.oracledx.com/odx/functions/fn/langs"
+	"gitlab-odx.oracle.com/odx/functions/fn/langs"
 )
 
 var (
diff --git a/fn/main.go b/fn/main.go
index a2821c75d..69f31b774 100644
--- a/fn/main.go
+++ b/fn/main.go
@@ -9,7 +9,7 @@ import (
 
 	functions "github.com/iron-io/functions_go"
 	"github.com/urfave/cli"
-	vers "gitlab.oracledx.com/odx/functions/api/version"
+	vers "gitlab-odx.oracle.com/odx/functions/api/version"
 )
 
 var aliases = map[string]cli.Command{
@@ -37,7 +37,7 @@ func newFn() *cli.App {
 	app.Version = vers.Version
 	app.Authors = []cli.Author{{Name: "Oracle Corporation"}}
 	app.Description = "Oracle Functions command line tools"
-	app.UsageText = `Check the manual at https://gitlab.oracledx.com/odx/functions/blob/master/fn/README.md`
+	app.UsageText = `Check the manual at https://gitlab-odx.oracle.com/odx/functions/blob/master/fn/README.md`
 
 	cli.AppHelpTemplate = `{{.Name}} {{.Version}}{{if .Description}}
 
diff --git a/fn/release.sh b/fn/release.sh
index 215f7cd03..66c6a50c8 100755
--- a/fn/release.sh
+++ b/fn/release.sh
@@ -2,9 +2,9 @@
 
 set -ex
 
-cd lambda
-./release.sh
-cd ..
+#cd lambda
+#./release.sh
+#cd ..
 
 make dep
 make release
diff --git a/fn/version.go b/fn/version.go
index ec4e01ada..a5982694b 100644
--- a/fn/version.go
+++ b/fn/version.go
@@ -5,7 +5,7 @@ import (
 	"net/url"
 	"os"
 
-	vers "gitlab.oracledx.com/odx/functions/api/version"
+	vers "gitlab-odx.oracle.com/odx/functions/api/version"
 	functions "github.com/iron-io/functions_go"
 	"github.com/urfave/cli"
 )
diff --git a/main.go b/main.go
index 725627bdd..cc6ec108e 100644
--- a/main.go
+++ b/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"context"
 
-	"gitlab.oracledx.com/odx/functions/api/server"
+	"gitlab-odx.oracle.com/odx/functions/api/server"
 )
 
 func main() {