diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 73c07c4..304f95b 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -33,9 +33,6 @@ jobs:
         java-version: '8'
         distribution: 'corretto'
         cache: maven
-        server-id: pravila--pravila-maven
-        server-username: MAVEN_USER
-        server-password: CODEARTIFACT_AUTH_TOKEN
 
     - name: Set up AWS Cli
       run: |
@@ -48,6 +45,14 @@ jobs:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CA_USER }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CA_PASSWORD }}
 
+    - name: Create Maven settings
+      run: |
+        echo -e "$SETTINGS_XML" > ~/.m2/settings.xml
+        cat ~/.m2/settings.xml
+        echo "CODEARTIFACT_AUTH_TOKEN: $CODEARTIFACT_AUTH_TOKEN"
+      env:
+        SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }}
+
     - name: Build with Maven
       run: |
         mvn -B clean package --file pom.xml
@@ -59,5 +64,4 @@ 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 cf92fa0..206f0c0 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -42,9 +42,6 @@ jobs:
         java-version: '8'
         distribution: 'corretto'
         cache: maven
-        server-id: pravila--pravila-maven
-        server-username: MAVEN_USER
-        server-password: CODEARTIFACT_AUTH_TOKEN
 
     - name: Set up AWS Cli
       run: |
@@ -67,6 +64,14 @@ jobs:
         ssh-keygen -R devops.pravilanovait.hr
         ssh-keyscan -t rsa devops.pravilanovait.hr > ~/.ssh/known_hosts
 
+    - name: Create Maven settings
+      run: |
+        echo -e "$SETTINGS_XML" > ~/.m2/settings.xml
+        cat ~/.m2/settings.xml
+        echo "CODEARTIFACT_AUTH_TOKEN: $CODEARTIFACT_AUTH_TOKEN"
+      env:
+        SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }}
+
     - name: Maven release
       run: |
         mvn org.apache.maven.plugins:maven-release-plugin:3.1.0:prepare -B -DrepositoryId=deploy -DconnectionUrl=$REPO_URL
@@ -76,4 +81,3 @@ 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 338ac32..29e714d 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -34,9 +34,6 @@ jobs:
         java-version: '8'
         distribution: 'corretto'
         cache: maven
-        server-id: pravila--pravila-maven
-        server-username: MAVEN_USER
-        server-password: CODEARTIFACT_AUTH_TOKEN
 
     - name: Set up AWS Cli
       run: |
@@ -48,14 +45,20 @@ jobs:
       env:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CA_USER }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CA_PASSWORD }}
-        MAVEN_USER: aws
+
+    - name: Create Maven settings
+      run: |
+        echo -e "$SETTINGS_XML" > ~/.m2/settings.xml
+        cat ~/.m2/settings.xml
+        echo "CODEARTIFACT_AUTH_TOKEN: $CODEARTIFACT_AUTH_TOKEN"
+      env:
+        SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }}
 
     - name: Build with Maven
       run: mvn -B clean package
       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