diff --git a/kontor-api/Makefile b/kontor-api/Makefile
index 40fbfeb..2f20ba6 100644
--- a/kontor-api/Makefile
+++ b/kontor-api/Makefile
@@ -10,5 +10,5 @@ docker: clean
 	docker build --target=production -t kontor-api:0.2.0-SNAPSHOT .
 
 dev:
-	MARIADB_SERVER=localhost uv run fastapi dev src/main.py --port 8008
+	DB_SERVER=127.0.0.1 uv run fastapi dev src/main.py --port 8008
 
diff --git a/kontor-api/src/core/config.py b/kontor-api/src/core/config.py
index 5f14424..6f8a4cf 100644
--- a/kontor-api/src/core/config.py
+++ b/kontor-api/src/core/config.py
@@ -9,14 +9,14 @@ load_dotenv(dotenv_path=env_path)
 
 class Settings:
     PROJECT_NAME: str = "Kontor"
-    PROJECT_VERSION: str = "0.1.0"
+    PROJECT_VERSION: str = "0.2.0"
 
-    MARIADB_USER: str = os.getenv("MARIADB_USER", "kontor")
-    MARIADB_PASSWORD: str = os.getenv("MARIADB_PASSWORD", "kontor")
-    MARIADB_SERVER: str = os.getenv("MARIADB_SERVER", "mariadb")
-    MARIADB_PORT: str = os.getenv("MARIADB_PORT", 3306)
-    MARIADB_DB: str = os.getenv("MARIADB_DB", "kontor")
-    DATABASE_URL: str = f"mariadb+mariadbconnector://{MARIADB_USER}:{MARIADB_PASSWORD}@{MARIADB_SERVER}:{MARIADB_PORT}/{MARIADB_DB}"
+    DB_USER: str = os.getenv("DB_USER", "kontor")
+    DB_PASSWORD: str = os.getenv("DB_PASSWORD", "kontor")
+    DB_SERVER: str = os.getenv("DB_SERVER", "mariadb")
+    DB_PORT: str = os.getenv("DB_PORT", 5432)
+    DB_DBNAME: str = os.getenv("DB_DBNAME", "kontor")
+    DATABASE_URL: str = f"postgresql://{DB_USER}:{DB_PASSWORD}@{DB_SERVER}:{DB_PORT}/{DB_DBNAME}"
 
 
 settings = Settings()
diff --git a/kontor-spring/gradle.properties b/kontor-spring/gradle.properties
index f305204..ba98070 100644
--- a/kontor-spring/gradle.properties
+++ b/kontor-spring/gradle.properties
@@ -1,3 +1,3 @@
 description='Kontor with Spring Boot'
-version=0.1.0-SNAPSHOT
+version=0.2.0-SNAPSHOT
 group=de.thpeetz