diff --git a/packages/block-library/src/pullquote/editor.scss b/packages/block-library/src/pullquote/editor.scss
index b2fc97541bda99..40b690079cae22 100644
--- a/packages/block-library/src/pullquote/editor.scss
+++ b/packages/block-library/src/pullquote/editor.scss
@@ -9,7 +9,7 @@
 }
 
 .wp-block-pullquote {
-	cite .editor-rich-text__tinymce[data-is-empty="true"]::before {
+	footer .editor-rich-text__tinymce[data-is-empty="true"]::before {
 		font-size: 14px;
 		font-family: $default-font;
 	}
diff --git a/packages/block-library/src/pullquote/index.js b/packages/block-library/src/pullquote/index.js
index 539308618793df..fee8dd78cd371f 100644
--- a/packages/block-library/src/pullquote/index.js
+++ b/packages/block-library/src/pullquote/index.js
@@ -29,7 +29,7 @@ const blockAttributes = {
 	citation: {
 		type: 'array',
 		source: 'children',
-		selector: 'cite',
+		selector: 'footer cite',
 	},
 };
 
@@ -70,6 +70,7 @@ export const settings = {
 				/>
 				{ ( ! RichText.isEmpty( citation ) || isSelected ) && (
 					<RichText
+						tagName="footer"
 						value={ citation }
 						/* translators: the individual or entity quoted */
 						placeholder={ __( 'Write citation…' ) }
@@ -78,7 +79,6 @@ export const settings = {
 								citation: nextCitation,
 							} )
 						}
-						className="wp-block-pullquote__citation"
 					/>
 				) }
 			</blockquote>
@@ -91,34 +91,61 @@ export const settings = {
 		return (
 			<blockquote>
 				<RichText.Content value={ toRichTextValue( value ) } />
-				{ ! RichText.isEmpty( citation ) && <RichText.Content tagName="cite" value={ citation } /> }
+				{ ! RichText.isEmpty( citation ) && (
+					<footer>
+						<RichText.Content tagName="cite" value={ citation } />
+					</footer>
+				) }
 			</blockquote>
 		);
 	},
 
-	deprecated: [ {
-		attributes: {
-			...blockAttributes,
-			citation: {
-				type: 'array',
-				source: 'children',
-				selector: 'footer',
+	deprecated: [
+		{
+			attributes: {
+				...blockAttributes,
+				citation: {
+					type: 'array',
+					source: 'children',
+					selector: 'footer',
+				},
+				align: {
+					type: 'string',
+					default: 'none',
+				},
 			},
-			align: {
-				type: 'string',
-				default: 'none',
+
+			save( { attributes } ) {
+				const { value, citation, align } = attributes;
+
+				return (
+					<blockquote className={ `align${ align }` }>
+						<RichText.Content value={ toRichTextValue( value ) } />
+						{ ! RichText.isEmpty( citation ) && <RichText.Content tagName="footer" value={ citation } /> }
+					</blockquote>
+				);
 			},
 		},
+		{
+			attributes: {
+				...blockAttributes,
+				citation: {
+					type: 'array',
+					source: 'children',
+					selector: 'cite',
+				},
+			},
 
-		save( { attributes } ) {
-			const { value, citation, align } = attributes;
+			save( { attributes } ) {
+				const { value, citation } = attributes;
 
-			return (
-				<blockquote className={ `align${ align }` }>
-					<RichText.Content value={ toRichTextValue( value ) } />
-					{ ! RichText.isEmpty( citation ) && <RichText.Content tagName="footer" value={ citation } /> }
-				</blockquote>
-			);
+				return (
+					<blockquote>
+						<RichText.Content value={ toRichTextValue( value ) } />
+						{ ! RichText.isEmpty( citation ) && <RichText.Content tagName="cite" value={ citation } /> }
+					</blockquote>
+				);
+			},
 		},
-	} ],
+	],
 };
diff --git a/packages/block-library/src/pullquote/style.scss b/packages/block-library/src/pullquote/style.scss
index 2467adff4e5437..e96b597abc1720 100644
--- a/packages/block-library/src/pullquote/style.scss
+++ b/packages/block-library/src/pullquote/style.scss
@@ -16,7 +16,6 @@
 		line-height: 1.6;
 	}
 
-	cite,
 	footer {
 		position: relative;
 	}
diff --git a/packages/block-library/src/pullquote/theme.scss b/packages/block-library/src/pullquote/theme.scss
index 178d8b0fd2763a..ab64c05a3da64f 100644
--- a/packages/block-library/src/pullquote/theme.scss
+++ b/packages/block-library/src/pullquote/theme.scss
@@ -3,9 +3,7 @@
 	border-bottom: 4px solid $dark-gray-500;
 	color: $dark-gray-600;
 
-	cite,
-	footer,
-	&__citation {
+	footer {
 		color: $dark-gray-600;
 		text-transform: uppercase;
 		font-size: $default-font-size;
diff --git a/packages/block-library/src/quote/editor.scss b/packages/block-library/src/quote/editor.scss
index 3826e0a998b3e8..fcddde33f04b85 100644
--- a/packages/block-library/src/quote/editor.scss
+++ b/packages/block-library/src/quote/editor.scss
@@ -1,7 +1,7 @@
 .wp-block-quote {
 	margin: 0;
 
-	&__citation {
+	footer {
 		font-size: $default-font-size;
 	}
 }
diff --git a/packages/block-library/src/quote/index.js b/packages/block-library/src/quote/index.js
index fa20247122dd42..34d50aa929b2e2 100644
--- a/packages/block-library/src/quote/index.js
+++ b/packages/block-library/src/quote/index.js
@@ -35,7 +35,7 @@ const blockAttributes = {
 	citation: {
 		type: 'array',
 		source: 'children',
-		selector: 'cite',
+		selector: 'footer cite',
 	},
 	align: {
 		type: 'string',
@@ -205,6 +205,7 @@ export const settings = {
 					/>
 					{ ( ! RichText.isEmpty( citation ) || isSelected ) && (
 						<RichText
+							tagName="footer"
 							value={ citation }
 							onChange={
 								( nextCitation ) => setAttributes( {
@@ -213,7 +214,6 @@ export const settings = {
 							}
 							/* translators: the individual or entity quoted */
 							placeholder={ __( 'Write citation…' ) }
-							className="wp-block-quote__citation"
 						/>
 					) }
 				</blockquote>
@@ -227,7 +227,11 @@ export const settings = {
 		return (
 			<blockquote style={ { textAlign: align ? align : null } }>
 				<RichText.Content value={ toRichTextValue( value ) } />
-				{ ! RichText.isEmpty( citation ) && <RichText.Content tagName="cite" value={ citation } /> }
+				{ ! RichText.isEmpty( citation ) && (
+					<footer>
+						<RichText.Content tagName="cite" value={ citation } />
+					</footer>
+				) }
 			</blockquote>
 		);
 	},
@@ -295,5 +299,26 @@ export const settings = {
 				);
 			},
 		},
+		{
+			attributes: {
+				...blockAttributes,
+				citation: {
+					type: 'array',
+					source: 'children',
+					selector: 'cite',
+				},
+			},
+
+			save( { attributes } ) {
+				const { align, value, citation } = attributes;
+
+				return (
+					<blockquote style={ { textAlign: align ? align : null } }>
+						<RichText.Content value={ toRichTextValue( value ) } />
+						{ ! RichText.isEmpty( citation ) && <RichText.Content tagName="cite" value={ citation } /> }
+					</blockquote>
+				);
+			},
+		},
 	],
 };
diff --git a/packages/block-library/src/quote/style.scss b/packages/block-library/src/quote/style.scss
index c1206d68958f7b..9b85df9fb9cc1e 100644
--- a/packages/block-library/src/quote/style.scss
+++ b/packages/block-library/src/quote/style.scss
@@ -10,7 +10,6 @@
 			line-height: 1.6;
 		}
 
-		cite,
 		footer {
 			font-size: 18px;
 			text-align: right;
diff --git a/packages/block-library/src/quote/theme.scss b/packages/block-library/src/quote/theme.scss
index 8fbe1ef7b3b210..69735be6aa44af 100644
--- a/packages/block-library/src/quote/theme.scss
+++ b/packages/block-library/src/quote/theme.scss
@@ -1,9 +1,7 @@
 .wp-block-quote {
 	margin: 20px 0;
 
-	cite,
-	footer,
-	&__citation {
+	footer {
 		color: $dark-gray-300;
 		font-size: $default-font-size;
 		margin-top: 1em;
diff --git a/test/integration/full-content/fixtures/core__pullquote.html b/test/integration/full-content/fixtures/core__pullquote.html
index 8c13cedfe000dc..98ea0162c593c3 100644
--- a/test/integration/full-content/fixtures/core__pullquote.html
+++ b/test/integration/full-content/fixtures/core__pullquote.html
@@ -1,5 +1,6 @@
 <!-- wp:core/pullquote -->
 <blockquote class="wp-block-pullquote">
-<p>Testing pullquote block...</p><cite>...with a caption</cite>
+<p>Testing pullquote block...</p>
+<footer><cite>...with a caption</cite></footer>
 </blockquote>
 <!-- /wp:core/pullquote -->
diff --git a/test/integration/full-content/fixtures/core__pullquote.json b/test/integration/full-content/fixtures/core__pullquote.json
index 11d576614228cd..3d6cf6f2e519f9 100644
--- a/test/integration/full-content/fixtures/core__pullquote.json
+++ b/test/integration/full-content/fixtures/core__pullquote.json
@@ -21,6 +21,6 @@
             ]
         },
         "innerBlocks": [],
-        "originalContent": "<blockquote class=\"wp-block-pullquote\">\n<p>Testing pullquote block...</p><cite>...with a caption</cite>\n</blockquote>"
+        "originalContent": "<blockquote class=\"wp-block-pullquote\">\n<p>Testing pullquote block...</p>\n<footer><cite>...with a caption</cite></footer>\n</blockquote>"
     }
 ]
diff --git a/test/integration/full-content/fixtures/core__pullquote.parsed.json b/test/integration/full-content/fixtures/core__pullquote.parsed.json
index c8d7f7c3c2dd61..747f7f7b459bf3 100644
--- a/test/integration/full-content/fixtures/core__pullquote.parsed.json
+++ b/test/integration/full-content/fixtures/core__pullquote.parsed.json
@@ -3,7 +3,7 @@
         "blockName": "core/pullquote",
         "attrs": null,
         "innerBlocks": [],
-        "innerHTML": "\n<blockquote class=\"wp-block-pullquote\">\n<p>Testing pullquote block...</p><cite>...with a caption</cite>\n</blockquote>\n"
+        "innerHTML": "\n<blockquote class=\"wp-block-pullquote\">\n<p>Testing pullquote block...</p>\n<footer><cite>...with a caption</cite></footer>\n</blockquote>\n"
     },
     {
         "attrs": {},
diff --git a/test/integration/full-content/fixtures/core__pullquote.serialized.html b/test/integration/full-content/fixtures/core__pullquote.serialized.html
index 00f47cf0d5e399..e16f7f588e0832 100644
--- a/test/integration/full-content/fixtures/core__pullquote.serialized.html
+++ b/test/integration/full-content/fixtures/core__pullquote.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:pullquote -->
-<blockquote class="wp-block-pullquote"><p>Testing pullquote block...</p><cite>...with a caption</cite></blockquote>
+<blockquote class="wp-block-pullquote"><p>Testing pullquote block...</p><footer><cite>...with a caption</cite></footer></blockquote>
 <!-- /wp:pullquote -->
diff --git a/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.html b/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.html
index 252b029f1f888d..deccea0769e47d 100644
--- a/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.html
+++ b/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.html
@@ -2,6 +2,8 @@
 <blockquote class="wp-block-pullquote">
     <p>Paragraph <strong>one</strong></p>
     <p>Paragraph two</p>
-    <cite>by whomever</cite>
+    <footer>
+        <cite>by whomever</cite>
+    </footer>
 </blockquote>
 <!-- /wp:core/pullquote -->
diff --git a/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.json b/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.json
index 266568fa51bc00..3906e678c7b327 100644
--- a/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.json
+++ b/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.json
@@ -39,6 +39,6 @@
             ]
         },
         "innerBlocks": [],
-        "originalContent": "<blockquote class=\"wp-block-pullquote\">\n    <p>Paragraph <strong>one</strong></p>\n    <p>Paragraph two</p>\n    <cite>by whomever</cite>\n</blockquote>"
+        "originalContent": "<blockquote class=\"wp-block-pullquote\">\n    <p>Paragraph <strong>one</strong></p>\n    <p>Paragraph two</p>\n    <footer>\n        <cite>by whomever</cite>\n    </footer>\n</blockquote>"
     }
 ]
diff --git a/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.parsed.json b/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.parsed.json
index 2a816764b3ae4d..7de20dcddde308 100644
--- a/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.parsed.json
+++ b/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.parsed.json
@@ -3,7 +3,7 @@
         "blockName": "core/pullquote",
         "attrs": null,
         "innerBlocks": [],
-        "innerHTML": "\n<blockquote class=\"wp-block-pullquote\">\n    <p>Paragraph <strong>one</strong></p>\n    <p>Paragraph two</p>\n    <cite>by whomever</cite>\n</blockquote>\n"
+        "innerHTML": "\n<blockquote class=\"wp-block-pullquote\">\n    <p>Paragraph <strong>one</strong></p>\n    <p>Paragraph two</p>\n    <footer>\n        <cite>by whomever</cite>\n    </footer>\n</blockquote>\n"
     },
     {
         "attrs": {},
diff --git a/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.serialized.html b/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.serialized.html
index 635df56edcf4f7..e677248677b72f 100644
--- a/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.serialized.html
+++ b/test/integration/full-content/fixtures/core__pullquote__multi-paragraph.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:pullquote -->
-<blockquote class="wp-block-pullquote"><p>Paragraph <strong>one</strong></p><p>Paragraph two</p><cite>by whomever</cite></blockquote>
+<blockquote class="wp-block-pullquote"><p>Paragraph <strong>one</strong></p><p>Paragraph two</p><footer><cite>by whomever</cite></footer></blockquote>
 <!-- /wp:pullquote -->
diff --git a/test/integration/full-content/fixtures/core__quote__style-1.html b/test/integration/full-content/fixtures/core__quote__style-1.html
index 4bfd0ef80e5d49..aa57c1f01f8693 100644
--- a/test/integration/full-content/fixtures/core__quote__style-1.html
+++ b/test/integration/full-content/fixtures/core__quote__style-1.html
@@ -1,3 +1,3 @@
 <!-- wp:core/quote -->
-<blockquote class="wp-block-quote"><p>The editor will endeavour to create a new page and post building experience that makes writing rich posts effortless, and has “blocks” to make it easy what today might take shortcodes, custom HTML, or “mystery meat” embed discovery.</p><cite>Matt Mullenweg, 2017</cite></blockquote>
+<blockquote class="wp-block-quote"><p>The editor will endeavour to create a new page and post building experience that makes writing rich posts effortless, and has “blocks” to make it easy what today might take shortcodes, custom HTML, or “mystery meat” embed discovery.</p><footer><cite>Matt Mullenweg, 2017</cite></footer></blockquote>
 <!-- /wp:core/quote -->
diff --git a/test/integration/full-content/fixtures/core__quote__style-1.json b/test/integration/full-content/fixtures/core__quote__style-1.json
index 67722f404cd0ae..4b481d7f7e0efd 100644
--- a/test/integration/full-content/fixtures/core__quote__style-1.json
+++ b/test/integration/full-content/fixtures/core__quote__style-1.json
@@ -21,6 +21,6 @@
             ]
         },
         "innerBlocks": [],
-        "originalContent": "<blockquote class=\"wp-block-quote\"><p>The editor will endeavour to create a new page and post building experience that makes writing rich posts effortless, and has “blocks” to make it easy what today might take shortcodes, custom HTML, or “mystery meat” embed discovery.</p><cite>Matt Mullenweg, 2017</cite></blockquote>"
+        "originalContent": "<blockquote class=\"wp-block-quote\"><p>The editor will endeavour to create a new page and post building experience that makes writing rich posts effortless, and has “blocks” to make it easy what today might take shortcodes, custom HTML, or “mystery meat” embed discovery.</p><footer><cite>Matt Mullenweg, 2017</cite></footer></blockquote>"
     }
 ]
diff --git a/test/integration/full-content/fixtures/core__quote__style-1.parsed.json b/test/integration/full-content/fixtures/core__quote__style-1.parsed.json
index 09553fed152dbc..fdc7f67dde3864 100644
--- a/test/integration/full-content/fixtures/core__quote__style-1.parsed.json
+++ b/test/integration/full-content/fixtures/core__quote__style-1.parsed.json
@@ -3,7 +3,7 @@
         "blockName": "core/quote",
         "attrs": null,
         "innerBlocks": [],
-        "innerHTML": "\n<blockquote class=\"wp-block-quote\"><p>The editor will endeavour to create a new page and post building experience that makes writing rich posts effortless, and has “blocks” to make it easy what today might take shortcodes, custom HTML, or “mystery meat” embed discovery.</p><cite>Matt Mullenweg, 2017</cite></blockquote>\n"
+        "innerHTML": "\n<blockquote class=\"wp-block-quote\"><p>The editor will endeavour to create a new page and post building experience that makes writing rich posts effortless, and has “blocks” to make it easy what today might take shortcodes, custom HTML, or “mystery meat” embed discovery.</p><footer><cite>Matt Mullenweg, 2017</cite></footer></blockquote>\n"
     },
     {
         "attrs": {},
diff --git a/test/integration/full-content/fixtures/core__quote__style-1.serialized.html b/test/integration/full-content/fixtures/core__quote__style-1.serialized.html
index 4268c4139854e7..516ad89534bc3c 100644
--- a/test/integration/full-content/fixtures/core__quote__style-1.serialized.html
+++ b/test/integration/full-content/fixtures/core__quote__style-1.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:quote -->
-<blockquote class="wp-block-quote"><p>The editor will endeavour to create a new page and post building experience that makes writing rich posts effortless, and has “blocks” to make it easy what today might take shortcodes, custom HTML, or “mystery meat” embed discovery.</p><cite>Matt Mullenweg, 2017</cite></blockquote>
+<blockquote class="wp-block-quote"><p>The editor will endeavour to create a new page and post building experience that makes writing rich posts effortless, and has “blocks” to make it easy what today might take shortcodes, custom HTML, or “mystery meat” embed discovery.</p><footer><cite>Matt Mullenweg, 2017</cite></footer></blockquote>
 <!-- /wp:quote -->
diff --git a/test/integration/full-content/fixtures/core__quote__style-2.html b/test/integration/full-content/fixtures/core__quote__style-2.html
index d4ecdca350df1b..46fff5242370d9 100644
--- a/test/integration/full-content/fixtures/core__quote__style-2.html
+++ b/test/integration/full-content/fixtures/core__quote__style-2.html
@@ -1,3 +1,3 @@
 <!-- wp:core/quote {"className":"is-style-large"} -->
-<blockquote class="wp-block-quote is-style-large"><p>There is no greater agony than bearing an untold story inside you.</p><cite>Maya Angelou</cite></blockquote>
+<blockquote class="wp-block-quote is-style-large"><p>There is no greater agony than bearing an untold story inside you.</p><footer><cite>Maya Angelou</cite></footer></blockquote>
 <!-- /wp:core/quote -->
diff --git a/test/integration/full-content/fixtures/core__quote__style-2.json b/test/integration/full-content/fixtures/core__quote__style-2.json
index ebf72ece861815..caf4b3aed1fc8c 100644
--- a/test/integration/full-content/fixtures/core__quote__style-2.json
+++ b/test/integration/full-content/fixtures/core__quote__style-2.json
@@ -22,6 +22,6 @@
             "className": "is-style-large"
         },
         "innerBlocks": [],
-        "originalContent": "<blockquote class=\"wp-block-quote is-style-large\"><p>There is no greater agony than bearing an untold story inside you.</p><cite>Maya Angelou</cite></blockquote>"
+        "originalContent": "<blockquote class=\"wp-block-quote is-style-large\"><p>There is no greater agony than bearing an untold story inside you.</p><footer><cite>Maya Angelou</cite></footer></blockquote>"
     }
 ]
diff --git a/test/integration/full-content/fixtures/core__quote__style-2.parsed.json b/test/integration/full-content/fixtures/core__quote__style-2.parsed.json
index d1098fffcdf0af..e6cc668c7d4ee4 100644
--- a/test/integration/full-content/fixtures/core__quote__style-2.parsed.json
+++ b/test/integration/full-content/fixtures/core__quote__style-2.parsed.json
@@ -5,7 +5,7 @@
             "className": "is-style-large"
         },
         "innerBlocks": [],
-        "innerHTML": "\n<blockquote class=\"wp-block-quote is-style-large\"><p>There is no greater agony than bearing an untold story inside you.</p><cite>Maya Angelou</cite></blockquote>\n"
+        "innerHTML": "\n<blockquote class=\"wp-block-quote is-style-large\"><p>There is no greater agony than bearing an untold story inside you.</p><footer><cite>Maya Angelou</cite></footer></blockquote>\n"
     },
     {
         "attrs": {},
diff --git a/test/integration/full-content/fixtures/core__quote__style-2.serialized.html b/test/integration/full-content/fixtures/core__quote__style-2.serialized.html
index b257de24088e9a..a97ba58d129100 100644
--- a/test/integration/full-content/fixtures/core__quote__style-2.serialized.html
+++ b/test/integration/full-content/fixtures/core__quote__style-2.serialized.html
@@ -1,3 +1,3 @@
 <!-- wp:quote {"className":"is-style-large"} -->
-<blockquote class="wp-block-quote is-style-large"><p>There is no greater agony than bearing an untold story inside you.</p><cite>Maya Angelou</cite></blockquote>
+<blockquote class="wp-block-quote is-style-large"><p>There is no greater agony than bearing an untold story inside you.</p><footer><cite>Maya Angelou</cite></footer></blockquote>
 <!-- /wp:quote -->