diff --git a/act/runner/runner_test.go b/act/runner/runner_test.go
index c116bc54..8f166a3b 100644
--- a/act/runner/runner_test.go
+++ b/act/runner/runner_test.go
@@ -121,8 +121,8 @@ func TestRunEvent(t *testing.T) {
 		// Shells
 		{workdir, "shells/defaults", "push", "", platforms},
 		// TODO: figure out why it fails
-		// {workdir, "shells/custom", "push", "", map[string]string{"ubuntu-latest": "ghcr.io/justingrote/act-pwsh:latest"}, }, // custom image with pwsh
-		{workdir, "shells/pwsh", "push", "", map[string]string{"ubuntu-latest": "ghcr.io/justingrote/act-pwsh:latest"}}, // custom image with pwsh
+		// {workdir, "shells/custom", "push", "", map[string]string{"ubuntu-latest": "catthehacker/ubuntu:pwsh-latest"}, }, // custom image with pwsh
+		{workdir, "shells/pwsh", "push", "", map[string]string{"ubuntu-latest": "catthehacker/ubuntu:pwsh-latest"}}, // custom image with pwsh
 		{workdir, "shells/bash", "push", "", platforms},
 		{workdir, "shells/python", "push", "", map[string]string{"ubuntu-latest": "node:16-buster"}}, // slim doesn't have python
 		{workdir, "shells/sh", "push", "", platforms},
@@ -158,7 +158,7 @@ func TestRunEvent(t *testing.T) {
 		{workdir, "container-hostname", "push", "", platforms},
 		{workdir, "remote-action-docker", "push", "", platforms},
 		{workdir, "remote-action-js", "push", "", platforms},
-		{workdir, "remote-action-js", "push", "", map[string]string{"ubuntu-latest": "ghcr.io/catthehacker/ubuntu:runner-latest"}}, // Test if this works with non root container
+		{workdir, "remote-action-js", "push", "", map[string]string{"ubuntu-latest": "catthehacker/ubuntu:runner-latest"}}, // Test if this works with non root container
 		{workdir, "matrix", "push", "", platforms},
 		{workdir, "matrix-include-exclude", "push", "", platforms},
 		{workdir, "commands", "push", "", platforms},
@@ -199,7 +199,7 @@ func TestDryrunEvent(t *testing.T) {
 	tables := []TestJobFileInfo{
 		// Shells
 		{workdir, "shells/defaults", "push", "", platforms},
-		{workdir, "shells/pwsh", "push", "", map[string]string{"ubuntu-latest": "ghcr.io/justingrote/act-pwsh:latest"}}, // custom image with pwsh
+		{workdir, "shells/pwsh", "push", "", map[string]string{"ubuntu-latest": "catthehacker/ubuntu:pwsh-latest"}}, // custom image with pwsh
 		{workdir, "shells/bash", "push", "", platforms},
 		{workdir, "shells/python", "push", "", map[string]string{"ubuntu-latest": "node:16-buster"}}, // slim doesn't have python
 		{workdir, "shells/sh", "push", "", platforms},
diff --git a/act/runner/testdata/job-container-non-root/push.yml b/act/runner/testdata/job-container-non-root/push.yml
index 5fd296a0..1fe0e3be 100644
--- a/act/runner/testdata/job-container-non-root/push.yml
+++ b/act/runner/testdata/job-container-non-root/push.yml
@@ -5,6 +5,6 @@ jobs:
   test:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/catthehacker/ubuntu:runner-latest # image with user 'runner:runner' built on tag 'act-latest'
+      image: catthehacker/ubuntu:runner-latest # image with user 'runner:runner' built on tag 'act-latest'
     steps:
       - run: echo PASS
diff --git a/act/runner/testdata/shells/custom/push.yml b/act/runner/testdata/shells/custom/push.yml
index d5086af9..cbc03955 100644
--- a/act/runner/testdata/shells/custom/push.yml
+++ b/act/runner/testdata/shells/custom/push.yml
@@ -8,7 +8,7 @@ jobs:
         run: ''
   check-container:
     runs-on: ubuntu-latest
-    container: ghcr.io/justingrote/act-pwsh:latest
+    container: catthehacker/ubuntu:pwsh-latest
     steps:
       - shell: pwsh -v '. {0}'
         run: ''
diff --git a/act/runner/testdata/shells/pwsh/push.yml b/act/runner/testdata/shells/pwsh/push.yml
index d1aa0da9..25ce66b4 100644
--- a/act/runner/testdata/shells/pwsh/push.yml
+++ b/act/runner/testdata/shells/pwsh/push.yml
@@ -10,7 +10,7 @@ jobs:
           $PSVersionTable
   check-container:
     runs-on: ubuntu-latest
-    container: ghcr.io/justingrote/act-pwsh:latest
+    container: catthehacker/ubuntu:pwsh-latest
     steps:
       - shell: ${{ env.MY_SHELL }}
         run: |
diff --git a/cmd/root.go b/cmd/root.go
index d2b2214a..73c1764f 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -443,9 +443,9 @@ func defaultImageSurvey(actrc string) error {
 	var option string
 	switch answer {
 	case "Large":
-		option = "-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:full-latest\n-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:full-20.04\n-P ubuntu-18.04=ghcr.io/catthehacker/ubuntu:full-18.04\n"
+		option = "-P ubuntu-latest=catthehacker/ubuntu:full-latest\n-P ubuntu-latest=catthehacker/ubuntu:full-20.04\n-P ubuntu-18.04=catthehacker/ubuntu:full-18.04\n"
 	case "Medium":
-		option = "-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest\n-P ubuntu-22.04=ghcr.io/catthehacker/ubuntu:act-22.04\n-P ubuntu-20.04=ghcr.io/catthehacker/ubuntu:act-20.04\n-P ubuntu-18.04=ghcr.io/catthehacker/ubuntu:act-18.04\n"
+		option = "-P ubuntu-latest=catthehacker/ubuntu:act-latest\n-P ubuntu-22.04=catthehacker/ubuntu:act-22.04\n-P ubuntu-20.04=catthehacker/ubuntu:act-20.04\n-P ubuntu-18.04=catthehacker/ubuntu:act-18.04\n"
 	case "Micro":
 		option = "-P ubuntu-latest=node:16-buster-slim\n-P -P ubuntu-22.04=node:16-bullseye-slim\n ubuntu-20.04=node:16-buster-slim\n-P ubuntu-18.04=node:16-buster-slim\n"
 	}