diff --git a/deploy/demo/env.yaml b/deploy/demo/env.yaml
index 2c3d314..1a89718 100644
--- a/deploy/demo/env.yaml
+++ b/deploy/demo/env.yaml
@@ -9,7 +9,8 @@ spec:
   template:
     spec:
       containers:
-        - env:
+        - name: organization-catalog
+          env:
             - name: MONGO_HOST
               valueFrom:
                 secretKeyRef:
@@ -44,4 +45,4 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: commonurl-demo
-                  key: ORGANIZATION_CATALOG_BASE_URI
+                  key: ORGANIZATION_CATALOG_BASE_URI
\ No newline at end of file
diff --git a/deploy/prod/env.yaml b/deploy/prod/env.yaml
index 4a855e7..d388671 100644
--- a/deploy/prod/env.yaml
+++ b/deploy/prod/env.yaml
@@ -9,7 +9,8 @@ spec:
   template:
     spec:
       containers:
-        - env:
+        - name: organization-catalog
+          env:
             - name: MONGO_HOST
               valueFrom:
                 secretKeyRef:
@@ -44,4 +45,4 @@ spec:
               valueFrom:
                 secretKeyRef:
                   name: commonurl-prod
-                  key: ORGANIZATION_CATALOG_BASE_URI
+                  key: ORGANIZATION_CATALOG_BASE_URI
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index be975e1..7d2e723 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>no.digdir</groupId>
@@ -22,7 +23,7 @@
 
     <properties>
         <!--standard properties-->
-        <java.version>17</java.version>
+        <java.version>21</java.version>
         <java.encoding>UTF-8</java.encoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@@ -203,7 +204,9 @@
                 <executions>
                     <execution>
                         <id>compile</id>
-                        <goals> <goal>compile</goal> </goals>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>
                         <configuration>
                             <sourceDirs>
                                 <sourceDir>${project.basedir}/src/main/kotlin</sourceDir>
@@ -212,7 +215,9 @@
                     </execution>
                     <execution>
                         <id>test-compile</id>
-                        <goals> <goal>test-compile</goal> </goals>
+                        <goals>
+                            <goal>test-compile</goal>
+                        </goals>
                         <configuration>
                             <sourceDirs>
                                 <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>