diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 0c78e99c67..8d30c91eec 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,10 +1,7 @@
 blank_issues_enabled: true
 contact_links:
-  - name: 🚀 Feature Request
-    url: https://github.com/zitadel/zitadel/discussions/categories/ideas
-    about: Tell us about your idea in the discussions
   - name: ❓ Questions
     url: https://github.com/zitadel/zitadel/discussions/categories/q-a
     about: Ask for help in our Q&A discussions
-  - name: 💬 ZITADEL Chat
+  - name: 💬 ZITADEL Community Chat
     url: https://zitadel.com/chat
diff --git a/.github/ISSUE_TEMPLATE/docs.yaml b/.github/ISSUE_TEMPLATE/docs.yaml
index 777692f11a..04c1c0cdb1 100644
--- a/.github/ISSUE_TEMPLATE/docs.yaml
+++ b/.github/ISSUE_TEMPLATE/docs.yaml
@@ -1,6 +1,5 @@
 name: 📄 Documentation
 description: Create an issue for missing or wrong documentation.
-title: 
 labels: ["docs"]
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/improvement.yaml b/.github/ISSUE_TEMPLATE/improvement.yaml
index 1cd8647552..2f68cb6170 100644
--- a/.github/ISSUE_TEMPLATE/improvement.yaml
+++ b/.github/ISSUE_TEMPLATE/improvement.yaml
@@ -1,6 +1,5 @@
 name: 🛠️ Improvement
-description: 
-title: 
+description: "Create an new issue for an improvment in ZITADEL"
 labels: ["improvement"]
 body:
   - type: markdown
diff --git a/.github/ISSUE_TEMPLATE/proposal.yaml b/.github/ISSUE_TEMPLATE/proposal.yaml
index 29b08db5cb..5abded3eac 100644
--- a/.github/ISSUE_TEMPLATE/proposal.yaml
+++ b/.github/ISSUE_TEMPLATE/proposal.yaml
@@ -1,6 +1,5 @@
 name: 💡 Proposal / Feature request
-description: 
-title: 
+description: "Create an issue for a feature request/proposal."
 labels: ["enhancement"]
 body:
   - type: markdown
diff --git a/internal/query/projection/idp_template.go b/internal/query/projection/idp_template.go
index 80fee7e479..14a50c6a1a 100644
--- a/internal/query/projection/idp_template.go
+++ b/internal/query/projection/idp_template.go
@@ -351,6 +351,10 @@ func (p *idpTemplateProjection) reducers() []handler.AggregateReducer {
 					Event:  instance.OIDCIDPMigratedAzureADEventType,
 					Reduce: p.reduceOIDCIDPMigratedAzureAD,
 				},
+				{
+					Event:  instance.OIDCIDPMigratedGoogleEventType,
+					Reduce: p.reduceOIDCIDPMigratedGoogle,
+				},
 				{
 					Event:  instance.JWTIDPAddedEventType,
 					Reduce: p.reduceJWTIDPAdded,
@@ -472,6 +476,14 @@ func (p *idpTemplateProjection) reducers() []handler.AggregateReducer {
 					Event:  org.OIDCIDPChangedEventType,
 					Reduce: p.reduceOIDCIDPChanged,
 				},
+				{
+					Event:  org.OIDCIDPMigratedAzureADEventType,
+					Reduce: p.reduceOIDCIDPMigratedAzureAD,
+				},
+				{
+					Event:  org.OIDCIDPMigratedGoogleEventType,
+					Reduce: p.reduceOIDCIDPMigratedGoogle,
+				},
 				{
 					Event:  org.JWTIDPAddedEventType,
 					Reduce: p.reduceJWTIDPAdded,
diff --git a/internal/repository/instance/idp.go b/internal/repository/instance/idp.go
index b2d42d8eeb..7e41c35a1a 100644
--- a/internal/repository/instance/idp.go
+++ b/internal/repository/instance/idp.go
@@ -263,7 +263,7 @@ func NewOIDCIDPMigratedGoogleEvent(
 			eventstore.NewBaseEventForPush(
 				ctx,
 				aggregate,
-				OIDCIDPMigratedAzureADEventType,
+				OIDCIDPMigratedGoogleEventType,
 			),
 			id,
 			name,