diff --git a/db/gen/create_tables.sql b/db/gen/create_tables.sql
index 9844792..8d0c1d7 100644
--- a/db/gen/create_tables.sql
+++ b/db/gen/create_tables.sql
@@ -55,8 +55,9 @@ CREATE TABLE InfraServer(
   ServerId SERIAL PRIMARY KEY,
   ServerName VARCHAR(255) NOT NULL UNIQUE,
   ServerDescription VARCHAR(255) NOT NULL,
-  ServerServermodelName VARCHAR(255) NOT NULL,
-  ReleaseDistribution VARCHAR(255) NOT NULL,
+  ServermodelName VARCHAR(255) NOT NULL,
+  ServermodelSourceName VARCHAR(255) NOT NULL,
+  ServermodelReleaseDistribution VARCHAR(255) NOT NULL,
   SiteName VARCHAR(255) NOT NULL,
   ZonesName VARCHAR(255) [] NOT NULL,
   ZonesIP VARCHAR(255) [] NOT NULL
@@ -72,11 +73,10 @@ CREATE TABLE Source (
 CREATE TABLE Release (
   ReleaseId SERIAL PRIMARY KEY,
   ReleaseName VARCHAR(255) NOT NULL,
-  ReleaseSourceId INTEGER NOT NULL,
+  ReleaseSourceName VARCHAR(255) NOT NULL,
   ReleaseDistribution VARCHAR(20) CONSTRAINT releasedistribution_choice CHECK (ReleaseDistribution IN ('last', 'n-1', 'n-2')),
-  UNIQUE (ReleaseName, ReleaseSourceId),
-  UNIQUE (ReleaseDistribution, ReleaseSourceId),
-  FOREIGN KEY (ReleaseSourceId) REFERENCES Source(SourceId)
+  UNIQUE (ReleaseName, ReleaseSourceName),
+  UNIQUE (ReleaseDistribution, ReleaseSourceName)
 );
 
 -------------------------------------
@@ -88,7 +88,7 @@ CREATE TABLE SettingServer(
   ServerId SERIAL PRIMARY KEY,
   ServerName VARCHAR(255) NOT NULL UNIQUE,
   ServermodelName VARCHAR(255) NOT NULL,
-  ReleaseDistribution VARCHAR(255) NOT NULL
+  ReleaseName VARCHAR(255) NOT NULL
 );
 
 -- Servermodel
@@ -101,9 +101,10 @@ CREATE TABLE Servermodel (
   ISO VARCHAR(255),
   ServermodelParents VARCHAR(255) [] DEFAULT '{}',
   SourceName VARCHAR(255) NOT NULL,
+  ReleaseName VARCHAR(255) NOT NULL,
   ReleaseDistribution VARCHAR(255) NOT NULL,
   ServermodelApplicationserviceId INTEGER NOT NULL,
-  UNIQUE (ServermodelName, SourceName, ReleaseDistribution)
+  UNIQUE (ServermodelName, SourceName, ReleaseName)
 );
 CREATE INDEX ServermodelApplicationserviceId_index ON Servermodel (ServermodelApplicationserviceId);
 
@@ -112,12 +113,10 @@ CREATE TABLE Applicationservice (
   ApplicationserviceId SERIAL PRIMARY KEY,
   ApplicationserviceName VARCHAR(255) NOT NULL,
   ApplicationserviceDescription VARCHAR(255) NOT NULL,
-  ApplicationserviceReleaseId INTEGER NOT NULL,
-  --ApplicationserviceLVIS VARCHAR(255) NOT NULL,
-  --ApplicationserviceLVIP VARCHAR(255) NOT NULL,
-  --ApplicationserviceLVMP VARCHAR(255) NOT NULL,
+  ReleaseName VARCHAR(255) NOT NULL,
+  SourceName VARCHAR(255) NOT NULL,
   OS JSON,
-  UNIQUE (ApplicationserviceName, ApplicationserviceReleaseId)
+  UNIQUE (ApplicationserviceName, ReleaseName, SourceName)
 );
 
 CREATE TABLE ApplicationserviceDependency (