diff --git a/src/Entity/Tag.php b/src/Entity/Tag.php
index e9cfb352..2cf3e31c 100644
--- a/src/Entity/Tag.php
+++ b/src/Entity/Tag.php
@@ -37,9 +37,9 @@ class Tag
     /**
      * @var string
      *
-     * @ORM\Column(name="name", type="string", length=255, nullable=false)
+     * @ORM\Column(name="name", type="string", length=100, nullable=false)
      * @Assert\NotBlank()
-     * @Assert\Length(min=2, max=255)
+     * @Assert\Length(min=2, max=100)
      */
     private $name;
 
diff --git a/src/Migrations/Version20190510205245.php b/src/Migrations/Version20190510205245.php
index a57cf7f9..99dbd129 100644
--- a/src/Migrations/Version20190510205245.php
+++ b/src/Migrations/Version20190510205245.php
@@ -32,7 +32,7 @@ class Version20190510205245 extends AbstractMigration
 
         $tags = $schema->createTable('kimai2_tags');
         $tags->addColumn('id', 'integer', ['length' => 11, 'autoincrement' => true, 'notnull' => true]);
-        $tags->addColumn('name', 'string', ['length' => 255, 'notnull' => true]);
+        $tags->addColumn('name', 'string', ['length' => 100, 'notnull' => true]);
         $tags->addUniqueIndex(['name'], 'UNIQ_27CAF54C5E237E06');
         $tags->setPrimaryKey(['id']);
     }
diff --git a/var/data/kimai_test.sqlite b/var/data/kimai_test.sqlite
index bb001f42..338ab763 100644
Binary files a/var/data/kimai_test.sqlite and b/var/data/kimai_test.sqlite differ