diff --git a/.github/actions/build-dev.yml b/.github/actions/build-dev.yml
index 5385e55b..2fb6e82c 100644
--- a/.github/actions/build-dev.yml
+++ b/.github/actions/build-dev.yml
@@ -10,7 +10,6 @@ jobs:
     with:
       ENVIRONMENT: DEV
       MICROSERVICE_NAME: cirras-underwriting-api
-      VERSION_NUMBER: 1.0.0-SNAPSHOT
 
   build-underwriting-listener-api:
     uses: ./.github/actions/build-package
@@ -18,7 +17,6 @@ jobs:
     with:
       ENVIRONMENT: DEV
       MICROSERVICE_NAME: cirras-underwriting-listener-api
-      VERSION_NUMBER: 1.0.0-SNAPSHOT
 
   build-underwriting-war:
     uses: ./.github/actions/build-package
@@ -26,4 +24,3 @@ jobs:
     with:
       ENVIRONMENT: DEV
       MICROSERVICE_NAME: cirras-underwriting-war
-      VERSION_NUMBER: 1.0.0-SNAPSHOT
diff --git a/.github/actions/build-package.yml b/.github/actions/build-package.yml
index fa61d828..6a4fb760 100644
--- a/.github/actions/build-package.yml
+++ b/.github/actions/build-package.yml
@@ -9,9 +9,6 @@ on:
       MICROSERVICE_NAME:
         required: true
         type: string
-      VERSION_NUMBER:
-        required: true
-        type: string
 
 env:
   DIRECTORY_SUFFIX: ${{ contains(inputs.MICROSERVICE_NAME, '-api') && '-rest-endpoints' || '' }}
@@ -36,7 +33,7 @@ jobs:
         run: |
           export MAVEN_OPTS="-Xmx3072m -XX:MaxMetaspaceSize=512m"
           export NODE_OPTIONS="--max-old-space-size=4096"
-          mvn --batch-mode --update-snapshots -f ${{ inputs.MICROSERVICE_NAME }}/pom.xml -Drepo.login=${{ secrets.IDIR_AS_EMAIL }} -Drepo.password=${{ secrets.IDIR_PASSWORD }} package
+          mvn --settings=settings.xml --batch-mode --update-snapshots -f ${{ inputs.MICROSERVICE_NAME }}/pom.xml -Drepo.login=${{ secrets.IDIR_AS_EMAIL }} -Drepo.password=${{ secrets.IDIR_PASSWORD }} package
 
       - name: Copy files to neccessary folders
         run: mkdir staging && cp ${{ inputs.MICROSERVICE_NAME }}/${{ inputs.MICROSERVICE_NAME }}${{ DIRECTORY_SUFFIX }}/target/*.war staging
diff --git a/.github/actions/underwriting-api-ci.yml b/.github/actions/underwriting-api-ci.yml
new file mode 100644
index 00000000..26478733
--- /dev/null
+++ b/.github/actions/underwriting-api-ci.yml
@@ -0,0 +1,16 @@
+name: cirras-underwriting-api CI build
+
+on:
+  pull_request_target:
+    branches:
+      - main
+    paths:
+      - cirras-underwriting-api/**
+
+jobs:
+  build-underwriting-api:
+    uses: ./.github/actions/build-package
+    secrets: inherit
+    with:
+      ENVIRONMENT: DEV
+      MICROSERVICE_NAME: cirras-underwriting-api
diff --git a/.github/actions/underwriting-listener-api-ci.yml b/.github/actions/underwriting-listener-api-ci.yml
new file mode 100644
index 00000000..0037e3a4
--- /dev/null
+++ b/.github/actions/underwriting-listener-api-ci.yml
@@ -0,0 +1,16 @@
+name: cirras-underwriting-listener-api CI build
+
+on:
+  pull_request_target:
+    branches:
+      - main
+    paths:
+      - cirras-underwriting-listener-api/**
+
+jobs:
+  build-underwriting-listener-api:
+    uses: ./.github/actions/build-package
+    secrets: inherit
+    with:
+      ENVIRONMENT: DEV
+      MICROSERVICE_NAME: cirras-underwriting-listener-api
diff --git a/.github/actions/underwriting-war-ci.yml b/.github/actions/underwriting-war-ci.yml
new file mode 100644
index 00000000..da4577d7
--- /dev/null
+++ b/.github/actions/underwriting-war-ci.yml
@@ -0,0 +1,16 @@
+name: cirras-underwriting-war CI build
+
+on:
+  pull_request_target:
+    branches:
+      - main
+    paths:
+      - cirras-underwriting-war/**
+
+jobs:
+  build-underwriting-war:
+    uses: ./.github/actions/build-package
+    secrets: inherit
+    with:
+      ENVIRONMENT: DEV
+      MICROSERVICE_NAME: cirras-underwriting-war