diff --git a/setup/catalogs/data/airbyte.yaml b/setup/catalogs/data/airbyte.yaml
index fa4478f3..77ee1abc 100644
--- a/setup/catalogs/data/airbyte.yaml
+++ b/setup/catalogs/data/airbyte.yaml
@@ -41,7 +41,7 @@ spec:
   catalogRef:
     name: data-engineering
   scmConnectionRef:
-    name: plural  # you'll need to add this ScmConnection manually before this is functional
+    name: github  # you'll need to add this ScmConnection manually before this is functional
   title: "Setting up airbyte on cluster {{ context.cluster }} for {{ context.cloud }}"
   message: |
     Set up airbyte on {{ context.cluster }} ({{ context.cloud }})
diff --git a/setup/catalogs/data/dagster.yaml b/setup/catalogs/data/dagster.yaml
index 804db6b7..b9824fb8 100644
--- a/setup/catalogs/data/dagster.yaml
+++ b/setup/catalogs/data/dagster.yaml
@@ -37,7 +37,7 @@ spec:
   catalogRef:
     name: data-engineering
   scmConnectionRef:
-    name: plural  # you'll need to add this ScmConnection manually before this is functional
+    name: github  # you'll need to add this ScmConnection manually before this is functional
   title: Dagster setup ({{ context.cluster }})
   message: Sets up Dagster on {{ context.cluster }} cluster.
   configuration:
diff --git a/setup/catalogs/data/mlflow.yaml b/setup/catalogs/data/mlflow.yaml
index a8971d8c..10d24df0 100644
--- a/setup/catalogs/data/mlflow.yaml
+++ b/setup/catalogs/data/mlflow.yaml
@@ -44,7 +44,7 @@ spec:
   catalogRef:
     name: data-engineering
   scmConnectionRef:
-    name: plural  # you'll need to add this ScmConnection manually before this is functional
+    name: github  # you'll need to add this ScmConnection manually before this is functional
   title: "Setting up mlflow on cluster {{ context.cluster }} for {{ context.cloud }}"
   message: |
     Set up mlflow on {{ context.cluster }} ({{ context.cloud }})
diff --git a/setup/catalogs/devops/grafana.yaml b/setup/catalogs/devops/grafana.yaml
index 37844902..c8acea69 100644
--- a/setup/catalogs/devops/grafana.yaml
+++ b/setup/catalogs/devops/grafana.yaml
@@ -26,11 +26,10 @@ spec:
   catalogRef:
     name: devops
   scmConnectionRef:
-    name: plural # you'll need to add this ScmConnection manually before this is functional
+    name: github # you'll need to add this ScmConnection manually before this is functional
   title: "Grafana setup ({{ context.cluster }})"
   message: |
     Sets up Grafana on {{ context.cluster }} cluster.
-  identifier: pluralsh/plrl-dev-aws # FIXME
   configuration:
   - name: cluster
     type: STRING
diff --git a/setup/catalogs/devops/kubecost.yaml b/setup/catalogs/devops/kubecost.yaml
index 07c40cb2..5cd85ad9 100644
--- a/setup/catalogs/devops/kubecost.yaml
+++ b/setup/catalogs/devops/kubecost.yaml
@@ -26,11 +26,10 @@ spec:
   catalogRef:
     name: devops
   scmConnectionRef:
-    name: plural # you'll need to add this ScmConnection manually before this is functional
+    name: github # you'll need to add this ScmConnection manually before this is functional
   title: "Kubecost setup ({{ context.cluster }})"
   message: |
     Sets up Kubecost on {{ context.cluster }} cluster.
-  identifier: pluralsh/plrl-dev-aws # FIXME
   configuration:
   - name: cluster
     type: STRING
diff --git a/setup/catalogs/infra/cluster-eks.yaml b/setup/catalogs/infra/cluster-eks.yaml
index 57723d9f..7372445f 100644
--- a/setup/catalogs/infra/cluster-eks.yaml
+++ b/setup/catalogs/infra/cluster-eks.yaml
@@ -26,7 +26,7 @@ spec:
   catalogRef:
     name: infra
   scmConnectionRef:
-    name: plural  # you'll need to add this ScmConnection manually before this is functional
+    name: github  # you'll need to add this ScmConnection manually before this is functional
   title: "Adding EKS cluster: {{ context.name }}"
   message: "Adding EKS cluster {{ context.name }} and registering it with Plural"
   configuration:
diff --git a/setup/catalogs/security/gatekeeper.yaml b/setup/catalogs/security/gatekeeper.yaml
index 90af0401..ff3540c3 100644
--- a/setup/catalogs/security/gatekeeper.yaml
+++ b/setup/catalogs/security/gatekeeper.yaml
@@ -28,7 +28,7 @@ spec:
   catalogRef:
     name: security
   scmConnectionRef:
-    name: plural  # you'll need to add this ScmConnection manually before this is functional
+    name: github  # you'll need to add this ScmConnection manually before this is functional
   title: Gatekeeper setup
   message: Sets up Gatekeeper, policy bundle and a set of constraints.
   configuration:
diff --git a/setup/catalogs/security/trivy-operator.yaml b/setup/catalogs/security/trivy-operator.yaml
index c0f55441..7875a343 100644
--- a/setup/catalogs/security/trivy-operator.yaml
+++ b/setup/catalogs/security/trivy-operator.yaml
@@ -22,6 +22,6 @@ spec:
   catalogRef:
     name: security
   scmConnectionRef:
-    name: plural  # you'll need to add this ScmConnection manually before this is functional
+    name: github  # you'll need to add this ScmConnection manually before this is functional
   title: Trivy Operator setup
   message: Sets up Trivy Operator.