diff --git a/layouts/events/single.html b/layouts/events/single.html
index f1c4debe5ba46368453b5b81f8d8c7e0c242af38..ce11f636202c46779b48340edc07546781baa3e5 100644
--- a/layouts/events/single.html
+++ b/layouts/events/single.html
@@ -4,8 +4,7 @@
   <div class="document-content" itemscope itemtype="https://schema.org/Event">
     <meta itemprop="name" content="{{ partial "PrepareHTML" .Title }}">
     <meta itemprop="url" content="{{ .Permalink }}">
-    {{ with .Params.summary }}<meta itemprop="abstract" content="{{ . | safeHTML }}">{{ end }}
-    {{ with .Summary }}<meta itemprop="description" content="{{ . | safeHTML }}">{{ end }}
+    {{ with .Params.summary }}<meta itemprop="description" content="{{ . | safeHTML }}">{{ end }}
 
     {{ partial "events/sidebar.html" . }}
 
diff --git a/layouts/partials/projects/project.html b/layouts/partials/projects/project.html
index 358db0108bdec2ec72b1837609091c574650247a..b52abb9c454f1327cf4ec688959f870689a62dd6 100644
--- a/layouts/partials/projects/project.html
+++ b/layouts/partials/projects/project.html
@@ -7,18 +7,18 @@
 
 {{ with $project }}
 
-<article class="project" itemscope itemtype="https://schema.org/Project">
+<article class="project" itemscope itemtype="https://schema.org/CreativeWork"">
 
   <div class="project-content">
     {{- $title := partial "PrepareHTML" .Title -}}
 
     {{ $heading_tag.open }}
-      <a href="{{ .Permalink }}" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a>
+      <a href="{{ .Permalink }}" itemprop="url" title="{{ safeHTML (i18n "commons.more_aria" (dict "Title" $title)) }}">{{ $title }}</a>
     {{ $heading_tag.close }}
 
     {{ if site.Params.projects.index.show_description }}
       {{- if partial "GetTextFromHTML" .Params.summary -}}
-        <p itemprop="articleBody">{{ partial "GetTruncateContent" ( dict 
+        <p itemprop="abstract">{{ partial "GetTruncateContent" ( dict 
           "text" .Params.summary
           "length" site.Params.projects.index.truncate_description
           ) }}</p>
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index 5523950f11e3c1ff4e8a53d5aa63400e7ccabc66..d37649dfa59ca5c2ea16fd6cdcda0d4f0eaa11a0 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -6,7 +6,6 @@
     <meta itemprop="url" content="{{ .Permalink }}">
     {{ with .Date }}<meta itemprop="datePublished" content="{{ .Format "2006-01-02T15:04" }}">{{ end }}
     {{ with .Params.summary }}<meta itemprop="abstract" content="{{ . | safeHTML }}">{{ end }}
-    {{ with .Summary }}<meta itemprop="description" content="{{ . | safeHTML }}">{{ end }}
 
     {{ partial "posts/sidebar.html" . }}
 
diff --git a/layouts/projects/single.html b/layouts/projects/single.html
index 0eb47c0651a9dbc244f371a214837cf2691d6171..05484c8bc2884bbf5837c6373ecf5da2df02eecf 100644
--- a/layouts/projects/single.html
+++ b/layouts/projects/single.html
@@ -1,11 +1,10 @@
 {{ define "main" }}
   {{ partial "projects/hero-single.html" . }}
 
-  <div class="document-content" itemscope itemtype="https://schema.org/Event">
+  <div class="document-content" itemscope itemtype="https://schema.org/CreativeWork">
     <meta itemprop="name" content="{{ partial "PrepareHTML" .Title }}">
     <meta itemprop="url" content="{{ .Permalink }}">
-    {{ with .Params.summary }}<meta itemprop="abstract" content="{{ . | safeHTML }}">{{ end }}
-    {{ with .Summary }}<meta itemprop="description" content="{{ . | safeHTML }}">{{ end }}
+    {{ with .Params.summary }}<meta itemprop="description" content="{{ . | safeHTML }}">{{ end }}
 
     {{ partial "projects/summary.html" (dict
         "context" .