diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakRole.java b/dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakRole.java
deleted file mode 100644
index c79afbc39..000000000
--- a/dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakRole.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package eu.eudat.service.keycloak;
-
-public enum KeycloakRole {
-
-    Admin, User
-
-}
diff --git a/dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakTenantAuthorityProperties.java b/dmp-backend/core/src/main/java/eu/eudat/service/keycloak/KeycloakTenantAuthorityProperties.java
new file mode 100644
index 000000000..e69de29bb
diff --git a/dmp-db-scema/updates/00.01.055_Add_ant_Annotation_table.sql b/dmp-db-scema/updates/00.01.055_Add_ant_Annotation_table.sql
index fd8b68ece..49a9bbef0 100644
--- a/dmp-db-scema/updates/00.01.055_Add_ant_Annotation_table.sql
+++ b/dmp-db-scema/updates/00.01.055_Add_ant_Annotation_table.sql
@@ -11,7 +11,7 @@ CREATE TABLE IF NOT EXISTS public."ant_Annotation"
     "entity_type" character varying(512) COLLATE pg_catalog."default" NOT NULL,
     "anchor" character varying(512) COLLATE pg_catalog."default",
     "payload" text COLLATE pg_catalog."default",
-    "tenant" uuid NOT NULL,
+    "tenant" uuid NULL,
     "created_at" timestamp without time zone NOT NULL,
     "updated_at" timestamp without time zone NOT NULL,
     "is_active" smallint NOT NULL,