diff --git a/argocd/apps/apps.yaml b/argocd/apps/apps.yaml
index bdc8e5f..787ab7d 100644
--- a/argocd/apps/apps.yaml
+++ b/argocd/apps/apps.yaml
@@ -8,9 +8,8 @@ metadata:
 spec:
   project: default
   source:
-    # TODO: Change back to 'main' before merging PR
     repoURL: ssh://forgejo@indri.tail8d86e.ts.net:2200/eblume/blumeops.git
-    targetRevision: feature/k8s-phase2-grafana
+    targetRevision: main
     path: argocd/apps
   destination:
     server: https://kubernetes.default.svc
diff --git a/argocd/apps/argocd.yaml b/argocd/apps/argocd.yaml
index 3af2801..3e611c1 100644
--- a/argocd/apps/argocd.yaml
+++ b/argocd/apps/argocd.yaml
@@ -9,7 +9,7 @@ spec:
   project: default
   source:
     repoURL: ssh://forgejo@indri.tail8d86e.ts.net:2200/eblume/blumeops.git
-    targetRevision: feature/k8s-phase2-grafana
+    targetRevision: main
     path: argocd/manifests/argocd
   destination:
     server: https://kubernetes.default.svc
diff --git a/argocd/apps/blumeops-pg.yaml b/argocd/apps/blumeops-pg.yaml
index fea80a3..89e75ed 100644
--- a/argocd/apps/blumeops-pg.yaml
+++ b/argocd/apps/blumeops-pg.yaml
@@ -13,7 +13,7 @@ spec:
   project: default
   source:
     repoURL: ssh://forgejo@indri.tail8d86e.ts.net:2200/eblume/blumeops.git
-    targetRevision: feature/k8s-phase2-grafana
+    targetRevision: main
     path: argocd/manifests/databases
   destination:
     server: https://kubernetes.default.svc
diff --git a/argocd/apps/cloudnative-pg.yaml b/argocd/apps/cloudnative-pg.yaml
index 90aad8b..5a3d1a8 100644
--- a/argocd/apps/cloudnative-pg.yaml
+++ b/argocd/apps/cloudnative-pg.yaml
@@ -19,9 +19,8 @@ spec:
         valueFiles:
           - $values/argocd/manifests/cloudnative-pg/values.yaml
     # Values from our git repo
-    # TODO: Change back to 'main' before merging PR
     - repoURL: ssh://forgejo@indri.tail8d86e.ts.net:2200/eblume/blumeops.git
-      targetRevision: feature/k8s-phase2-grafana
+      targetRevision: main
       ref: values
   destination:
     server: https://kubernetes.default.svc
diff --git a/argocd/apps/grafana-config.yaml b/argocd/apps/grafana-config.yaml
index a6e05a3..ff4d1ac 100644
--- a/argocd/apps/grafana-config.yaml
+++ b/argocd/apps/grafana-config.yaml
@@ -13,9 +13,8 @@ metadata:
 spec:
   project: default
   source:
-    # TODO: Change back to 'main' before merging PR
     repoURL: ssh://forgejo@indri.tail8d86e.ts.net:2200/eblume/blumeops.git
-    targetRevision: feature/k8s-phase2-grafana
+    targetRevision: main
     path: argocd/manifests/grafana-config
   destination:
     server: https://kubernetes.default.svc
diff --git a/argocd/apps/grafana.yaml b/argocd/apps/grafana.yaml
index 6db5ca6..86711f4 100644
--- a/argocd/apps/grafana.yaml
+++ b/argocd/apps/grafana.yaml
@@ -22,9 +22,8 @@ spec:
         valueFiles:
           - $values/argocd/manifests/grafana/values.yaml
     # Values from our git repo
-    # TODO: Change back to 'main' before merging PR
     - repoURL: ssh://forgejo@indri.tail8d86e.ts.net:2200/eblume/blumeops.git
-      targetRevision: feature/k8s-phase2-grafana
+      targetRevision: main
       ref: values
   destination:
     server: https://kubernetes.default.svc
diff --git a/argocd/apps/tailscale-operator.yaml b/argocd/apps/tailscale-operator.yaml
index 6164a55..276bd1c 100644
--- a/argocd/apps/tailscale-operator.yaml
+++ b/argocd/apps/tailscale-operator.yaml
@@ -15,7 +15,7 @@ spec:
         - /spec/externalName
   source:
     repoURL: ssh://forgejo@indri.tail8d86e.ts.net:2200/eblume/blumeops.git
-    targetRevision: feature/k8s-phase2-grafana
+    targetRevision: main
     path: argocd/manifests/tailscale-operator
   destination:
     server: https://kubernetes.default.svc