diff --git a/internal/render/assets/base.css b/internal/render/assets/base.css
index e35f4c0..c1c70c4 100644
--- a/internal/render/assets/base.css
+++ b/internal/render/assets/base.css
@@ -447,6 +447,8 @@ html, body {
 }
 
 .image-caption-image {
+    width: 100%;
+    block-size: var(--image-caption-image-height);
     max-height: var(--image-caption-image-height);
     flex: 0 1 auto;
     min-height: 0;
@@ -455,6 +457,12 @@ html, body {
     justify-content: center;
 }
 
+.image-caption-image img {
+    width: 100%;
+    height: 100%;
+    object-fit: contain;
+}
+
 .image-caption-cta {
     position: static;
     margin-top: auto;
diff --git a/internal/render/template_test.go b/internal/render/template_test.go
index fea8523..9740d9c 100644
--- a/internal/render/template_test.go
+++ b/internal/render/template_test.go
@@ -525,7 +525,11 @@ func TestRenderHTMLImageCaptionRendersImageAndBodyWithoutBottomCTA(t *testing.T)
 		`display: flex;`,
 		`flex-direction: column;`,
 		`.image-caption-image {`,
+		`width: 100%;`,
+		`block-size: var(--image-caption-image-height);`,
 		`max-height: var(--image-caption-image-height);`,
+		`.image-caption-image img {`,
+		`height: 100%;`,
 		`.image-frame {`,
 		`padding: 0;`,
 		`overflow: hidden;`,
diff --git a/internal/render/testdata/golden-html/default-all-variants.sha256 b/internal/render/testdata/golden-html/default-all-variants.sha256
index 9c38f84..8685820 100644
--- a/internal/render/testdata/golden-html/default-all-variants.sha256
+++ b/internal/render/testdata/golden-html/default-all-variants.sha256
@@ -1 +1 @@
-a78e241f27875082086b1658bcd21c2d20718661bc6eca27da9e28d98b67c350
+85623c2e4d3eeef607d2f42072b7a134e8d01602c1010c79edf829697a97c0a9
diff --git a/internal/render/testdata/golden-html/default-author-global.sha256 b/internal/render/testdata/golden-html/default-author-global.sha256
index 15c8fb4..f830546 100644
--- a/internal/render/testdata/golden-html/default-author-global.sha256
+++ b/internal/render/testdata/golden-html/default-author-global.sha256
@@ -1 +1 @@
-4bc4986a5c2809d4496ca96b717e5390b6e94a4e06a3779d1439e069e7f73839
+7b0a1aa20dead4a3e77d27cb5d1857837ad6c929355683ebf03f02046e283fca
diff --git a/internal/render/testdata/golden-html/default-author-long.sha256 b/internal/render/testdata/golden-html/default-author-long.sha256
index 04961b1..a2cbe21 100644
--- a/internal/render/testdata/golden-html/default-author-long.sha256
+++ b/internal/render/testdata/golden-html/default-author-long.sha256
@@ -1 +1 @@
-5bba2ca3ed230be77699e1c96c5e4a9ada2a769b646436699707f1a79c840904
+b29409b6540a6f68206ea9b24b1b442eea01d0dcba68b125b087474d9763c791
diff --git a/internal/render/testdata/golden-html/default-author-none.sha256 b/internal/render/testdata/golden-html/default-author-none.sha256
index f5e61ab..6487832 100644
--- a/internal/render/testdata/golden-html/default-author-none.sha256
+++ b/internal/render/testdata/golden-html/default-author-none.sha256
@@ -1 +1 @@
-1d76b559e395e8feebb73b0062b93bab6d1afcc4db6c6c08ca4a09e07aa905f5
+472434e7df0ce90b3e5f7199e35e8fb30d4c6a35bbc7f86d8673d189c75ee5ef
diff --git a/internal/render/testdata/golden-html/default-author-override.sha256 b/internal/render/testdata/golden-html/default-author-override.sha256
index e30b595..533d013 100644
--- a/internal/render/testdata/golden-html/default-author-override.sha256
+++ b/internal/render/testdata/golden-html/default-author-override.sha256
@@ -1 +1 @@
-b6ad173ba2585dc01b6a787fad968e77ae9f62285cd5d001626c4a16bb37c815
+3861fb799f242a70539016b8e686372f4d350b5bba59ce65513a5420cc56b36a
diff --git a/internal/render/testdata/golden-html/default-semantic-highlight.sha256 b/internal/render/testdata/golden-html/default-semantic-highlight.sha256
index 8a982a7..b875ae5 100644
--- a/internal/render/testdata/golden-html/default-semantic-highlight.sha256
+++ b/internal/render/testdata/golden-html/default-semantic-highlight.sha256
@@ -1 +1 @@
-b7f7f1614a14b0c92dae57371f05e90b98d25d3b7f06efc83ae804b95157b200
+84567be4fc898da5546ac37886098f7b7b7fb718ec8af2d4d55053f9d0fc5480
diff --git a/internal/render/testdata/golden-html/editorial-cool-all-variants.sha256 b/internal/render/testdata/golden-html/editorial-cool-all-variants.sha256
index 46210e1..fbe25a8 100644
--- a/internal/render/testdata/golden-html/editorial-cool-all-variants.sha256
+++ b/internal/render/testdata/golden-html/editorial-cool-all-variants.sha256
@@ -1 +1 @@
-ca33e7ea7f6e2cdbd1dc2da7dc51023a381d907753b3a71b95dcef6d6b39d926
+84d8eca70ab129defdf04e28523bfef3e844ea929435f2185f7c7ac5d9674557
diff --git a/internal/render/testdata/golden-html/editorial-cool-semantic-highlight.sha256 b/internal/render/testdata/golden-html/editorial-cool-semantic-highlight.sha256
index 9964edc..0040c04 100644
--- a/internal/render/testdata/golden-html/editorial-cool-semantic-highlight.sha256
+++ b/internal/render/testdata/golden-html/editorial-cool-semantic-highlight.sha256
@@ -1 +1 @@
-b36549a487a1ef2ce90403b3ea5e4afd2b6c966f8dd2fd91f7cfa9e3645b0080
+f2d0419adba2ab1bd38b442b1797029428ca960a8123ece200cd7217f9a4978c
diff --git a/internal/render/testdata/golden-html/fresh-green-all-variants.sha256 b/internal/render/testdata/golden-html/fresh-green-all-variants.sha256
index 20406d2..3a967c3 100644
--- a/internal/render/testdata/golden-html/fresh-green-all-variants.sha256
+++ b/internal/render/testdata/golden-html/fresh-green-all-variants.sha256
@@ -1 +1 @@
-3f8ccdb1bf1df6f168b7912ea6f2978be0c7da3e55800845a1c7b6b04b5e59a1
+77d625f0d2df58e6fbb0e4c5e4e3e01a70ca00b3a10bd4b5b1c0bdc5640afb98
diff --git a/internal/render/testdata/golden-html/plum-ink-all-variants.sha256 b/internal/render/testdata/golden-html/plum-ink-all-variants.sha256
index af31200..897d920 100644
--- a/internal/render/testdata/golden-html/plum-ink-all-variants.sha256
+++ b/internal/render/testdata/golden-html/plum-ink-all-variants.sha256
@@ -1 +1 @@
-191cc710944d8bd71a9639aadbe8344f5c5e977a00cb452511e6979308235f1a
+b074a40d9689c1520bd9f665db7b85788858303bd7384c260f1654dd6d256982
diff --git a/internal/render/testdata/golden-html/sage-mist-all-variants.sha256 b/internal/render/testdata/golden-html/sage-mist-all-variants.sha256
index 3f68d1d..bafaec0 100644
--- a/internal/render/testdata/golden-html/sage-mist-all-variants.sha256
+++ b/internal/render/testdata/golden-html/sage-mist-all-variants.sha256
@@ -1 +1 @@
-9a07522cf7dec3154a49ccf57c9c0d24472fda59da88382df5bf38d4cff81e3b
+1fdfcdb47549b9ca3cae3e9666cc84d4c2f18e1a2078687ffc78d1abf6d9d54c
diff --git a/internal/render/testdata/golden-html/tech-noir-all-variants.sha256 b/internal/render/testdata/golden-html/tech-noir-all-variants.sha256
index 57a3e95..7266c08 100644
--- a/internal/render/testdata/golden-html/tech-noir-all-variants.sha256
+++ b/internal/render/testdata/golden-html/tech-noir-all-variants.sha256
@@ -1 +1 @@
-913aa9841faf64b701fc858a580108c03aa8cb0155be3a34ad6d5a934781e35a
+29efa7fd964d540ba0f8c68cc4f515956d02daf36bdc600460f001b99960f9b2
diff --git a/internal/render/testdata/golden-html/tech-noir-semantic-highlight.sha256 b/internal/render/testdata/golden-html/tech-noir-semantic-highlight.sha256
index 6916804..fbb1993 100644
--- a/internal/render/testdata/golden-html/tech-noir-semantic-highlight.sha256
+++ b/internal/render/testdata/golden-html/tech-noir-semantic-highlight.sha256
@@ -1 +1 @@
-05f9ee3af30eaa048a2c3e56b60834572df92f1790949dacc829eb1afa20ab11
+5b6d430d666222fe9812b082c484e25e43decd255903d9131bcbaa7055a42d83
diff --git a/internal/render/testdata/golden-html/warm-paper-all-variants.sha256 b/internal/render/testdata/golden-html/warm-paper-all-variants.sha256
index 08893e7..a1e81a8 100644
--- a/internal/render/testdata/golden-html/warm-paper-all-variants.sha256
+++ b/internal/render/testdata/golden-html/warm-paper-all-variants.sha256
@@ -1 +1 @@
-78d269a0673af5230beba5899c50c86eaf17f2889f349a30e324e73c5e77753e
+6d0e8bdfa166b4f3e1e8db10f77579be098be2fe56ab5348ec62c4e4a83427ff
diff --git a/internal/render/testdata/golden-html/warm-paper-semantic-highlight.sha256 b/internal/render/testdata/golden-html/warm-paper-semantic-highlight.sha256
index fad24c5..76b7175 100644
--- a/internal/render/testdata/golden-html/warm-paper-semantic-highlight.sha256
+++ b/internal/render/testdata/golden-html/warm-paper-semantic-highlight.sha256
@@ -1 +1 @@
-3632b84229a26e40861e2ae7ea8ab152cc8d64d3d1f73f3b4f9b2659ff832350
+e31208299ab8433fcc841efb2ef70eb0b062aa2ca856be8bb79cf5a82bff715d