diff --git a/infrastructure/waka-orchestrator.tf b/infrastructure/waka-orchestrator.tf
index 84049f8..2676079 100644
--- a/infrastructure/waka-orchestrator.tf
+++ b/infrastructure/waka-orchestrator.tf
@@ -144,7 +144,7 @@ resource "kubernetes_deployment" "waka-orchestrator" {
         service_account_name            = kubernetes_service_account.waka-orchestrator.metadata.0.name
 
         container {
-          image = "dymajo/waka-server:orchestrator-${jsondecode(data.http.git_sha.body).commit.sha}"
+          image = "ghcr.io/dymajo/waka-server/orchestrator:${jsondecode(data.http.git_sha.body).commit.sha}"
           name  = "waka-orchestrator"
 
           env {
diff --git a/infrastructure/waka-proxy.tf b/infrastructure/waka-proxy.tf
index 39d9205..6113daa 100644
--- a/infrastructure/waka-proxy.tf
+++ b/infrastructure/waka-proxy.tf
@@ -29,7 +29,7 @@ resource "kubernetes_deployment" "waka-proxy" {
       spec {
         automount_service_account_token = "true"
         container {
-          image = "dymajo/waka-server:proxy-${jsondecode(data.http.git_sha.body).commit.sha}"
+          image = "ghcr.io/dymajo/waka-server/proxy:${jsondecode(data.http.git_sha.body).commit.sha}"
           name  = "waka-proxy"
 
           env {
diff --git a/infrastructure/waka-realtime.tf b/infrastructure/waka-realtime.tf
index e507745..e6a587a 100644
--- a/infrastructure/waka-realtime.tf
+++ b/infrastructure/waka-realtime.tf
@@ -81,7 +81,7 @@ resource "kubernetes_deployment" "waka-realtime" {
       spec {
         automount_service_account_token = "true"
         container {
-          image = "dymajo/waka-server:realtime-${jsondecode(data.http.git_sha.body).commit.sha}"
+          image = "ghcr.io/dymajo/waka-server/realtime:${jsondecode(data.http.git_sha.body).commit.sha}"
           name  = "waka-realtime"
 
           env {
diff --git a/infrastructure/waka-worker.tf b/infrastructure/waka-worker.tf
index ef84906..e75196f 100644
--- a/infrastructure/waka-worker.tf
+++ b/infrastructure/waka-worker.tf
@@ -101,7 +101,7 @@ resource "kubernetes_deployment" "waka-worker" {
       spec {
         automount_service_account_token = "true"
         container {
-          image = "dymajo/waka-server:worker-${jsondecode(data.http.git_sha.body).commit.sha}"
+          image = "ghcr.io/dymajo/waka-server/worker:${jsondecode(data.http.git_sha.body).commit.sha}"
           name  = "waka-worker"
 
           env_from {