diff --git a/.github/workflows/maven-publish.yml b/.github/workflows/maven-publish.yml
index 1544097..ed35d37 100644
--- a/.github/workflows/maven-publish.yml
+++ b/.github/workflows/maven-publish.yml
@@ -40,17 +40,6 @@ jobs:
         distribution: 'corretto'
         cache: maven
 
-    - name: Set up AWS Cli
-      run: |
-        curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-        unzip -q awscliv2.zip
-        ./aws/install
-        export TOKEN=`aws codeartifact get-authorization-token --region eu-west-1 --domain pravila --domain-owner 867459752380 --query authorizationToken --output text`
-        echo "CODEARTIFACT_AUTH_TOKEN=$TOKEN" >> $GITHUB_ENV
-      env:
-        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
@@ -58,6 +47,7 @@ jobs:
         echo "CODEARTIFACT_AUTH_TOKEN: $CODEARTIFACT_AUTH_TOKEN"
       env:
         SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }}
+        CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }}
 
     - name: Build with Maven
       run: |
@@ -70,4 +60,5 @@ jobs:
         GITHUB_TOKEN: ${{ github.token }}
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CA_USER }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CA_PASSWORD }}
+        CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }}
 
diff --git a/.github/workflows/maven-release.yml b/.github/workflows/maven-release.yml
index 96e0b9d..62d7ac6 100644
--- a/.github/workflows/maven-release.yml
+++ b/.github/workflows/maven-release.yml
@@ -45,17 +45,6 @@ jobs:
         distribution: 'corretto'
         cache: maven
 
-    - name: Set up AWS Cli
-      run: |
-        curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-        unzip -q awscliv2.zip
-        ./aws/install
-        export TOKEN=`aws codeartifact get-authorization-token --region eu-west-1 --domain pravila --domain-owner 867459752380 --query authorizationToken --output text`
-        echo "CODEARTIFACT_AUTH_TOKEN=$TOKEN" >> $GITHUB_ENV
-      env:
-        AWS_ACCESS_KEY_ID: ${{ secrets.AWS_CA_USER }}
-        AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_CA_PASSWORD }}
-
     - name: Config git and ssh
       run: |
         git config --global user.email "gitea@pravilanovait.hr"
@@ -73,6 +62,7 @@ jobs:
         echo "CODEARTIFACT_AUTH_TOKEN: $CODEARTIFACT_AUTH_TOKEN"
       env:
         SETTINGS_XML: ${{ secrets.MVN_SETTINGS_XML }}
+        CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }}
 
     - name: Maven release
       run: |
@@ -83,3 +73,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 }}
+        CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }}
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index 2a732d7..7fd5abe 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -35,17 +35,6 @@ jobs:
         distribution: 'corretto'
         cache: maven
 
-    - name: Set up AWS Cli
-      run: |
-        curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-        unzip -q awscliv2.zip
-        ./aws/install
-        export TOKEN=`aws codeartifact get-authorization-token --region eu-west-1 --domain pravila --domain-owner 867459752380 --query authorizationToken --output text`
-        echo "CODEARTIFACT_AUTH_TOKEN=$TOKEN" >> $GITHUB_ENV
-      env:
-        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
@@ -53,12 +42,14 @@ jobs:
         echo "CODEARTIFACT_AUTH_TOKEN: $CODEARTIFACT_AUTH_TOKEN"
       env:
         SETTINGS_XML: ${{ vars.MVN_SETTINGS_XML }}
+        CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }}
 
     - 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 }}
+        CODEARTIFACT_AUTH_TOKEN: ${{ secrets.AWS_CA_TOKEN }}
 
     # Optional: Uploads the full dependency graph to GitHub to improve the quality of Dependabot alerts this repository can receive
 #    - name: Update dependency graph