diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana-schema-db2.sql b/common/taskana-common/src/main/resources/sql/db2/taskana-schema-db2.sql
index a62abc9e0..cba2921fe 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana-schema-db2.sql
+++ b/common/taskana-common/src/main/resources/sql/db2/taskana-schema-db2.sql
@@ -190,7 +190,8 @@ CREATE TABLE ATTACHMENT(
 CREATE TABLE CONFIGURATION (
     NAME VARCHAR(8) NOT NULL,
     ENFORCE_SECURITY BOOLEAN NULL,
-    CUSTOM_ATTRIBUTES CLOB NULL
+    CUSTOM_ATTRIBUTES CLOB NULL,
+    PRIMARY KEY (NAME)
 );
 
 INSERT INTO CONFIGURATION (NAME) VALUES ('MASTER');
diff --git a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.8.0_to_4.11.0_db2.sql b/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.8.0_to_4.11.0_db2.sql
index a98cc0b2b..cdb60ef4c 100644
--- a/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.8.0_to_4.11.0_db2.sql
+++ b/common/taskana-common/src/main/resources/sql/db2/taskana_schema_update_4.8.0_to_4.11.0_db2.sql
@@ -7,6 +7,11 @@ INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.11.0', CURRENT_
 ALTER TABLE CONFIGURATION ADD COLUMN NAME VARCHAR(8) NOT NULL DEFAULT 'MASTER';
 ALTER TABLE CONFIGURATION ALTER COLUMN ENFORCE_SECURITY DROP NOT NULL;
 ALTER TABLE CONFIGURATION ALTER COLUMN NAME DROP DEFAULT;
+CALL SYSPROC.ADMIN_CMD ( 'REORG TABLE CONFIGURATION allow read access' );
+ALTER TABLE CONFIGURATION ADD PRIMARY KEY (NAME);
+
+insert into CONFIGURATION (NAME) (select 'MASTER' from sysibm.sysdummy1
+where not exists (select * from CONFIGURATION where NAME = 'MASTER'));
 
 UPDATE TASK SET CUSTOM_1 = '' WHERE CUSTOM_1 IS NULL;
 UPDATE TASK SET CUSTOM_2 = '' WHERE CUSTOM_2 IS NULL;
@@ -38,3 +43,4 @@ UPDATE CLASSIFICATION SET CUSTOM_5 = '' WHERE CUSTOM_5 IS NULL;
 UPDATE CLASSIFICATION SET CUSTOM_6 = '' WHERE CUSTOM_6 IS NULL;
 UPDATE CLASSIFICATION SET CUSTOM_7 = '' WHERE CUSTOM_7 IS NULL;
 UPDATE CLASSIFICATION SET CUSTOM_8 = '' WHERE CUSTOM_8 IS NULL;
+
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana-schema-h2.sql b/common/taskana-common/src/main/resources/sql/h2/taskana-schema-h2.sql
index f79d0009e..c497471c6 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana-schema-h2.sql
+++ b/common/taskana-common/src/main/resources/sql/h2/taskana-schema-h2.sql
@@ -309,7 +309,8 @@ CREATE TABLE CLASSIFICATION_HISTORY_EVENT
 CREATE TABLE CONFIGURATION (
     NAME VARCHAR(8) NOT NULL,
     ENFORCE_SECURITY BOOLEAN NULL,
-    CUSTOM_ATTRIBUTES CLOB NULL
+    CUSTOM_ATTRIBUTES CLOB NULL,
+    PRIMARY KEY (NAME)
 );
 
 INSERT INTO CONFIGURATION (NAME) VALUES ('MASTER');
diff --git a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.8.0_to_4.11.0_h2.sql b/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.8.0_to_4.11.0_h2.sql
index d4d2bc0f2..5092d65d5 100644
--- a/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.8.0_to_4.11.0_h2.sql
+++ b/common/taskana-common/src/main/resources/sql/h2/taskana_schema_update_4.8.0_to_4.11.0_h2.sql
@@ -5,6 +5,9 @@ INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.11.0', CURRENT_
 ALTER TABLE CONFIGURATION ADD COLUMN NAME VARCHAR(8) NOT NULL DEFAULT 'MASTER';
 ALTER TABLE CONFIGURATION ALTER COLUMN ENFORCE_SECURITY DROP NOT NULL;
 ALTER TABLE CONFIGURATION ALTER COLUMN NAME DROP DEFAULT;
+ALTER TABLE CONFIGURATION ADD PRIMARY KEY (NAME);
+
+INSERT INTO CONFIGURATION (NAME) VALUES ('MASTER');
 
 UPDATE TASK SET CUSTOM_1 = '' WHERE CUSTOM_1 IS NULL;
 UPDATE TASK SET CUSTOM_2 = '' WHERE CUSTOM_2 IS NULL;
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana-schema-postgres.sql b/common/taskana-common/src/main/resources/sql/postgres/taskana-schema-postgres.sql
index 499aaf463..e90948bc0 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana-schema-postgres.sql
+++ b/common/taskana-common/src/main/resources/sql/postgres/taskana-schema-postgres.sql
@@ -304,7 +304,8 @@ CREATE TABLE CLASSIFICATION_HISTORY_EVENT
 CREATE TABLE CONFIGURATION (
     NAME VARCHAR(8) NOT NULL,
     ENFORCE_SECURITY BOOLEAN NULL,
-    CUSTOM_ATTRIBUTES TEXT NULL
+    CUSTOM_ATTRIBUTES TEXT NULL,
+    PRIMARY KEY (NAME)
 );
 
 INSERT INTO CONFIGURATION (NAME) VALUES ('MASTER');
diff --git a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.8.0_to_4.11.0_postgres.sql b/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.8.0_to_4.11.0_postgres.sql
index 7d5a27378..ddd3353f3 100644
--- a/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.8.0_to_4.11.0_postgres.sql
+++ b/common/taskana-common/src/main/resources/sql/postgres/taskana_schema_update_4.8.0_to_4.11.0_postgres.sql
@@ -7,6 +7,9 @@ INSERT INTO TASKANA_SCHEMA_VERSION (VERSION, CREATED) VALUES ('4.11.0', CURRENT_
 ALTER TABLE CONFIGURATION ADD COLUMN NAME VARCHAR(8) NOT NULL DEFAULT 'MASTER';
 ALTER TABLE CONFIGURATION ALTER COLUMN ENFORCE_SECURITY DROP NOT NULL;
 ALTER TABLE CONFIGURATION ALTER COLUMN NAME DROP DEFAULT;
+ALTER TABLE CONFIGURATION ADD PRIMARY KEY (NAME);
+
+INSERT INTO CONFIGURATION (NAME) VALUES ('MASTER') ON CONFLICT DO NOTHING;
 
 UPDATE TASK SET CUSTOM_1 = '' WHERE CUSTOM_1 IS NULL;
 UPDATE TASK SET CUSTOM_2 = '' WHERE CUSTOM_2 IS NULL;