diff --git a/tekton/2-Setup/docker-creds.yaml b/tekton/2-Setup/docker-creds.yaml
index eb61b76..3e61d03 100644
--- a/tekton/2-Setup/docker-creds.yaml
+++ b/tekton/2-Setup/docker-creds.yaml
@@ -6,6 +6,6 @@ metadata:
   annotations:
     kube-1password: kgpbumszi4stqgyzg4kqrttxam
     kube-1password/vault: Kubernetes
-    tekton.dev/docker-0: https://docker.cloud.cluster.fun/averagemarcus
+    tekton.dev/docker-0: https://docker.cluster.fun/averagemarcus
 type: Opaque
 
diff --git a/tekton/2-Setup/gitea-creds.yaml b/tekton/2-Setup/gitea-creds.yaml
index be75c27..7b16bc4 100644
--- a/tekton/2-Setup/gitea-creds.yaml
+++ b/tekton/2-Setup/gitea-creds.yaml
@@ -18,5 +18,5 @@ metadata:
   annotations:
     kube-1password: 3jgo56jlsrdxilf2vdp5zsw6lq
     kube-1password/vault: Kubernetes
-    tekton.dev/git-0: https://git.cloud.cluster.fun
+    tekton.dev/git-0: https://git.cluster.fun
 type: Opaque
diff --git a/tekton/README.md b/tekton/README.md
index 31c4952..b9b60a3 100644
--- a/tekton/README.md
+++ b/tekton/README.md
@@ -16,13 +16,13 @@ kubectl apply --recursive -f ./
 
 ### gitea-pr-state
 
-`docker pull docker.cloud.cluster.fun/averagemarcus/gitea-pr-state:latest`
+`docker pull docker.cluster.fun/averagemarcus/gitea-pr-state:latest`
 
 > Sets the state of a commit in Gitea. This is used to set the CI status to pending or success on the PR.
 
 ### ci-builder
 
-`docker pull docker.cloud.cluster.fun/averagemarcus/ci-builder:latest`
+`docker pull docker.cluster.fun/averagemarcus/ci-builder:latest`
 
 > Used as a general-purpose Docker image with many common build tools included. This is used for running `make test` and `make build` without needing specific CI images for each project.
 
diff --git a/tekton/pipelines/deploy.yaml b/tekton/pipelines/deploy.yaml
index 31f27d0..b5142fc 100644
--- a/tekton/pipelines/deploy.yaml
+++ b/tekton/pipelines/deploy.yaml
@@ -17,11 +17,11 @@ spec:
     - name: dockerregistry
       type: string
       description: The Docker registry to push images to
-      default: docker.cloud.cluster.fun/private
+      default: docker.cluster.fun/private
     - name: publicdockerregistry
       type: string
       description: The Docker registry to push images to
-      default: docker.cloud.cluster.fun/averagemarcus
+      default: docker.cluster.fun/averagemarcus
     - name: imagetag
       type: string
       description: The Docker image tag
diff --git a/tekton/pipelines/tag.yaml b/tekton/pipelines/tag.yaml
index f95728f..26aadf6 100644
--- a/tekton/pipelines/tag.yaml
+++ b/tekton/pipelines/tag.yaml
@@ -13,11 +13,11 @@ spec:
     - name: dockerregistry
       type: string
       description: The Docker registry to push images to
-      default: docker.cloud.cluster.fun/private
+      default: docker.cluster.fun/private
     - name: publicdockerregistry
       type: string
       description: The Docker registry to push images to
-      default: docker.cloud.cluster.fun/averagemarcus
+      default: docker.cluster.fun/averagemarcus
     - name: imagetag
       type: string
       description: The Docker image tag
diff --git a/tekton/tasks/make.yaml b/tekton/tasks/make.yaml
index 9fb0550..1a52b46 100644
--- a/tekton/tasks/make.yaml
+++ b/tekton/tasks/make.yaml
@@ -14,6 +14,6 @@ spec:
   steps:
   - name: make
     workingDir: /workspace/src
-    image: docker.cloud.cluster.fun/averagemarcus/ci-builder:latest
+    image: docker.cluster.fun/averagemarcus/ci-builder:latest
     script: |
       make --dry-run -t $(params.TARGET) &> /dev/null && make $(params.TARGET) || echo "No '$(params.TARGET)' target found, skipping"
diff --git a/tekton/tasks/pr-status.yaml b/tekton/tasks/pr-status.yaml
index ecb35b4..d991fcf 100644
--- a/tekton/tasks/pr-status.yaml
+++ b/tekton/tasks/pr-status.yaml
@@ -14,7 +14,7 @@ spec:
     default: "pending"
   steps:
   - name: pr-status-update
-    image: docker.cloud.cluster.fun/averagemarcus/gitea-pr-state:latest
+    image: docker.cluster.fun/averagemarcus/gitea-pr-state:latest
     env:
     - name: ACCESS_TOKEN
       valueFrom: