diff --git a/layouts/_default/_markup/render-image.html b/layouts/_default/_markup/render-image.html
index 500fc908ed..0bda2dd528 100644
--- a/layouts/_default/_markup/render-image.html
+++ b/layouts/_default/_markup/render-image.html
@@ -1,6 +1,14 @@
+{{- $version := split hugo.Version "." }}
+{{- $major := int (index $version 0) }}
+{{- $minor := int (index $version 1) }}
+{{- $id := "" }}
+{{- if and (ge $major 0) (ge $major 108) }}
+  {{- $id = .Ordinal }}
+{{- end }}
 {{- partial "shortcodes/image.html" (dict
   "context" .Page
   "url" .Destination
   "title" .Title
   "alt" .Text
+  "id" $id
 ) }}
\ No newline at end of file
diff --git a/layouts/partials/shortcodes/expand.html b/layouts/partials/shortcodes/expand.html
index a5c29ccd0b..d9132e3907 100644
--- a/layouts/partials/shortcodes/expand.html
+++ b/layouts/partials/shortcodes/expand.html
@@ -6,8 +6,8 @@
 {{- if eq (printf "%T" $expanded) "string" }}
 	{{- $expanded = (eq $expanded "true") }}
 {{- end }}
+{{- $id := cond (or (eq .id nil) (eq .id "")) (partial "make-random-md5.hugo") .id }}
 {{- with $context }}
-{{- $id := partial "make-random-md5.hugo" }}
 <div class="expand">
     <input type="checkbox" id="expand-{{ $id }}" aria-controls="expandcontent-{{ $id }}" {{ if $expanded }} checked{{ end }}>
     <label class="expand-label" for="expand-{{ $id }}" >
diff --git a/layouts/partials/shortcodes/image.html b/layouts/partials/shortcodes/image.html
index 1c28623420..5d28e57b35 100644
--- a/layouts/partials/shortcodes/image.html
+++ b/layouts/partials/shortcodes/image.html
@@ -33,7 +33,7 @@
 		{{ $width = . }}
 	{{- end }}
 {{- end }}
-{{- $id := partial "make-random-md5.hugo" }}
+{{- $id := cond (or (eq .id nil) (eq .id "")) (partial "make-random-md5.hugo") .id }}
 {{- if $lightbox }}
 <a href="#image-{{ $id }}" class="lightbox-link">
 {{- end }}
diff --git a/layouts/shortcodes/expand.html b/layouts/shortcodes/expand.html
index 581acd7128..92907e3bae 100644
--- a/layouts/shortcodes/expand.html
+++ b/layouts/shortcodes/expand.html
@@ -4,4 +4,5 @@
   "content" .Inner
   "open"    (.Get "open" | default (.Get 1))
   "title"   (.Get "title" | default (.Get 0))
+  "id"      .Ordinal
 ) }}
\ No newline at end of file