diff --git a/data.yaml b/data.yaml
index 50e2e89..5ef4537 100644
--- a/data.yaml
+++ b/data.yaml
@@ -136,3 +136,9 @@ events:
       type: Presentation
     - name: What DragonBall can teach us about being engineers
       type: Lightning Talk
+  - date: "2022-11-28"
+    humanDate: "November 28 - December 2, 2022"
+    url: https://reinvent.awsevents.com/
+    eventName: AWS re:Invent 2022
+    details:
+    - name: Attendee and representing <a href="https://giantswarm.io/">Giant Swarm</a> as a sponsor
diff --git a/src/README.md b/src/README.md
index 4009c82..87e6f0f 100644
--- a/src/README.md
+++ b/src/README.md
@@ -25,7 +25,7 @@ Below are a selection of highlights.
 {{ range .events }}
 {{ .humanDate }} - [**{{.eventName}}**]({{ .url }})
 {{ range .details }}
-`{{ .name }} - {{ .type }}`
+`{{ .name | html }}{{ if .type }} - {{ .type }}{{/end}}`
 {{ end }}
 {{- end }}
 
diff --git a/src/index.html b/src/index.html
index db133ef..5fc85ff 100644
--- a/src/index.html
+++ b/src/index.html
@@ -313,8 +313,8 @@
             <strong><a href="{{ .url }}">{{ .eventName }}</a></strong>
             {{ range .details }}
             <div>
-              <span>{{ .name }}</span>
-              <span class="tag">{{ .type }}</span>
+              <span>{{ .name | html }}</span>
+              {{ if .type }}<span class="tag">{{ .type }}</span>{{ end }}
             </div>
             {{ end }}
           </div>