diff --git a/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/EmbeddableTagValueNode.php b/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/EmbeddableTagValueNode.php
new file mode 100644
index 000000000000..da18b9769d58
--- /dev/null
+++ b/packages/better-php-doc-parser/src/PhpDocNode/Doctrine/Class_/EmbeddableTagValueNode.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\BetterPhpDocParser\PhpDocNode\Doctrine\Class_;
+
+use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\AbstractDoctrineTagValueNode;
+
+final class EmbeddableTagValueNode extends AbstractDoctrineTagValueNode
+{
+    public function __construct(string $originalContent)
+    {
+        $this->resolveOriginalContentSpacingAndOrder($originalContent);
+    }
+
+    public function __toString(): string
+    {
+        return $this->originalContent;
+    }
+
+    public function getShortName(): string
+    {
+        return '@ORM\Embeddable';
+    }
+}
diff --git a/packages/better-php-doc-parser/src/PhpDocNodeFactory/Doctrine/Class_/EmbeddablePhpDocNodeFactory.php b/packages/better-php-doc-parser/src/PhpDocNodeFactory/Doctrine/Class_/EmbeddablePhpDocNodeFactory.php
new file mode 100644
index 000000000000..693bc13254ed
--- /dev/null
+++ b/packages/better-php-doc-parser/src/PhpDocNodeFactory/Doctrine/Class_/EmbeddablePhpDocNodeFactory.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Rector\BetterPhpDocParser\PhpDocNodeFactory\Doctrine\Class_;
+
+use Doctrine\ORM\Mapping\Embeddable;
+use PhpParser\Node;
+use PhpParser\Node\Stmt\Class_;
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagValueNode;
+use PHPStan\PhpDocParser\Parser\TokenIterator;
+use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\Class_\EmbeddableTagValueNode;
+use Rector\BetterPhpDocParser\PhpDocNodeFactory\AbstractPhpDocNodeFactory;
+use Rector\Core\Exception\ShouldNotHappenException;
+
+final class EmbeddablePhpDocNodeFactory extends AbstractPhpDocNodeFactory
+{
+    public function getClass(): string
+    {
+        return Embeddable::class;
+    }
+
+    public function createFromNodeAndTokens(Node $node, TokenIterator $tokenIterator): ?PhpDocTagValueNode
+    {
+        if (! $node instanceof Class_) {
+            throw new ShouldNotHappenException();
+        }
+
+        /** @var Embeddable|null $entity */
+        $entity = $this->nodeAnnotationReader->readClassAnnotation($node, $this->getClass());
+        if ($entity === null) {
+            return null;
+        }
+
+        $annotationContent = $this->resolveContentFromTokenIterator($tokenIterator);
+
+        return new EmbeddableTagValueNode($annotationContent);
+    }
+}
diff --git a/phpstan.neon b/phpstan.neon
index 08e78594872a..0a7448837346 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -246,8 +246,7 @@ parameters:
         - '#Right side of && is always true#'
         - '#Parameter \#(.*?) (.*?) of class PhpParser\\Node\\Expr\\BinaryOp\\(.*?) constructor expects PhpParser\\Node\\Expr, PhpParser\\Node given#'
 
-        - '#Method Rector\\BetterPhpDocParser\\PhpDocNode\\JMS\\JMSInjectParamsTagValueNode\:\:__toString\(\) should return string but returns string\|null#'
-        - '#Method Rector\\BetterPhpDocParser\\PhpDocNode\\JMS\\JMSServiceValueNode\:\:__toString\(\) should return string but returns string\|null#'
+        - '#Method Rector\\(.*?)\:\:__toString\(\) should return string but returns string\|null#'
 
         - '#Strict comparison using \=\=\= between mixed and (.*?) will always evaluate to false#'
         - '#Parameter \#1 \$c of method Rector\\Php70\\EregToPcreTransformer\:\:_ere2pcre_escape\(\) expects string, mixed given#'
diff --git a/rules/doctrine/src/PhpDocParser/DoctrineDocBlockResolver.php b/rules/doctrine/src/PhpDocParser/DoctrineDocBlockResolver.php
index 46dc9c3ff464..8933a0ada2da 100644
--- a/rules/doctrine/src/PhpDocParser/DoctrineDocBlockResolver.php
+++ b/rules/doctrine/src/PhpDocParser/DoctrineDocBlockResolver.php
@@ -10,6 +10,7 @@
 use PhpParser\Node\Stmt\ClassLike;
 use PhpParser\Node\Stmt\Property;
 use Rector\BetterPhpDocParser\Contract\Doctrine\DoctrineRelationTagValueNodeInterface;
+use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\Class_\EmbeddableTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\Class_\EntityTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\Property_\ColumnTagValueNode;
 use Rector\BetterPhpDocParser\PhpDocNode\Doctrine\Property_\IdTagValueNode;
@@ -37,28 +38,11 @@ public function __construct(ParsedNodeCollector $parsedNodeCollector)
     public function isDoctrineEntityClass($class): bool
     {
         if ($class instanceof Class_) {
-            $phpDocInfo = $class->getAttribute(AttributeKey::PHP_DOC_INFO);
-            if ($phpDocInfo === null) {
-                return false;
-            }
-
-            return $phpDocInfo->hasByType(EntityTagValueNode::class);
+            return $this->isDoctrineEntityClassNode($class);
         }
 
         if (is_string($class)) {
-            if (ClassExistenceStaticHelper::doesClassLikeExist($class)) {
-                $classNode = $this->parsedNodeCollector->findClass($class);
-                if ($classNode !== null) {
-                    return $this->isDoctrineEntityClass($classNode);
-                }
-
-                $reflectionClass = new ReflectionClass($class);
-
-                // dummy check of 3rd party code without running it
-                return Strings::contains((string) $reflectionClass->getDocComment(), '@ORM\Entity');
-            }
-
-            return false;
+            return $this->isStringClassEntity($class);
         }
 
         throw new ShouldNotHappenException();
@@ -137,4 +121,41 @@ public function isInDoctrineEntityClass(Node $node): bool
 
         return $this->isDoctrineEntityClass($classNode);
     }
+
+    private function isDoctrineEntityClassNode(Class_ $class): bool
+    {
+        $phpDocInfo = $class->getAttribute(AttributeKey::PHP_DOC_INFO);
+        if ($phpDocInfo === null) {
+            return false;
+        }
+
+        if ($phpDocInfo->hasByType(EntityTagValueNode::class)) {
+            return true;
+        }
+
+        return $phpDocInfo->hasByType(EmbeddableTagValueNode::class);
+    }
+
+    private function isStringClassEntity(string $class): bool
+    {
+        if (! ClassExistenceStaticHelper::doesClassLikeExist($class)) {
+            return false;
+        }
+
+        $classNode = $this->parsedNodeCollector->findClass($class);
+        if ($classNode !== null) {
+            return $this->isDoctrineEntityClass($classNode);
+        }
+
+        $reflectionClass = new ReflectionClass($class);
+
+        // dummy check of 3rd party code without running it
+        $docCommentContent = (string) $reflectionClass->getDocComment();
+
+        if (Strings::contains($docCommentContent, '@ORM\Entity')) {
+            return true;
+        }
+
+        return Strings::contains($docCommentContent, '@ORM\Embeddable');
+    }
 }
diff --git a/rules/solid/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/Fixture/skip_embedable.php.inc b/rules/solid/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/Fixture/skip_embedable.php.inc
new file mode 100644
index 000000000000..49718d589b20
--- /dev/null
+++ b/rules/solid/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/Fixture/skip_embedable.php.inc
@@ -0,0 +1,12 @@
+<?php
+
+namespace Rector\SOLID\Tests\Rector\Class_\FinalizeClassesWithoutChildrenRector\Fixture;
+
+use Doctrine\ORM\Mapping as ORM;
+
+/**
+ * @ORM\Embeddable
+ */
+class SkipEmbedable
+{
+}
diff --git a/rules/solid/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/Fixture/entity.php.inc b/rules/solid/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/Fixture/skip_entity.php.inc
similarity index 90%
rename from rules/solid/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/Fixture/entity.php.inc
rename to rules/solid/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/Fixture/skip_entity.php.inc
index 344dc77458dd..87ce43d6d91e 100644
--- a/rules/solid/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/Fixture/entity.php.inc
+++ b/rules/solid/tests/Rector/Class_/FinalizeClassesWithoutChildrenRector/Fixture/skip_entity.php.inc
@@ -7,6 +7,6 @@ use Doctrine\ORM\Mapping as ORM;
 /**
  * @ORM\Entity
  */
-class Product
+class SkipEntity
 {
 }
diff --git a/stubs/Doctrine/ORM/Mapping/Embeddable.php b/stubs/Doctrine/ORM/Mapping/Embeddable.php
new file mode 100644
index 000000000000..22d0317ddef3
--- /dev/null
+++ b/stubs/Doctrine/ORM/Mapping/Embeddable.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Doctrine\ORM\Mapping;
+
+// mimics @see https://github.com/doctrine/orm/blob/master/lib/Doctrine/ORM/Annotation/Embeddable.php
+
+if (class_exists('Doctrine\ORM\Mapping\Embeddable')) {
+    return;
+}
+
+/**
+ * @Annotation
+ * @Target("CLASS")
+ */
+class Embeddable implements Annotation
+{
+}