diff --git a/app/backend/src/main/resources/application.properties b/app/backend/src/main/resources/application.properties
index 693118a0a4b7f8ef45bd7392c41b4fece5046549..d61366410a67642f81d1a1630806444fb59cbe31 100644
--- a/app/backend/src/main/resources/application.properties
+++ b/app/backend/src/main/resources/application.properties
@@ -52,6 +52,35 @@ spring.datasource.driver-class-name=org.postgresql.Driver
 # Generates db schema if it doesn't exist in db
 spring.jpa.generate-ddl=true
 spring.jpa.show-sql=false
+#---
+spring.config.activate.on-profile=local
+opencode.host=https://gitlab.opencode.de/
+opencode.analyze-private-repos=true
+
+# Tool APIs
+opencode.api.base-path=https://sl.dev.o4oe.de/api/v1/project/
+opencode.api.auth=https://sl.dev.o4oe.de/api/receive-session/
+
+# Database Settings
+spring.datasource.url=jdbc:postgresql://${host}:${DB_PORT}/${DB_NAME}?sslmode=disable&user=root
+spring.jpa.hibernate.ddl-auto=create-drop
+
+# Import local .env
+spring.config.import=optional:classpath:.env[.properties]
+
+#---
+spring.config.activate.on-profile=dev
+# Config for the OpencoDE platform
+opencode.host=https://gitlab.dev.o4oe.de/
+opencode.analyze-private-repos=true
+
+# Tool APIs
+opencode.api.base-path=https://sl.dev.o4oe.de/api/v1/project/
+opencode.api.auth=https://sl.dev.o4oe.de/api/
+
+# Database Settings
+spring.datasource.url=jdbc:postgresql://${host}:${DB_PORT}/${DB_NAME}?sslmode=disable&user=root
+spring.jpa.hibernate.ddl-auto=update
 
-# Import profile specific properties (Default is prod)
-spring.config.import=optional:file:${SPRING_PROFILE}.properties
+#---
+spring.config.activate.on-profile=prod
diff --git a/app/backend/src/main/resources/dev.properties b/app/backend/src/main/resources/dev.properties
deleted file mode 100644
index 297bd07012e289b3e1e1357a603292f8e05b4ba8..0000000000000000000000000000000000000000
--- a/app/backend/src/main/resources/dev.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# Config for the OpencoDE platform
-opencode.host=https://gitlab.dev.o4oe.de/
-opencode.analyze-private-repos=true
-
-# Tool APIs
-opencode.api.base-path=https://sl.dev.o4oe.de/api/v1/project/
-opencode.api.auth=https://sl.dev.o4oe.de/api/
-
-# Database Settings
-spring.datasource.url=jdbc:postgresql://${host}:${DB_PORT}/${DB_NAME}?sslmode=disable&user=root
-spring.jpa.hibernate.ddl-auto=update
diff --git a/app/backend/src/main/resources/local.properties b/app/backend/src/main/resources/local.properties
deleted file mode 100644
index 22be05e0e6d441a53b7729fda14df3a19a9ae026..0000000000000000000000000000000000000000
--- a/app/backend/src/main/resources/local.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# Config for the OpencoDE platform
-opencode.host=https://gitlab.opencode.de/
-opencode.analyze-private-repos=true
-
-# Tool APIs
-opencode.api.base-path=https://sl.dev.o4oe.de/api/v1/project/
-opencode.api.auth=https://sl.dev.o4oe.de/api/receive-session/
-
-# Database Settings
-spring.datasource.url=jdbc:postgresql://${host}:${DB_PORT}/${DB_NAME}?sslmode=disable&user=root
-spring.jpa.hibernate.ddl-auto=create-drop
-
-# Import local .env
-spring.config.import=optional:classpath:.env[.properties]
-
diff --git a/app/backend/src/main/resources/prod.properties b/app/backend/src/main/resources/prod.properties
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/docker-compose.yml b/docker-compose.yml
index d93a403f969ab001a3c2a3204a240c8b38b90fdb..a731b2f0842daaefb40c8023f6e3aaed65011b9a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -33,6 +33,6 @@ services:
             - HMAC_KEY=012345678901234567890123456789
             - API_KEY=012345678901234567890123456789
 
-            - SPRING_PROFILE=local
+            - SPRING_PROFILES_ACTIVE=local
         ports:
             - 4000:4000
diff --git a/kubernetes/configmap-prod.yaml b/kubernetes/configmap-prod.yaml
index 400d26935ba923e99c3703e8e1ff0274fef67cfa..29b491c91cafef5809a845e87b6b0f8b19d205b1 100644
--- a/kubernetes/configmap-prod.yaml
+++ b/kubernetes/configmap-prod.yaml
@@ -10,4 +10,4 @@ data:
     XDG_CONFIG_HOME: "/app/.config"
     CORS_ORIGIN: "https://sec-kpi.opencode.de"
     PROJECT_IDS: 1108, 888, 438, 1189, 820, 788, 400, 1052
-    SPRING_PROFILE: prod
+    SPRING_PROFILES_ACTIVE: prod
diff --git a/kubernetes/configmap.yaml b/kubernetes/configmap.yaml
index 8c4cb2641c2558fa55e3c76d1504b0804f573377..f4981583c801d4da8092c7a3cc6534c11d52c871 100644
--- a/kubernetes/configmap.yaml
+++ b/kubernetes/configmap.yaml
@@ -10,4 +10,4 @@ data:
     XDG_CONFIG_HOME: "/app/.config"
     CORS_ORIGIN: "*"
     PROJECT_IDS: 159,106, 124
-    SPRING_PROFILE: dev
+    SPRING_PROFILES_ACTIVE: dev