diff --git a/.github/ISSUE_TEMPLATE/feature_template.md b/.github/ISSUE_TEMPLATE/feature_template.md
index 2a24ebb9..533e8af4 100644
--- a/.github/ISSUE_TEMPLATE/feature_template.md
+++ b/.github/ISSUE_TEMPLATE/feature_template.md
@@ -3,7 +3,7 @@ name: Feature request
 about: Use this template for requesting a feature/enhancement.
 title: "Enhancement: "
 labels: "kind/feature-request"
-assignees: ''
+assignees: ""
 ---
 
 ## Describe feature
diff --git a/.github/ISSUE_TEMPLATE/issue_template.md b/.github/ISSUE_TEMPLATE/issue_template.md
index 6712e111..85a73bb6 100644
--- a/.github/ISSUE_TEMPLATE/issue_template.md
+++ b/.github/ISSUE_TEMPLATE/issue_template.md
@@ -3,7 +3,7 @@ name: Issue
 about: Use this template for reporting a bug/issue.
 title: "Issue: <shortly describe issue>"
 labels: kind/bug
-assignees: ''
+assignees: ""
 ---
 
 <!--
diff --git a/.github/actions/choco/action.yml b/.github/actions/choco/action.yml
index 33cc3c6f..75903be9 100644
--- a/.github/actions/choco/action.yml
+++ b/.github/actions/choco/action.yml
@@ -1,7 +1,7 @@
 name: 'Chocolatey Packager'
 description: 'Create the choco package and push it'
 inputs:
-  version:  
+  version:
     description: 'Version of package'
     required: true
   apiKey:
diff --git a/.github/actions/composite/action.yml b/.github/actions/composite/action.yml
index f8132bf0..8b5954f4 100644
--- a/.github/actions/composite/action.yml
+++ b/.github/actions/composite/action.yml
@@ -10,7 +10,7 @@ outputs:
     description: 'Output string'
     value: ${{ steps.set-output.outputs.string }}
 runs:
-  using: "composite"
+  using: 'composite'
   steps:
     - run: echo Hello ${{ inputs.input }}.
       shell: bash
diff --git a/.github/actions/composite/script.sh b/.github/actions/composite/script.sh
index 25a5b1c0..ae94879e 100755
--- a/.github/actions/composite/script.sh
+++ b/.github/actions/composite/script.sh
@@ -1 +1 @@
-echo "Output from script"
\ No newline at end of file
+echo "Output from script"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 890cc356..4a633080 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,5 +1,5 @@
 name: release
-on: 
+on:
   push:
     tags:
       - v*
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index fca91785..f12b9cf5 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,23 +1,23 @@
-name: "Close stale issues"
+name: 'Close stale issues'
 on:
   schedule:
-  - cron: "0 0 * * *"
+    - cron: '0 0 * * *'
 
 jobs:
   stale:
     name: Stale
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/stale@v3
-      with:
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
-        stale-issue-message: 'Issue is stale and will be closed in 14 days unless there is new activity'
-        stale-pr-message: 'PR is stale and will be closed in 14 days unless there is new activity'
-        stale-issue-label: 'stale'
-        exempt-issue-labels: 'stale-exempt'
-        stale-pr-label: 'stale'
-        exempt-pr-labels: 'stale-exempt'
-        remove-stale-when-updated: 'True'
-        operations-per-run: 500
-        days-before-stale: 30
-        days-before-close: 14
+      - uses: actions/stale@v3
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          stale-issue-message: 'Issue is stale and will be closed in 14 days unless there is new activity'
+          stale-pr-message: 'PR is stale and will be closed in 14 days unless there is new activity'
+          stale-issue-label: 'stale'
+          exempt-issue-labels: 'stale-exempt'
+          stale-pr-label: 'stale'
+          exempt-pr-labels: 'stale-exempt'
+          remove-stale-when-updated: 'True'
+          operations-per-run: 500
+          days-before-stale: 30
+          days-before-close: 14
diff --git a/cmd/root.go b/cmd/root.go
index 214dbadc..d37b33e0 100644
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -308,11 +308,11 @@ func defaultImageSurvey(actrc string) error {
 	var option string
 	switch answer {
 	case "Large":
-		option = "-P ubuntu-18.04=nektos/act-environments-ubuntu:18.04"
+		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"
 	case "Medium":
-		option = "-P ubuntu-latest=catthehacker/ubuntu:act-latest\n-P ubuntu-20.04=catthehacker/ubuntu:act-20.04\n-P ubuntu-18.04=catthehacker/ubuntu:act-18.04\nubuntu-16.04=catthehacker/ubuntu:act-16.04"
+		option = "-P ubuntu-latest=ghcr.io/catthehacker/ubuntu:act-latest\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-P ubuntu-16.04=ghcr.io/catthehacker/ubuntu:act-16.04\n"
 	case "Micro":
-		option = "-P ubuntu-latest=node:12-buster-slim\n-P ubuntu-20.04=node:12-buster-slim\n-P ubuntu-18.04=node:12-buster-slim\n-P ubuntu-16.04=node:12-stretch-slim"
+		option = "-P ubuntu-latest=node:12-buster-slim\n-P ubuntu-20.04=node:12-buster-slim\n-P ubuntu-18.04=node:12-buster-slim\n-P ubuntu-16.04=node:12-stretch-slim\n"
 	}
 
 	f, err := os.Create(actrc)