diff --git a/themes/devopsdays-theme/layouts/partials/events/cta.html b/themes/devopsdays-theme/layouts/partials/events/cta.html
index e5865ea9cd2..01cf09fa8ca 100644
--- a/themes/devopsdays-theme/layouts/partials/events/cta.html
+++ b/themes/devopsdays-theme/layouts/partials/events/cta.html
@@ -2,6 +2,17 @@
+
+ {{- if $e.startdate -}}
+ {{- if $e.cfp_date_start -}}
+ {{- if and (ge now (time $e.cfp_date_start)) (le now (time $e.cfp_date_end)) -}}
+
+ {{- end -}}
+ {{- end -}}
+ {{- end -}}
+
{{- if $e.registration_open -}}
{{- if eq $e.registration_open "true" -}}
@@ -46,26 +57,11 @@
{{- end -}}
{{- end -}}
-
-
-
- {{- if $e.startdate -}}
- {{- if $e.cfp_date_start -}}
- {{- if and (ge now (time $e.cfp_date_start)) (le now (time $e.cfp_date_end)) -}}
-
- {{- end -}}
- {{- end -}}
- {{- end -}}
-
-
-
-
- {{- if $e.event_twitter -}}
- {{- if ne $e.event.twitter "" -}}
+
+ {{- if $e.organizer_email -}}
+ {{- if ne $e.organizer_email "" -}}
{{- end -}}
{{- end -}}
@@ -120,4 +116,4 @@
-
+
\ No newline at end of file
diff --git a/themes/devopsdays-theme/layouts/shortcodes/event_social_bsky.html b/themes/devopsdays-theme/layouts/shortcodes/event_social_bsky.html
new file mode 100644
index 00000000000..daf6d67865c
--- /dev/null
+++ b/themes/devopsdays-theme/layouts/shortcodes/event_social_bsky.html
@@ -0,0 +1,7 @@
+{{- $e := partial "functions/get-event-data" . -}}
+
+{{- if $e.event_social_bsky -}}
+