diff --git a/.github/.m2/maven-settings.xml b/.github/.m2/maven-settings.xml
new file mode 100644
index 00000000..8d27d889
--- /dev/null
+++ b/.github/.m2/maven-settings.xml
@@ -0,0 +1,14 @@
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+          xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+
+    <servers>
+        <server>
+            <id>github</id>
+            <username>${env.GITHUB_USERNAME}</username>
+            <password>${env.GITHUB_TOKEN}</password>
+        </server>
+    </servers>
+
+</settings>
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8ca5e3df..8cc654a2 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,9 +10,6 @@ updates:
     directory: "/"
     registries:
       - "maven-github"
-    ignore:
-      - dependency-name: "no.nav.bidrag:bidrag-commons"
-        versions: [ "0.x.x" ]
     schedule:
       interval: "weekly"
       day: "monday"
diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml
index a79ef180..077de811 100644
--- a/.github/workflows/publish.yaml
+++ b/.github/workflows/publish.yaml
@@ -29,6 +29,9 @@ jobs:
           mvn versions:set -DnewVersion="${{ env.VERSION }}"
           mvn versions:commit
       - name: Deploy to Github Package
+        env:
+          GITHUB_USERNAME: x-access-token
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: |
           echo "Release package with version ${{ env.VERSION }}"
-          mvn source:jar-no-fork deploy -DskipTests=true -Dmaven.wagon.http.pool=false
\ No newline at end of file
+          mvn --settings .github/.m2/maven-settings.xml source:jar-no-fork deploy -DskipTests=true -Dmaven.wagon.http.pool=false -DdeplyAtEnd=true
\ No newline at end of file
diff --git a/.github/workflows/release-draft.yaml b/.github/workflows/release-draft.yaml
index 2484b793..bcc8265e 100644
--- a/.github/workflows/release-draft.yaml
+++ b/.github/workflows/release-draft.yaml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-java@v4.0.0
+      - uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: 'temurin'
diff --git a/bidrag-commons/pom.xml b/bidrag-commons/pom.xml
index 5bb59dd9..bb880016 100644
--- a/bidrag-commons/pom.xml
+++ b/bidrag-commons/pom.xml
@@ -8,7 +8,7 @@
     <version>${revision}</version>
   </parent>
 
-  <artifactId>bidrag-commons</artifactId>
+  <artifactId>bidrag-commons-felles</artifactId>
   <name>bidrag-commons</name>
   <version>${parent.version}</version>
   <packaging>jar</packaging>
@@ -52,21 +52,13 @@
     <ktlint.version>1.0.1</ktlint.version>
 
     <!-- language -->
-    <kotlin.compiler.jvmTarget>21</kotlin.compiler.jvmTarget>
-    <java.version>21</java.version>
     <kotlin.code.style>official</kotlin.code.style>
 
-    <!-- plugins -->
-    <maven-compiler.version>3.11.0</maven-compiler.version>
-    <maven-surefire.version>3.2.3</maven-surefire.version>
-    <maven-deploy.version>3.1.1</maven-deploy.version>
-    <maven-failsafe.version>3.2.3</maven-failsafe.version>
-    <maven-resources.version>3.3.1</maven-resources.version>
-    <maven-release.version>3.0.1</maven-release.version>
-    <maven-antrun.version>3.1.0</maven-antrun.version>
-    <maven-jar.version>3.3.0</maven-jar.version>
-    <flatten-maven.version>1.5.0</flatten-maven.version>
-    <build-helper-maven.version>3.5.0</build-helper-maven.version>
+    <java.version>21</java.version>
+    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
+    <kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
+
   </properties>
 
   <dependencyManagement>
@@ -192,102 +184,6 @@
 
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>release</id>
-      <activation>
-        <property>
-          <name>release</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <!--create source jar-->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>${maven-source.version}</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-        </plugins>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-jar-plugin</artifactId>
-              <version>${maven-jar.version}</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <version>${maven-compiler.version}</version>
-              <configuration>
-                <release>${java.version}</release>
-              </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-release-plugin</artifactId>
-              <version>${maven-release.version}</version>
-              <configuration>
-                <autoVersionSubmodules>true</autoVersionSubmodules>
-                <useReleaseProfile>true</useReleaseProfile>
-                <releaseProfiles>release</releaseProfiles>
-                <goals>deploy</goals>
-              </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-source-plugin</artifactId>
-              <version>${maven-source.version}</version>
-              <executions>
-                <execution>
-                  <id>attach-sources</id>
-                  <goals>
-                    <goal>jar</goal>
-                  </goals>
-                </execution>
-              </executions>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-deploy-plugin</artifactId>
-              <version>${maven-deploy.version}</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <version>${maven-surefire.version}</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-failsafe-plugin</artifactId>
-              <version>${maven-failsafe.version}</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-resources-plugin</artifactId>
-              <version>${maven-resources.version}</version>
-            </plugin>
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>flatten-maven-plugin</artifactId>
-              <version>${flatten-maven.version}</version>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
-  </profiles>
-
   <build>
     <sourceDirectory>src/main/kotlin</sourceDirectory>
     <testSourceDirectory>src/test/kotlin</testSourceDirectory>
@@ -296,37 +192,6 @@
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
-        <version>${kotlin.version}</version>
-        <configuration>
-          <args>
-            <arg>-Xjsr305=strict</arg>
-          </args>
-          <compilerPlugins>
-            <plugin>spring</plugin>
-          </compilerPlugins>
-          <jvmTarget>${java.version}</jvmTarget>
-        </configuration>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>test-compile</goal>
-            </goals>
-            <configuration>
-              <sourceDirs>
-                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-              </sourceDirs>
-            </configuration>
-          </execution>
-        </executions>
         <dependencies>
           <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
@@ -335,54 +200,6 @@
           </dependency>
         </dependencies>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-source-plugin</artifactId>
-        <version>${maven-source.version}</version>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>${build-helper-maven.version}</version>
-
-        <executions>
-          <execution>
-            <phase>generate-sources</phase>
-            <goals>
-              <goal>add-source</goal>
-            </goals>
-            <configuration>
-              <sources>
-                <source>src/main/kotlin</source>
-              </sources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>${maven-surefire.version}</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>${maven-release.version}</version>
-        <configuration>
-          <autoVersionSubmodules>true</autoVersionSubmodules>
-          <useReleaseProfile>true</useReleaseProfile>
-          <releaseProfiles>release</releaseProfiles>
-          <goals>deploy</goals>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>${maven-compiler.version}</version>
-        <configuration>
-          <release>${java.version}</release>
-        </configuration>
-      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
diff --git a/bidrag-domene/pom.xml b/bidrag-domene/pom.xml
index bb7bcba1..9dc06298 100644
--- a/bidrag-domene/pom.xml
+++ b/bidrag-domene/pom.xml
@@ -9,21 +9,23 @@
     <version>${revision}</version>
   </parent>
 
-  <artifactId>bidrag-domene</artifactId>
+  <artifactId>bidrag-domene-felles</artifactId>
   <name>bidrag-domene</name>
-  <version>${parent.version}</version>
+  <version>${project.parent.version}</version>
   <packaging>jar</packaging>
 
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
     <swagger.version>2.2.19</swagger.version>
     <spring-core.version>6.1.2</spring-core.version>
     <jakarta.version>3.1.0</jakarta.version>
 
-    <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
     <java.version>1.8</java.version>
+    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
+    <kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
+
   </properties>
 
   <dependencies>
@@ -85,101 +87,7 @@
     </dependency>
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>release</id>
-      <activation>
-        <property>
-          <name>release</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <!--create source jar-->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.0</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
 
-        </plugins>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-jar-plugin</artifactId>
-              <version>3.3.0</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <version>3.11.0</version>
-              <configuration>
-                <release>17</release>
-              </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-release-plugin</artifactId>
-              <version>3.0.1</version>
-              <configuration>
-                <autoVersionSubmodules>true</autoVersionSubmodules>
-                <useReleaseProfile>true</useReleaseProfile>
-                <releaseProfiles>release</releaseProfiles>
-                <goals>deploy</goals>
-              </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-source-plugin</artifactId>
-              <version>3.3.0</version>
-              <executions>
-                <execution>
-                  <id>attach-sources</id>
-                  <goals>
-                    <goal>jar</goal>
-                  </goals>
-                </execution>
-              </executions>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-deploy-plugin</artifactId>
-              <version>3.1.1</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <version>3.2.3</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-failsafe-plugin</artifactId>
-              <version>3.2.3</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-resources-plugin</artifactId>
-              <version>3.3.1</version>
-            </plugin>
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>flatten-maven-plugin</artifactId>
-              <version>1.5.0</version>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
-  </profiles>
 
   <build>
     <sourceDirectory>src/main/kotlin</sourceDirectory>
@@ -189,60 +97,11 @@
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
-        <version>${kotlin.version}</version>
-        <configuration>
-          <args>
-            <arg>-Xjsr305=strict</arg>
-          </args>
-        <jvmTarget>1.8</jvmTarget>
-        </configuration>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>test-compile</goal>
-            </goals>
-            <configuration>
-              <sourceDirs>
-                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-              </sourceDirs>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>3.2.3</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>2.5.3</version>
-        <configuration>
-          <autoVersionSubmodules>true</autoVersionSubmodules>
-          <useReleaseProfile>true</useReleaseProfile>
-          <releaseProfiles>release</releaseProfiles>
-          <goals>deploy</goals>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>${maven-antrun.version}</version>
         <executions>
           <execution>
             <id>ktlint</id>
diff --git a/bidrag-domene/src/main/kotlin/no/nav/bidrag/domene/felles/StringToBooleanConverter.kt b/bidrag-domene/src/main/kotlin/no/nav/bidrag/domene/felles/StringToBooleanConverter.kt
index c53534d5..c573267a 100644
--- a/bidrag-domene/src/main/kotlin/no/nav/bidrag/domene/felles/StringToBooleanConverter.kt
+++ b/bidrag-domene/src/main/kotlin/no/nav/bidrag/domene/felles/StringToBooleanConverter.kt
@@ -4,6 +4,7 @@ import org.springframework.core.convert.converter.Converter
 import java.util.Locale
 
 internal class StringToBooleanConverter : Converter<String, Boolean> {
+
     private val trueValues = setOf("true", "on", "yes", "1")
 
     private val falseValues = setOf("false", "off", "no", "0")
diff --git a/bidrag-transport/pom.xml b/bidrag-transport/pom.xml
index 8060e764..215da3f2 100644
--- a/bidrag-transport/pom.xml
+++ b/bidrag-transport/pom.xml
@@ -10,9 +10,9 @@
     <version>${revision}</version>
   </parent>
 
-  <artifactId>bidrag-transport</artifactId>
+  <artifactId>bidrag-transport-felles</artifactId>
   <name>bidrag-transport</name>
-  <version>${parent.version}</version>
+  <version>${project.parent.version}</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -20,17 +20,12 @@
     <spring.version>6.1.2</spring.version>
     <jakarta.version>3.0.2</jakarta.version>
 
-    <kotlin.compiler.jvmTarget>1.8</kotlin.compiler.jvmTarget>
     <java.version>1.8</java.version>
+    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
+    <kotlin.compiler.jvmTarget>${java.version}</kotlin.compiler.jvmTarget>
   </properties>
 
-  <repositories>
-    <repository>
-      <id>github</id>
-      <url>https://maven.pkg.github.com/navikt/bidrag-commons</url>
-    </repository>
-  </repositories>
-
   <dependencies>
     <dependency>
       <groupId>org.jetbrains.kotlin</groupId>
@@ -76,102 +71,6 @@
 
   </dependencies>
 
-  <profiles>
-    <profile>
-      <id>release</id>
-      <activation>
-        <property>
-          <name>release</name>
-        </property>
-      </activation>
-      <build>
-        <plugins>
-          <!--create source jar-->
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>3.3.0</version>
-            <executions>
-              <execution>
-                <id>attach-sources</id>
-                <goals>
-                  <goal>jar-no-fork</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-
-        </plugins>
-        <pluginManagement>
-          <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-jar-plugin</artifactId>
-              <version>3.3.0</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-compiler-plugin</artifactId>
-              <version>3.11.0</version>
-              <configuration>
-                <release>17</release>
-              </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-release-plugin</artifactId>
-              <version>3.0.1</version>
-              <configuration>
-                <autoVersionSubmodules>true</autoVersionSubmodules>
-                <useReleaseProfile>true</useReleaseProfile>
-                <releaseProfiles>release</releaseProfiles>
-                <goals>deploy</goals>
-              </configuration>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-source-plugin</artifactId>
-              <version>3.3.0</version>
-              <executions>
-                <execution>
-                  <id>attach-sources</id>
-                  <goals>
-                    <goal>jar</goal>
-                  </goals>
-                </execution>
-              </executions>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-deploy-plugin</artifactId>
-              <version>3.1.1</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-surefire-plugin</artifactId>
-              <version>3.2.2</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-failsafe-plugin</artifactId>
-              <version>3.2.2</version>
-            </plugin>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-resources-plugin</artifactId>
-              <version>3.3.1</version>
-            </plugin>
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>flatten-maven-plugin</artifactId>
-              <version>1.5.0</version>
-            </plugin>
-          </plugins>
-        </pluginManagement>
-      </build>
-    </profile>
-  </profiles>
-
   <build>
     <sourceDirectory>src/main/kotlin</sourceDirectory>
     <testSourceDirectory>src/test/kotlin</testSourceDirectory>
@@ -180,60 +79,11 @@
       <plugin>
         <groupId>org.jetbrains.kotlin</groupId>
         <artifactId>kotlin-maven-plugin</artifactId>
-        <version>${kotlin.version}</version>
-        <configuration>
-          <args>
-            <arg>-Xjsr305=strict</arg>
-          </args>
-        <jvmTarget>1.8</jvmTarget>
-        </configuration>
-        <executions>
-          <execution>
-            <id>compile</id>
-            <phase>compile</phase>
-            <goals>
-              <goal>compile</goal>
-            </goals>
-          </execution>
-          <execution>
-            <id>test-compile</id>
-            <phase>test-compile</phase>
-            <goals>
-              <goal>test-compile</goal>
-            </goals>
-            <configuration>
-              <sourceDirs>
-                <sourceDir>${project.basedir}/src/test/kotlin</sourceDir>
-              </sourceDirs>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.22.0</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-jar-plugin</artifactId>
-        <version>3.3.0</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-release-plugin</artifactId>
-        <version>3.0.1</version>
-        <configuration>
-          <autoVersionSubmodules>true</autoVersionSubmodules>
-          <useReleaseProfile>true</useReleaseProfile>
-          <releaseProfiles>release</releaseProfiles>
-          <goals>deploy</goals>
-        </configuration>
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-antrun-plugin</artifactId>
-        <version>3.1.0</version>
+        <version>${maven-antrun.version}</version>
         <executions>
           <execution>
             <id>ktlint</id>
@@ -278,14 +128,6 @@
           <!-- additional 3rd party ruleset(s) can be specified here -->
         </dependencies>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <configuration>
-          <source>8</source>
-          <target>8</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
 
diff --git a/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/Arbeidsforhold.kt b/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/Arbeidsforhold.kt
index 6f388b57..8a87337d 100644
--- a/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/Arbeidsforhold.kt
+++ b/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/Arbeidsforhold.kt
@@ -21,13 +21,13 @@ data class ArbeidsforholdGrunnlagDto(
     val arbeidsgiverOrgnummer: String?,
 
     @Schema(description = "Liste av ansettelsesdetaljer, med eventuell historikk")
-    val ansettelsesdetaljer: List<Ansettelsesdetaljer>?,
+    val ansettelsesdetaljerListe: List<Ansettelsesdetaljer>?,
 
     @Schema(description = "Liste over registrerte permisjoner")
-    val permisjoner: List<Permisjon>?,
+    val permisjonListe: List<Permisjon>?,
 
     @Schema(description = "Liste over registrerte permitteringer")
-    val permitteringer: List<Permittering>?,
+    val permitteringListe: List<Permittering>?,
 )
 
 data class Ansettelsesdetaljer(
diff --git a/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/HentGrunnlagDto.kt b/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/HentGrunnlagDto.kt
index 542b7181..9d07701a 100644
--- a/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/HentGrunnlagDto.kt
+++ b/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/HentGrunnlagDto.kt
@@ -1,7 +1,6 @@
 package no.nav.bidrag.transport.behandling.grunnlag.response
 
 import io.swagger.v3.oas.annotations.media.Schema
-import no.nav.bidrag.transport.person.SivilstandPdlHistorikkDto
 import java.time.LocalDateTime
 
 data class HentGrunnlagDto(
@@ -28,7 +27,7 @@ data class HentGrunnlagDto(
     val husstandsmedlemmerOgEgneBarnListe: List<RelatertPersonGrunnlagDto>,
 
     @Schema(description = "Periodisert liste over en persons sivilstand")
-    val sivilstandListe: List<SivilstandPdlHistorikkDto>,
+    val sivilstandListe: List<SivilstandGrunnlagDto>,
 
     @Schema(description = "Periodisert liste over innhentet barnetilsyn")
     val barnetilsynListe: List<BarnetilsynGrunnlagDto>,
diff --git a/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/SivilstandDto.kt b/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/Sivilstand.kt
similarity index 57%
rename from bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/SivilstandDto.kt
rename to bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/Sivilstand.kt
index fe8ed4c9..4cddf4f9 100644
--- a/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/SivilstandDto.kt
+++ b/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/Sivilstand.kt
@@ -30,3 +30,26 @@ data class SivilstandDto(
     @Schema(description = "Hentet tidspunkt")
     val hentetTidspunkt: LocalDateTime,
 )
+
+data class SivilstandGrunnlagDto(
+    @Schema(description = "Id til personen sivilstanden er rapportert for")
+    val personId: String?,
+
+    @Schema(description = "Type sivilstand fra PDL")
+    val type: SivilstandskodePDL?,
+
+    @Schema(description = "Dato sivilstanden er gyldig fra")
+    val gyldigFom: LocalDate?,
+
+    @Schema(description = "Dato NAV tidligst har fått bekreftet sivilstanden")
+    val bekreftelsesdato: LocalDate?,
+
+    @Schema(description = "Master for opplysningen om sivilstand (FREG eller PDL)")
+    val master: String?,
+
+    @Schema(description = "Tidspunktet sivilstanden er registrert")
+    val registrert: LocalDateTime?,
+
+    @Schema(description = "Angir om sivilstanden er historisk (true) eller aktiv (false)")
+    val historisk: Boolean?,
+)
diff --git a/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/Skattegrunnlag.kt b/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/Skattegrunnlag.kt
index 6cb9fb72..9c3e7fdc 100644
--- a/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/Skattegrunnlag.kt
+++ b/bidrag-transport/src/main/kotlin/no/nav/bidrag/transport/behandling/grunnlag/response/Skattegrunnlag.kt
@@ -44,7 +44,7 @@ data class SkattegrunnlagGrunnlagDto(
     val periodeTil: LocalDate,
 
     @Schema(description = "Liste over poster med skattegrunnlag")
-    val skattegrunnlagListe: List<SkattegrunnlagspostDto>,
+    val skattegrunnlagspostListe: List<SkattegrunnlagspostDto>,
 )
 
 data class SkattegrunnlagspostDto(
diff --git a/pom.xml b/pom.xml
index a7ae3d32..12487f83 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,19 @@
         <kotest.version>5.8.0</kotest.version>
         <swagger.version>2.2.20</swagger.version>
 
+
+        <!-- plugins -->
+        <maven-compiler.version>3.12.1</maven-compiler.version>
         <maven-source.version>3.3.0</maven-source.version>
+        <maven-surefire.version>3.2.5</maven-surefire.version>
+        <maven-deploy.version>3.1.1</maven-deploy.version>
+        <maven-failsafe.version>3.2.5</maven-failsafe.version>
+        <maven-resources.version>3.3.1</maven-resources.version>
+        <maven-release.version>3.0.1</maven-release.version>
+        <maven-antrun.version>3.1.0</maven-antrun.version>
+        <maven-jar.version>3.3.0</maven-jar.version>
+        <flatten-maven.version>1.5.0</flatten-maven.version>
+        <build-helper-maven.version>3.5.0</build-helper-maven.version>
     </properties>
 
     <modules>
@@ -27,6 +39,12 @@
         <module>bidrag-transport</module>
         <module>bidrag-commons</module>
     </modules>
+    <repositories>
+        <repository>
+            <id>github</id>
+            <url>https://maven.pkg.github.com/navikt/bidrag-felles</url>
+        </repository>
+    </repositories>
     <distributionManagement>
         <repository>
             <id>github</id>
@@ -104,14 +122,141 @@
         </dependencies>
     </dependencyManagement>
 
+    <profiles>
+        <profile>
+            <id>release</id>
+            <activation>
+                <property>
+                    <name>release</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>${maven-surefire.version}</version>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-jar-plugin</artifactId>
+                        <version>${maven-jar.version}</version>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-release-plugin</artifactId>
+                        <version>${maven-release.version}</version>
+                        <configuration>
+                            <autoVersionSubmodules>true</autoVersionSubmodules>
+                            <useReleaseProfile>true</useReleaseProfile>
+                            <releaseProfiles>release</releaseProfiles>
+                            <goals>deploy</goals>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+
     <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.jetbrains.kotlin</groupId>
+                    <artifactId>kotlin-maven-plugin</artifactId>
+                    <version>${kotlin.version}</version>
+                    <configuration>
+                        <args>
+                            <arg>-Xjsr305=strict</arg>
+                        </args>
+                        <jvmTarget>${java.version}</jvmTarget>
+                    </configuration>
+                    <executions>
+                        <execution>
+                            <id>compile</id>
+                            <phase>compile</phase>
+                            <goals>
+                                <goal>compile</goal>
+                            </goals>
+                        </execution>
+                        <execution>
+                            <id>test-compile</id>
+                            <phase>test-compile</phase>
+                            <goals>
+                                <goal>test-compile</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-jar-plugin</artifactId>
+                    <version>${maven-jar.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <version>${maven-compiler.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-release-plugin</artifactId>
+                    <version>${maven-release.version}</version>
+                    <configuration>
+                        <autoVersionSubmodules>true</autoVersionSubmodules>
+                        <useReleaseProfile>true</useReleaseProfile>
+                        <releaseProfiles>release</releaseProfiles>
+                        <goals>deploy</goals>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-source-plugin</artifactId>
+                    <version>${maven-source.version}</version>
+                    <executions>
+                        <execution>
+                            <id>attach-sources</id>
+                            <goals>
+                                <goal>jar</goal>
+                            </goals>
+                        </execution>
+                    </executions>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-deploy-plugin</artifactId>
+                    <version>${maven-deploy.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-surefire-plugin</artifactId>
+                    <version>${maven-surefire.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-failsafe-plugin</artifactId>
+                    <version>${maven-failsafe.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-resources-plugin</artifactId>
+                    <version>${maven-resources.version}</version>
+                </plugin>
+                <plugin>
+                    <groupId>org.codehaus.mojo</groupId>
+                    <artifactId>flatten-maven-plugin</artifactId>
+                    <version>${flatten-maven.version}</version>
+                </plugin>
+            </plugins>
+        </pluginManagement>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>${maven-source.version}</version>
             </plugin>
         </plugins>
     </build>
 
+
 </project>
\ No newline at end of file