diff --git a/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/SpacelessPhpDocTagNode.php b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/SpacelessPhpDocTagNode.php
new file mode 100644
index 00000000000..80f50da4d14
--- /dev/null
+++ b/packages/BetterPhpDocParser/src/Attributes/Ast/PhpDoc/SpacelessPhpDocTagNode.php
@@ -0,0 +1,21 @@
+<?php declare(strict_types=1);
+
+namespace Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc;
+
+use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
+use Rector\BetterPhpDocParser\Attributes\Attribute\AttributeTrait;
+use Rector\BetterPhpDocParser\Attributes\Contract\Ast\AttributeAwareNodeInterface;
+
+/**
+ * Useful for annotation class based annotation, e.g. @ORM\Entity to prevent space
+ * between the @ORM\Entity and (someContent)
+ */
+final class SpacelessPhpDocTagNode extends PhpDocTagNode implements AttributeAwareNodeInterface
+{
+    use AttributeTrait;
+
+    public function __toString(): string
+    {
+        return $this->name . $this->value;
+    }
+}
diff --git a/packages/Doctrine/src/PhpDocParser/Ast/PhpDoc/PhpDocTagNodeFactory.php b/packages/Doctrine/src/PhpDocParser/Ast/PhpDoc/PhpDocTagNodeFactory.php
index e3f04e31c8d..65effaf0773 100644
--- a/packages/Doctrine/src/PhpDocParser/Ast/PhpDoc/PhpDocTagNodeFactory.php
+++ b/packages/Doctrine/src/PhpDocParser/Ast/PhpDoc/PhpDocTagNodeFactory.php
@@ -6,7 +6,7 @@ use PhpParser\Node\Stmt\Property;
 use PHPStan\PhpDocParser\Ast\PhpDoc\PhpDocTagNode;
 use PHPStan\PhpDocParser\Ast\PhpDoc\VarTagValueNode;
 use PHPStan\PhpDocParser\Ast\Type\IdentifierTypeNode;
-use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\AttributeAwarePhpDocTagNode;
+use Rector\BetterPhpDocParser\Attributes\Ast\PhpDoc\SpacelessPhpDocTagNode;
 use Rector\Doctrine\Uuid\JoinTableNameResolver;
 use Rector\Doctrine\ValueObject\DoctrineClass;
 use Rector\DoctrinePhpDocParser\Ast\PhpDoc\Property_\ColumnTagValueNode;
@@ -44,7 +44,7 @@ final class PhpDocTagNodeFactory
 
     public function createIdTag(): PhpDocTagNode
     {
-        return new PhpDocTagNode(IdTagValueNode::SHORT_NAME, new IdTagValueNode());
+        return new SpacelessPhpDocTagNode(IdTagValueNode::SHORT_NAME, new IdTagValueNode());
     }
 
     public function createUuidColumnTag(bool $isNullable): PhpDocTagNode
@@ -59,17 +59,19 @@ final class PhpDocTagNodeFactory
             $isNullable ? true : null
         );
 
-        return new PhpDocTagNode($columnTagValueNode::SHORT_NAME, $columnTagValueNode);
+        return new SpacelessPhpDocTagNode($columnTagValueNode::SHORT_NAME, $columnTagValueNode);
     }
 
     public function createGeneratedValueTag(): PhpDocTagNode
     {
-        return new PhpDocTagNode(GeneratedValueTagValueNode::SHORT_NAME, new GeneratedValueTagValueNode('CUSTOM'));
+        return new SpacelessPhpDocTagNode(GeneratedValueTagValueNode::SHORT_NAME, new GeneratedValueTagValueNode(
+            'CUSTOM'
+        ));
     }
 
     public function createCustomIdGeneratorTag(): PhpDocTagNode
     {
-        return new PhpDocTagNode(
+        return new SpacelessPhpDocTagNode(
             CustomIdGeneratorTagValueNode::SHORT_NAME,
             new CustomIdGeneratorTagValueNode($this->doctrineUuidGeneratorClass)
         );
@@ -86,13 +88,13 @@ final class PhpDocTagNodeFactory
             [new JoinColumnTagValueNode(null, 'uuid')]
         );
 
-        return new AttributeAwarePhpDocTagNode(JoinTableTagValueNode::SHORT_NAME, $joinTableTagValueNode);
+        return new SpacelessPhpDocTagNode(JoinTableTagValueNode::SHORT_NAME, $joinTableTagValueNode);
     }
 
     public function createJoinColumnTagNode(): PhpDocTagNode
     {
         $joinColumnTagValueNode = new JoinColumnTagValueNode(null, 'uuid', null, false);
 
-        return new AttributeAwarePhpDocTagNode(JoinColumnTagValueNode::SHORT_NAME, $joinColumnTagValueNode);
+        return new SpacelessPhpDocTagNode(JoinColumnTagValueNode::SHORT_NAME, $joinColumnTagValueNode);
     }
 }
diff --git a/packages/Doctrine/tests/Rector/Class_/AddUuidMirrorForRelationPropertyRector/Fixture/to_many.php.inc b/packages/Doctrine/tests/Rector/Class_/AddUuidMirrorForRelationPropertyRector/Fixture/to_many.php.inc
index ef91abf2bd9..3d867ec8969 100644
--- a/packages/Doctrine/tests/Rector/Class_/AddUuidMirrorForRelationPropertyRector/Fixture/to_many.php.inc
+++ b/packages/Doctrine/tests/Rector/Class_/AddUuidMirrorForRelationPropertyRector/Fixture/to_many.php.inc
@@ -52,7 +52,7 @@ class ToMany
     private $amenity;
     /**
      * @ORM\ManyToMany(targetEntity="Rector\Doctrine\Tests\Rector\Class_\AddUuidMirrorForRelationPropertyRector\Fixture\FooEntity", cascade={"persist", "merge"})
-     * @ORM\JoinTable (name="tomany_fooentity_uuid", joinColumns={@ORM\JoinColumn(referencedColumnName="uuid")}, inverseJoinColumns={@ORM\JoinColumn(referencedColumnName="uuid")})
+     * @ORM\JoinTable(name="tomany_fooentity_uuid", joinColumns={@ORM\JoinColumn(referencedColumnName="uuid")}, inverseJoinColumns={@ORM\JoinColumn(referencedColumnName="uuid")})
      */
     private $amenityUuid;
 }
diff --git a/packages/Doctrine/tests/Rector/Class_/AddUuidToEntityWhereMissingRector/Fixture/add_single_table_inheritance_with_identifier.php.inc b/packages/Doctrine/tests/Rector/Class_/AddUuidToEntityWhereMissingRector/Fixture/add_single_table_inheritance_with_identifier.php.inc
index 1ae4b921c1a..0cb8b25655c 100644
--- a/packages/Doctrine/tests/Rector/Class_/AddUuidToEntityWhereMissingRector/Fixture/add_single_table_inheritance_with_identifier.php.inc
+++ b/packages/Doctrine/tests/Rector/Class_/AddUuidToEntityWhereMissingRector/Fixture/add_single_table_inheritance_with_identifier.php.inc
@@ -46,7 +46,7 @@ abstract class ParentSingleTableInheritanceWithIdentifier
     }
     /**
      * @var \Ramsey\Uuid\UuidInterface
-     * @ORM\Column (type="uuid_binary", unique=true, nullable=true)
+     * @ORM\Column(type="uuid_binary", unique=true, nullable=true)
      */
     private $uuid;
     /**