diff --git a/argocd/gitea-app.yaml b/argocd/gitea-app.yaml
index a284c65..316ddb0 100644
--- a/argocd/gitea-app.yaml
+++ b/argocd/gitea-app.yaml
@@ -19,7 +19,7 @@ spec:
       helm:
         valueFiles:
           - $values/gitea/values.yaml
-    - repoURL: https://git2.lunarfront.tech/ryan/lunarfront-charts.git
+    - repoURL: https://git.lunarfront.tech/ryan/lunarfront-charts.git
       targetRevision: main
       ref: values
   destination:
diff --git a/argocd/runner-app.yaml b/argocd/runner-app.yaml
index 40f98b8..a85283c 100644
--- a/argocd/runner-app.yaml
+++ b/argocd/runner-app.yaml
@@ -6,7 +6,7 @@ metadata:
 spec:
   project: default
   source:
-    repoURL: https://git2.lunarfront.tech/ryan/lunarfront-charts.git
+    repoURL: https://git.lunarfront.tech/ryan/lunarfront-charts.git
     targetRevision: main
     path: runner
   destination:
diff --git a/charts/lunarfront/values.yaml b/charts/lunarfront/values.yaml
index 44f4876..ea0436d 100644
--- a/charts/lunarfront/values.yaml
+++ b/charts/lunarfront/values.yaml
@@ -2,11 +2,11 @@
 
 image:
   backend:
-    repository: registry.lunarfront.tech/ryan/lunarfront-app
+    repository: git.lunarfront.tech/ryan/lunarfront-app
     tag: latest
     pullPolicy: Always
   frontend:
-    repository: registry.lunarfront.tech/ryan/lunarfront-frontend
+    repository: git.lunarfront.tech/ryan/lunarfront-frontend
     tag: latest
     pullPolicy: Always
 
diff --git a/gitea/values.yaml b/gitea/values.yaml
index 3aea0b5..b514f60 100644
--- a/gitea/values.yaml
+++ b/gitea/values.yaml
@@ -6,9 +6,9 @@ gitea:
 
   config:
     server:
-      DOMAIN: git2.lunarfront.tech
-      ROOT_URL: https://git2.lunarfront.tech
-      SSH_DOMAIN: git2-ssh.lunarfront.tech
+      DOMAIN: git.lunarfront.tech
+      ROOT_URL: https://git.lunarfront.tech
+      SSH_DOMAIN: git-ssh.lunarfront.tech
       SSH_PORT: 22
       START_SSH_SERVER: true
     database:
@@ -67,7 +67,7 @@ service:
     clusterIP: None
     port: 22
     annotations:
-      external-dns.alpha.kubernetes.io/hostname: git2-ssh.lunarfront.tech
+      external-dns.alpha.kubernetes.io/hostname: git-ssh.lunarfront.tech
       external-dns.alpha.kubernetes.io/target: "167.99.21.170"
 
 ingress:
@@ -77,14 +77,14 @@ ingress:
     nginx.ingress.kubernetes.io/ssl-redirect: "true"
     nginx.ingress.kubernetes.io/proxy-body-size: "0"
   hosts:
-    - host: git2.lunarfront.tech
+    - host: git.lunarfront.tech
       paths:
         - path: /
           pathType: Prefix
   tls:
     - secretName: cloudflare-origin-cert
       hosts:
-        - git2.lunarfront.tech
+        - git.lunarfront.tech
 
 resources:
   requests:
diff --git a/runner/deployment.yaml b/runner/deployment.yaml
index 6ba1706..0435056 100644
--- a/runner/deployment.yaml
+++ b/runner/deployment.yaml
@@ -25,7 +25,7 @@ spec:
               memory: 2Gi
           env:
             - name: GITEA_INSTANCE_URL
-              value: https://git2.lunarfront.tech
+              value: https://git.lunarfront.tech
             - name: GITEA_RUNNER_REGISTRATION_TOKEN
               valueFrom:
                 secretKeyRef: