diff --git a/lib/marked-renderer.js b/lib/marked-renderer.js
deleted file mode 100644
index f7f2b3da50..0000000000
--- a/lib/marked-renderer.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// A custom renderer that avoids wrapping <img> tags in <p> tags
-const { marked } = require('marked')
-
-class DesignSystemRenderer extends marked.Renderer {
-  paragraph (text) {
-    if (text.startsWith('<img')) {
-      return `${text}\n`
-    }
-    return super.paragraph(text)
-  }
-}
-
-module.exports = new DesignSystemRenderer()
diff --git a/lib/metalsmith.js b/lib/metalsmith.js
index b3c442a919..c953bc82a4 100644
--- a/lib/metalsmith.js
+++ b/lib/metalsmith.js
@@ -4,11 +4,11 @@ const metalsmith = require('metalsmith') // static site generator
 const assets = require('metalsmith-assets') // copy static assets
 const brokenLinkChecker = require('metalsmith-broken-link-checker')
 const titleChecker = require('./metalsmith-title-checker.js')
-const markedRenderer = require('./marked-renderer.js')
 const env = require('metalsmith-env') // environment vars plugin
 const hashAssets = require('metalsmith-fingerprint-ignore') // add hash to specified files and ignores files that match a pattern
 const inplace = require('@metalsmith/in-place') // render templating syntax in your source files
 const layouts = require('@metalsmith/layouts') // apply layouts to source files
+const tagcleaner = require('metalsmith-tagcleaner') // Use tag cleaner to remove <p> tags around images
 const permalinks = require('@metalsmith/permalinks') // apply a permalink pattern to files
 const canonical = require('metalsmith-canonical') // add a canonical url property to pages
 
@@ -233,11 +233,13 @@ module.exports = metalsmith(__dirname) // __dirname defined by node.js: name of
       gfm: true,
       tables: true,
       pedantic: true,
-      renderer: markedRenderer,
       highlight: highlighter
     }
   }))
 
+  // use tag cleaner to remove <p> tags around images
+  .use(tagcleaner())
+
   // apply a permalink pattern to files
   .use(permalinks({
     relative: false
diff --git a/package-lock.json b/package-lock.json
index 873b93275e..407d13c3df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,9 +38,9 @@
         "jest": "^27.2.3",
         "jest-puppeteer": "^4.1.1",
         "js-beautify": "^1.9.1",
-        "jstransformer-marked": "^1.2.0",
-        "jstransformer-nunjucks": "^1.1.0",
-        "marked": "^4.0.18",
+        "jstransformer-marked": "^1.0.3",
+        "jstransformer-nunjucks": "^0.5.0",
+        "marked": "^4.0.10",
         "metalsmith": "^2.5.0",
         "metalsmith-assets": "^0.1.0",
         "metalsmith-broken-link-checker": "^1.0.1",
@@ -49,6 +49,7 @@
         "metalsmith-env": "^2.2.0",
         "metalsmith-fingerprint-ignore": "^2.0.0",
         "metalsmith-rollup": "^2.0.0",
+        "metalsmith-tagcleaner": "0.0.2",
         "metalsmith-uglify": "^2.4.1",
         "nunjucks": "^3.2.2",
         "puppeteer": "^1.14.0",
@@ -9140,53 +9141,37 @@
       }
     },
     "node_modules/jstransformer-marked": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/jstransformer-marked/-/jstransformer-marked-1.2.0.tgz",
-      "integrity": "sha512-GWWtG0JSv0BfB6m9ZjlEO2fzctRop0YixdpQSm4mjGHzEqGjmsKABwinypgLWf+7x6RL6OV95xTlke0SzPswTg==",
-      "dev": true,
-      "dependencies": {
-        "marked": "^4.0.17"
-      },
-      "engines": {
-        "node": ">=8.17.0"
-      }
-    },
-    "node_modules/jstransformer-nunjucks": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jstransformer-nunjucks/-/jstransformer-nunjucks-1.1.0.tgz",
-      "integrity": "sha512-Dc9KXxs3mAV9Y30zijExThBNdMhr5E9EO7ShEJJ0prPbhs0H5iCH7+Ss8es1gVD5wJIhmmF5rD2TMGCZGaxj0Q==",
+      "version": "1.0.3",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "extend-shallow": "^3.0.2",
-        "nunjucks": "^3.2.3"
+        "marked": "^0.3.9"
       },
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=4"
       }
     },
-    "node_modules/jstransformer-nunjucks/node_modules/extend-shallow": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+    "node_modules/jstransformer-marked/node_modules/marked": {
+      "version": "0.3.19",
       "dev": true,
-      "dependencies": {
-        "assign-symbols": "^1.0.0",
-        "is-extendable": "^1.0.1"
+      "license": "MIT",
+      "bin": {
+        "marked": "bin/marked"
       },
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/jstransformer-nunjucks/node_modules/is-extendable": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+    "node_modules/jstransformer-nunjucks": {
+      "version": "0.5.0",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "is-plain-object": "^2.0.4"
+        "extend-shallow": "^2.0.1",
+        "nunjucks": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
     "node_modules/jsx-ast-utils": {
@@ -9559,10 +9544,9 @@
       }
     },
     "node_modules/marked": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.18.tgz",
-      "integrity": "sha512-wbLDJ7Zh0sqA0Vdg6aqlbT+yPxqLblpAZh1mK2+AO2twQkPywvvqQNfEPVwSSRjZ7dZcdeVBIAgiO7MMp3Dszw==",
+      "version": "4.0.10",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "marked": "bin/marked.js"
       },
@@ -9890,6 +9874,14 @@
         "rollup": "^0.58.1"
       }
     },
+    "node_modules/metalsmith-tagcleaner": {
+      "version": "0.0.2",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4.00"
+      }
+    },
     "node_modules/metalsmith-uglify": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/metalsmith-uglify/-/metalsmith-uglify-2.4.1.tgz",
@@ -10426,10 +10418,9 @@
       }
     },
     "node_modules/nunjucks": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.3.tgz",
-      "integrity": "sha512-psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ==",
+      "version": "3.2.2",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "a-sync-waterfall": "^1.0.0",
         "asap": "^2.0.3",
@@ -10441,13 +10432,51 @@
       "engines": {
         "node": ">= 6.9.0"
       },
-      "peerDependencies": {
+      "optionalDependencies": {
         "chokidar": "^3.3.0"
+      }
+    },
+    "node_modules/nunjucks/node_modules/anymatch": {
+      "version": "3.1.1",
+      "dev": true,
+      "license": "ISC",
+      "optional": true,
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
       },
-      "peerDependenciesMeta": {
-        "chokidar": {
-          "optional": true
-        }
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/nunjucks/node_modules/binary-extensions": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nunjucks/node_modules/chokidar": {
+      "version": "3.4.1",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "anymatch": "~3.1.1",
+        "braces": "~3.0.2",
+        "glob-parent": "~5.1.0",
+        "is-binary-path": "~2.1.0",
+        "is-glob": "~4.0.1",
+        "normalize-path": "~3.0.0",
+        "readdirp": "~3.4.0"
+      },
+      "engines": {
+        "node": ">= 8.10.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "~2.1.2"
       }
     },
     "node_modules/nunjucks/node_modules/commander": {
@@ -10458,6 +10487,39 @@
         "node": ">= 6"
       }
     },
+    "node_modules/nunjucks/node_modules/fsevents": {
+      "version": "2.1.3",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/nunjucks/node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nunjucks/node_modules/normalize-path": {
+      "version": "3.0.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/nwsapi": {
       "version": "2.2.0",
       "dev": true,
@@ -11468,6 +11530,18 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/readdirp": {
+      "version": "3.4.0",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "picomatch": "^2.2.1"
+      },
+      "engines": {
+        "node": ">=8.10.0"
+      }
+    },
     "node_modules/redent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
@@ -20561,43 +20635,24 @@
       }
     },
     "jstransformer-marked": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/jstransformer-marked/-/jstransformer-marked-1.2.0.tgz",
-      "integrity": "sha512-GWWtG0JSv0BfB6m9ZjlEO2fzctRop0YixdpQSm4mjGHzEqGjmsKABwinypgLWf+7x6RL6OV95xTlke0SzPswTg==",
+      "version": "1.0.3",
       "dev": true,
       "requires": {
-        "marked": "^4.0.17"
+        "marked": "^0.3.9"
+      },
+      "dependencies": {
+        "marked": {
+          "version": "0.3.19",
+          "dev": true
+        }
       }
     },
     "jstransformer-nunjucks": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/jstransformer-nunjucks/-/jstransformer-nunjucks-1.1.0.tgz",
-      "integrity": "sha512-Dc9KXxs3mAV9Y30zijExThBNdMhr5E9EO7ShEJJ0prPbhs0H5iCH7+Ss8es1gVD5wJIhmmF5rD2TMGCZGaxj0Q==",
+      "version": "0.5.0",
       "dev": true,
       "requires": {
-        "extend-shallow": "^3.0.2",
-        "nunjucks": "^3.2.3"
-      },
-      "dependencies": {
-        "extend-shallow": {
-          "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
-          "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
-          "dev": true,
-          "requires": {
-            "assign-symbols": "^1.0.0",
-            "is-extendable": "^1.0.1"
-          }
-        },
-        "is-extendable": {
-          "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
-          "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
-          "dev": true,
-          "requires": {
-            "is-plain-object": "^2.0.4"
-          }
-        }
+        "extend-shallow": "^2.0.1",
+        "nunjucks": "^3.0.0"
       }
     },
     "jsx-ast-utils": {
@@ -20854,9 +20909,7 @@
       }
     },
     "marked": {
-      "version": "4.0.18",
-      "resolved": "https://registry.npmjs.org/marked/-/marked-4.0.18.tgz",
-      "integrity": "sha512-wbLDJ7Zh0sqA0Vdg6aqlbT+yPxqLblpAZh1mK2+AO2twQkPywvvqQNfEPVwSSRjZ7dZcdeVBIAgiO7MMp3Dszw==",
+      "version": "4.0.10",
       "dev": true
     },
     "mathml-tag-names": {
@@ -21149,6 +21202,10 @@
         "rollup": "^0.58.1"
       }
     },
+    "metalsmith-tagcleaner": {
+      "version": "0.0.2",
+      "dev": true
+    },
     "metalsmith-uglify": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/metalsmith-uglify/-/metalsmith-uglify-2.4.1.tgz",
@@ -21469,19 +21526,65 @@
       "version": "1.0.1"
     },
     "nunjucks": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/nunjucks/-/nunjucks-3.2.3.tgz",
-      "integrity": "sha512-psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ==",
+      "version": "3.2.2",
       "dev": true,
       "requires": {
         "a-sync-waterfall": "^1.0.0",
         "asap": "^2.0.3",
+        "chokidar": "^3.3.0",
         "commander": "^5.1.0"
       },
       "dependencies": {
+        "anymatch": {
+          "version": "3.1.1",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "normalize-path": "^3.0.0",
+            "picomatch": "^2.0.4"
+          }
+        },
+        "binary-extensions": {
+          "version": "2.1.0",
+          "dev": true,
+          "optional": true
+        },
+        "chokidar": {
+          "version": "3.4.1",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "anymatch": "~3.1.1",
+            "braces": "~3.0.2",
+            "fsevents": "~2.1.2",
+            "glob-parent": "~5.1.0",
+            "is-binary-path": "~2.1.0",
+            "is-glob": "~4.0.1",
+            "normalize-path": "~3.0.0",
+            "readdirp": "~3.4.0"
+          }
+        },
         "commander": {
           "version": "5.1.0",
           "dev": true
+        },
+        "fsevents": {
+          "version": "2.1.3",
+          "dev": true,
+          "optional": true
+        },
+        "is-binary-path": {
+          "version": "2.1.0",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "binary-extensions": "^2.0.0"
+          }
+        },
+        "normalize-path": {
+          "version": "3.0.0",
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -22147,6 +22250,14 @@
         }
       }
     },
+    "readdirp": {
+      "version": "3.4.0",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "picomatch": "^2.2.1"
+      }
+    },
     "redent": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
diff --git a/package.json b/package.json
index 74379d2961..0f0332b81b 100644
--- a/package.json
+++ b/package.json
@@ -58,9 +58,9 @@
     "jest": "^27.2.3",
     "jest-puppeteer": "^4.1.1",
     "js-beautify": "^1.9.1",
-    "jstransformer-marked": "^1.2.0",
-    "jstransformer-nunjucks": "^1.1.0",
-    "marked": "^4.0.18",
+    "jstransformer-marked": "^1.0.3",
+    "jstransformer-nunjucks": "^0.5.0",
+    "marked": "^4.0.10",
     "metalsmith": "^2.5.0",
     "metalsmith-assets": "^0.1.0",
     "metalsmith-broken-link-checker": "^1.0.1",
@@ -69,6 +69,7 @@
     "metalsmith-env": "^2.2.0",
     "metalsmith-fingerprint-ignore": "^2.0.0",
     "metalsmith-rollup": "^2.0.0",
+    "metalsmith-tagcleaner": "0.0.2",
     "metalsmith-uglify": "^2.4.1",
     "nunjucks": "^3.2.2",
     "puppeteer": "^1.14.0",