diff --git a/images/armada-go/Dockerfile.ubuntu_focal b/images/armada-go/Dockerfile.ubuntu_focal
index bd68452..a9a2b27 100644
--- a/images/armada-go/Dockerfile.ubuntu_focal
+++ b/images/armada-go/Dockerfile.ubuntu_focal
@@ -1,5 +1,5 @@
-ARG FROM=public.ecr.aws/ubuntu/ubuntu:focal
-ARG GO_IMAGE=public.ecr.aws/docker/library/golang:1.21.1-bullseye
+ARG FROM=quay.io/airshipit/ubuntu:focal
+ARG GO_IMAGE=quay.io/airshipit/golang:1.21.1-bullseye
 FROM ${GO_IMAGE} as builder
 
 ENV PATH "/usr/local/go/bin:$PATH"
diff --git a/images/armada-go/Dockerfile.ubuntu_jammy b/images/armada-go/Dockerfile.ubuntu_jammy
index f42d8d4..d4e6902 100644
--- a/images/armada-go/Dockerfile.ubuntu_jammy
+++ b/images/armada-go/Dockerfile.ubuntu_jammy
@@ -1,5 +1,5 @@
-ARG FROM=public.ecr.aws/ubuntu/ubuntu:jammy
-ARG GO_IMAGE=public.ecr.aws/docker/library/golang:1.23.1-bullseye
+ARG FROM=quay.io/airshipit/ubuntu:jammy
+ARG GO_IMAGE=quay.io/airshipit/golang:1.23.1-bullseye
 FROM ${GO_IMAGE} as builder
 
 ENV PATH "/usr/local/go/bin:$PATH"
diff --git a/tools/gate/roles/airship-run-script-set/defaults/main.yaml b/tools/gate/roles/airship-run-script-set/defaults/main.yaml
index 7c08414..6a82b85 100644
--- a/tools/gate/roles/airship-run-script-set/defaults/main.yaml
+++ b/tools/gate/roles/airship-run-script-set/defaults/main.yaml
@@ -24,7 +24,7 @@ HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
 OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
 OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
 COREDNS_VERSION: v1.11.1
-DISTRO: ubuntu_focal
+DISTRO: ubuntu_jammy
 DOCKER_REGISTRY: quay.io
 CLONE_ARMADA: true
 CLONE_ARMADA_GO: true
diff --git a/tools/gate/roles/airship-run-script-set/tasks/main.yaml b/tools/gate/roles/airship-run-script-set/tasks/main.yaml
index de28e39..ea985bc 100644
--- a/tools/gate/roles/airship-run-script-set/tasks/main.yaml
+++ b/tools/gate/roles/airship-run-script-set/tasks/main.yaml
@@ -40,7 +40,7 @@
         OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}"
         OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}"
         COREDNS_VERSION: "{{ coredns_version | default('v1.11.1') }}"
-        DISTRO: "{{ DISTRO | default('ubuntu_focal') }}"
+        DISTRO: "{{ DISTRO | default('ubuntu_jammy') }}"
         DOCKER_REGISTRY: "{{ DOCKER_REGISTRY | default('quay.io') }}"
         CLONE_ARMADA: "{{ CLONE_ARMADA | default('true') }}"
         CLONE_ARMADA_GO: "{{ CLONE_ARMADA_GO | default('true') }}"
diff --git a/tools/gate/roles/airship-run-script/defaults/main.yaml b/tools/gate/roles/airship-run-script/defaults/main.yaml
index d6dff60..1d5c056 100644
--- a/tools/gate/roles/airship-run-script/defaults/main.yaml
+++ b/tools/gate/roles/airship-run-script/defaults/main.yaml
@@ -24,7 +24,7 @@ HTK_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
 OSH_INFRA_COMMIT: cfff60ec10a6c386f38db79bb9f59a552c2b032f
 OSH_COMMIT: 2d9457e34ca4200ed631466bd87569b0214c92e7
 COREDNS_VERSION: v1.11.1
-DISTRO: ubuntu_focal
+DISTRO: ubuntu_jammy
 DOCKER_REGISTRY: quay.io
 
 CLONE_ARMADA: true
diff --git a/tools/gate/roles/airship-run-script/tasks/main.yaml b/tools/gate/roles/airship-run-script/tasks/main.yaml
index 811319b..451daf9 100644
--- a/tools/gate/roles/airship-run-script/tasks/main.yaml
+++ b/tools/gate/roles/airship-run-script/tasks/main.yaml
@@ -37,7 +37,7 @@
     OSH_INFRA_COMMIT: "{{ OSH_INFRA_COMMIT | default('cfff60ec10a6c386f38db79bb9f59a552c2b032f') }}"
     OSH_COMMIT: "{{ OSH_COMMIT | default('2d9457e34ca4200ed631466bd87569b0214c92e7') }}"
     COREDNS_VERSION: "{{ coredns_version | default('v1.11.1') }}"
-    DISTRO: "{{ DISTRO | default('ubuntu_focal') }}"
+    DISTRO: "{{ DISTRO | default('ubuntu_jammy') }}"
     DOCKER_REGISTRY: "{{ DOCKER_REGISTRY | default('quay.io') }}"
     CLONE_ARMADA: "{{ CLONE_ARMADA | default('true') }}"
     CLONE_ARMADA_GO: "{{ CLONE_ARMADA_GO | default('true') }}"