diff --git a/_bluespice/patches/extensions/EmbedVideo/includes/EmbedVideo.php.diff b/_bluespice/patches/extensions/EmbedVideo/includes/EmbedVideo.php.diff
new file mode 100644
index 0000000000000..4da9385ed114b
--- /dev/null
+++ b/_bluespice/patches/extensions/EmbedVideo/includes/EmbedVideo.php.diff
@@ -0,0 +1,34 @@
+diff --git a/includes/EmbedVideo.php b/includes/EmbedVideo.php
+index bf41d2b..abd8ff8 100644
+--- a/includes/EmbedVideo.php
++++ b/includes/EmbedVideo.php
+@@ -427,6 +427,7 @@ class EmbedVideo {
+			'dimensions' => $dimensions,
+			'alignment' => $alignment,
+			'description' => $description,
++			'container' => $container,
+			'urlArgs' => $urlArgs,
+			'width' => $width,
+			'height' => $height,
+@@ -472,8 +473,8 @@ class EmbedVideo {
+			$this->setDescriptionNoParse( $description );
+		}
+ 
+-		if ( !$this->setContainer( $this->container ) ) {
+-			throw new InvalidArgumentException( $this->error( 'container', $this->container )[0] );
++		if ( !$this->setContainer( $container ) ) {
++			throw new InvalidArgumentException( $this->error( 'container', $container )[0] );
+		}
+ 
+		if ( !$this->setAlignment( $alignment ) ) {
+@@ -591,6 +592,10 @@ class EmbedVideo {
+		$serviceString = $embedService::getServiceName();
+		$styleString = '';
+ 
++		if ( $this->container === 'frame' ) {
++			$classString .= ' frame';
++		}
++
+		if ( $this->alignment !== false ) {
+			$classString .= sprintf( ' mw-halign-%s', $this->alignment );
+		}
diff --git a/_bluespice/patches/extensions/EmbedVideo/resources/ext.embedVideo.styles.less.diff b/_bluespice/patches/extensions/EmbedVideo/resources/ext.embedVideo.styles.less.diff
new file mode 100644
index 0000000000000..52f9a4b658f6f
--- /dev/null
+++ b/_bluespice/patches/extensions/EmbedVideo/resources/ext.embedVideo.styles.less.diff
@@ -0,0 +1,16 @@
+diff --git a/resources/ext.embedVideo.styles.less b/resources/ext.embedVideo.styles.less
+index 7cf9f20..e2940c5 100644
+--- a/resources/ext.embedVideo.styles.less
++++ b/resources/ext.embedVideo.styles.less
+@@ -45,6 +45,11 @@
+		}
+	}
+ 
++	&.frame {
++		border: 1px solid #c8ccd1;
++		padding: 3px;
++	}
++
+	// From core
+	// We can safely remove this when Parsoid becomes default
+	&.mw-halign-right {