diff --git a/backend/app_sdk/build.sh b/backend/app_sdk/build.sh
index 0f99e856..a8fe1e93 100644
--- a/backend/app_sdk/build.sh
+++ b/backend/app_sdk/build.sh
@@ -3,8 +3,11 @@ NAME=app_sdk
 VERSION=0.6.0
 
 docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
-docker build . -t frikky/shuffle:$NAME -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
+docker build . -t frikky/shuffle:$NAME -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t gchr.io/frikky/app_sdk:0.6.0
 
 #docker push frikky/shuffle:$NAME
 #docker push frikky/$NAME:$VERSION
-docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
+#docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
+#docker push ghcr.io/frikky/$NAME:$VERSION
+
+docker push gchr.io/frikky/app_sdk
diff --git a/docker-compose.yml b/docker-compose.yml
index 603deb69..0b6ea2fc 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,7 +43,7 @@ services:
       - database
   orborus:
     #build: ./functions/onprem/orborus
-    image: docker.pkg.github.com/frikky/shuffle/orborus:0.6.0
+    image: ghcr.io/frikky/orborus:0.6.0
     container_name: shuffle-orborus
     hostname: shuffle-orborus
     networks:
diff --git a/functions/onprem/orborus/build.sh b/functions/onprem/orborus/build.sh
index 285d6772..f34c68f5 100644
--- a/functions/onprem/orborus/build.sh
+++ b/functions/onprem/orborus/build.sh
@@ -3,8 +3,9 @@ VERSION=0.6.0
 
 echo "Running docker build with $NAME:$VERSION"
 #docker rmi frikky/shuffle:$NAME --force
-docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t frikky/$NAME:$VERSION
+docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t frikky/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION
 
 #docker push frikky/$NAME:$VERSION
 #docker push frikky/shuffle:$NAME
-docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
+# docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
+docker push ghcr.io/frikky/$NAME:$VERSION
diff --git a/functions/onprem/orborus/orborus.go b/functions/onprem/orborus/orborus.go
index fce0608d..61c491cb 100644
--- a/functions/onprem/orborus/orborus.go
+++ b/functions/onprem/orborus/orborus.go
@@ -32,7 +32,9 @@ var sleepTime = 3
 var workerTimeout = 300
 var appSdkVersion = "0.6.0"
 var workerVersion = "0.6.0"
-var baseimagename = "docker.pkg.github.com/frikky/shuffle"
+
+//var baseimagename = "docker.pkg.github.com/frikky/shuffle"
+var baseimagename = "gchr.io/frikky"
 
 var orgId = os.Getenv("ORG_ID")
 var baseUrl = os.Getenv("BASE_URL")
diff --git a/functions/onprem/worker/build.sh b/functions/onprem/worker/build.sh
index 786e92c2..c90ce32c 100644
--- a/functions/onprem/worker/build.sh
+++ b/functions/onprem/worker/build.sh
@@ -3,9 +3,10 @@ VERSION=0.6.0
 
 echo "Running docker build with $NAME:$VERSION"
 CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o worker.bin .
-docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t frikky/$NAME:$VERSION
+docker build . -t frikky/shuffle:$NAME -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION
 
 # Push both for now..
 #docker push frikky/$NAME:$VERSION 
 #docker push frikky/shuffle:$NAME
-docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
+#docker push docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION
+docker push ghcr.io/frikky/$NAME:$VERSION