diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 9f7d503..dc5fbd5 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -27,18 +27,15 @@ jobs:
       with:
         maven-version: '3.9.9'
 
-    - name: Write Maven settings
-      run: echo -e "$MVN_SETTINGS_XML" > ~/.m2/settings.xml
-      env:
-        MVN_SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }}
-
     - name: Set up JDK 8
       uses: actions/setup-java@v4
       with:
         java-version: '8'
         distribution: 'corretto'
         cache: maven
-        overwrite-settings: false
+        server-id: pravila--pravila-maven
+        server-username: MAVEN_USER
+        server-password: CODEARTIFACT_AUTH_TOKEN
 
     - name: Set up AWS Cli
       run: |
@@ -62,4 +59,5 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CA_USER }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CA_PASSWORD }}
+        MAVEN_USER: aws
 
diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index 7b4f54d..18afd6b 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -36,18 +36,15 @@ jobs:
       with:
         maven-version: '3.9.9'
 
-    - name: Write Maven settings
-      run: echo -e "$MVN_SETTINGS_XML" > ~/.m2/settings.xml
-      env:
-        MVN_SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }}
-
     - name: Set up JDK 8
       uses: actions/setup-java@v4
       with:
         java-version: '8'
         distribution: 'corretto'
         cache: maven
-        overwrite-settings: false
+        server-id: pravila--pravila-maven
+        server-username: MAVEN_USER
+        server-password: CODEARTIFACT_AUTH_TOKEN
 
     - name: Set up AWS Cli
       run: |
@@ -80,3 +77,4 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CA_USER }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CA_PASSWORD }}
         REPO_URL: scm:git:git@devops.pravilanovait.hr:${{ github.repository }}
+        MAVEN_USER: aws
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 82fc762..48bb895 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -28,18 +28,15 @@ jobs:
       with:
         maven-version: '3.9.9'
 
-    - name: Write Maven settings
-      run: echo -e "$MVN_SETTINGS_XML" > ~/.m2/settings.xml
-      env:
-        MVN_SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }}
-
     - name: Set up JDK 8
       uses: actions/setup-java@v4
       with:
         java-version: '8'
         distribution: 'corretto'
         cache: maven
-        overwrite-settings: false
+        server-id: pravila--pravila-maven
+        server-username: MAVEN_USER
+        server-password: CODEARTIFACT_AUTH_TOKEN
 
     - name: Set up AWS Cli
       run: |
@@ -51,12 +48,14 @@ jobs:
       env:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CA_USER }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CA_PASSWORD }}
+        MAVEN_USER: aws
 
     - name: Build with Maven
       run: mvn -B clean package -s mvn-settings.xml
       env:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CA_USER }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CA_PASSWORD }}
+        MAVEN_USER: aws
 
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
 #    - name: Update dependency graph