diff --git a/mysql/db/entrypoint/schema.sql b/mysql/db/entrypoint/schema.sql
index 33c023a..5a86b10 100644
--- a/mysql/db/entrypoint/schema.sql
+++ b/mysql/db/entrypoint/schema.sql
@@ -1,10 +1,10 @@
 CREATE TABLE event
 (
     event_id      INT PRIMARY KEY AUTO_INCREMENT,
-    group_id      VARCHAR(36)   NOT NULL,
-    group_version INT           NOT NULL,
-    exec_id       VARCHAR(50)   NOT NULL,
-    target_id     VARCHAR(50),
-    event_type    VARCHAR(32)   NOT NULL,
-    event_payload VARCHAR(2500) NOT NULL
+    group_id      VARCHAR(36) NOT NULL,
+    group_version INT         NOT NULL,
+    exec_id       VARCHAR(32) NOT NULL,
+    target_id     VARCHAR(32),
+    event_type    VARCHAR(16) NOT NULL,
+    event_payload JSON        NOT NULL
 );
diff --git a/mysql/db/schema-heroku.sql b/mysql/db/schema-heroku.sql
new file mode 100644
index 0000000..f8bf704
--- /dev/null
+++ b/mysql/db/schema-heroku.sql
@@ -0,0 +1,10 @@
+CREATE TABLE event
+(
+    event_id      INT PRIMARY KEY AUTO_INCREMENT,
+    group_id      VARCHAR(36) NOT NULL,
+    group_version INT         NOT NULL,
+    exec_id       VARCHAR(32) NOT NULL,
+    target_id     VARCHAR(32),
+    event_type    VARCHAR(16) NOT NULL,
+    event_payload TEXT        NOT NULL
+);
diff --git a/src/main/java/mops/gruppen2/persistance/EventRepository.java b/src/main/java/mops/gruppen2/persistance/EventRepository.java
index bce4468..26a94bb 100644
--- a/src/main/java/mops/gruppen2/persistance/EventRepository.java
+++ b/src/main/java/mops/gruppen2/persistance/EventRepository.java
@@ -14,6 +14,6 @@ public interface EventRepository extends CrudRepository<EventDTO, Long> {
     // ####################################### EVENT DTOs ########################################
 
 
-    @Query("SELECT *")
+    @Query("SELECT * FROM event")
     List<EventDTO> findAllEvents();
 }