diff --git a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcut.java b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcut.java
index 418f90475..99002a16d 100644
--- a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcut.java
+++ b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcut.java
@@ -35,7 +35,7 @@ import javax.persistence.Table;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Entity
-@Table(name = "shortcuts")
+@Table(schema ="ccm_shortcuts", name = "shortcuts")
 public class Shortcut implements Serializable {
 
     private static final long serialVersionUID = -5674633339633714327L;
diff --git a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java
index 677c12cbd..f1a7631d7 100644
--- a/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java
+++ b/ccm-shortcuts/src/main/java/org/libreccm/shortcuts/Shortcuts.java
@@ -27,7 +27,7 @@ import org.libreccm.web.Application;
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
 @Entity
-@Table(name = "shortcuts_app")
+@Table(schema ="ccm_shortcuts", name = "shortcuts_app")
 public class Shortcuts extends Application {
     private static final long serialVersionUID = -6793265996161649637L;
     
diff --git a/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/h2/V1_0_0_0__create_tables.sql b/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/h2/V1_0_0_0__create_tables.sql
new file mode 100644
index 000000000..155f58fc5
--- /dev/null
+++ b/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/h2/V1_0_0_0__create_tables.sql
@@ -0,0 +1,12 @@
+   
+    create table shortcuts (
+        shortcut_id bigint generated by default as identity,
+        redirect varchar(1024),
+        url_key varchar(1024),
+        primary key (shortcut_id)
+    );
+
+    create table shortcuts_app (
+        object_id bigint not null,
+        primary key (object_id)
+    );
diff --git a/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/oracle/V1_0_0_0__create_tables.sql b/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/oracle/V1_0_0_0__create_tables.sql
new file mode 100644
index 000000000..27b6ff125
--- /dev/null
+++ b/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/oracle/V1_0_0_0__create_tables.sql
@@ -0,0 +1,12 @@
+    
+    create table shortcuts (
+        shortcut_id number(19,0) not null,
+        redirect varchar2(1024 char),
+        url_key varchar2(1024 char),
+        primary key (shortcut_id)
+    );
+
+    create table shortcuts_app (
+        object_id number(19,0) not null,
+        primary key (object_id)
+    );
diff --git a/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/pqsql/V1_0_0_0__create_tables.sql b/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/pqsql/V1_0_0_0__create_tables.sql
new file mode 100644
index 000000000..567c1b4f0
--- /dev/null
+++ b/ccm-shortcuts/src/main/resources/db/migrations/org.libreccm.ccm-shortcuts/pqsql/V1_0_0_0__create_tables.sql
@@ -0,0 +1,12 @@
+
+    create table shortcuts (
+        shortcut_id int8 not null,
+        redirect varchar(1024),
+        url_key varchar(1024),
+        primary key (shortcut_id)
+    );
+
+    create table shortcuts_app (
+        object_id int8 not null,
+        primary key (object_id)
+    );
\ No newline at end of file