diff --git a/.github/workflows/aws-ui-cd-prod.yml b/.github/workflows/aws-ui-cd-prod.yml
index b254dd05..c7610e61 100644
--- a/.github/workflows/aws-ui-cd-prod.yml
+++ b/.github/workflows/aws-ui-cd-prod.yml
@@ -1,9 +1,9 @@
 name: time-tracker-ui-cd-prod
 
 on:
-  push:
-    branches:
-      - 'fast-api*'
+  release:
+    types:
+      - published
 
 jobs:
   cd:
@@ -36,30 +36,12 @@ jobs:
       run: |
         make login publish_prod image_tag=$RELEASE_VERSION
 
-    - name: SCP files via ssh key
-      uses: appleboy/scp-action@master
-      env:
-        USERNAME: ${{ secrets.AWS_EC2_USER }}
-        HOST: ${{ secrets.PROD_UI_URL }}
-        KEY: ${{ secrets.PROD_AWS_PRIVATE_KEY }}
-      with:
-        source: './infrastructure/aws_ec2.sh'
-        target: '.'
-
-    - name: SCP files via ssh key - .prod.aws.env
-      uses: appleboy/scp-action@master
-      env:
-        USERNAME: ${{ secrets.AWS_EC2_USER }}
-        HOST: ${{ secrets.PROD_UI_URL }}
-        KEY: ${{ secrets.PROD_AWS_PRIVATE_KEY }}
-      with:
-        source: '.prod.aws.env'
-        target: '.'
-
     - name: Deploy
       run: |
         TEMP=$(mktemp)
         echo "${{ secrets.PROD_AWS_PRIVATE_KEY }}" > $TEMP
         chmod 400 $TEMP
+        scp -o 'StrictHostKeyChecking no' -i $TEMP ./.prod.aws.env ${{ secrets.AWS_EC2_USER }}@${{ secrets.PROD_UI_URL }}:.
+        scp -o 'StrictHostKeyChecking no' -i $TEMP ./infrastructure/aws_ec2.sh ${{ secrets.AWS_EC2_USER }}@${{ secrets.PROD_UI_URL }}:./infrastructure/aws_ec2.sh
         ssh -o 'StrictHostKeyChecking no' -i $TEMP ${{ secrets.AWS_EC2_USER }}@${{ secrets.PROD_UI_URL }} "chmod +x ./infrastructure/aws_ec2.sh"
         ssh -o 'StrictHostKeyChecking no' -i $TEMP ${{ secrets.AWS_EC2_USER }}@${{ secrets.PROD_UI_URL }} "./infrastructure/aws_ec2.sh $RELEASE_VERSION" prod
diff --git a/.github/workflows/aws-ui-cd-stage.yml b/.github/workflows/aws-ui-cd-stage.yml
index bd7c146f..b17def91 100644
--- a/.github/workflows/aws-ui-cd-stage.yml
+++ b/.github/workflows/aws-ui-cd-stage.yml
@@ -1,9 +1,9 @@
 name: time-tracker-ui-cd-stage
 
 on:
-  release:
-    types:
-      - published
+  push:
+    tags:
+      - 'v*.*.*'
 
 jobs:
   cd:
@@ -38,30 +38,12 @@ jobs:
       run: |
         make login publish image_tag=$RELEASE_VERSION
 
-    - name: SCP files via ssh key - script 
-      uses: appleboy/scp-action@master
-      env:
-        USERNAME: ${{ secrets.AWS_EC2_USER }}
-        HOST: ${{ secrets.STAGE_UI_URL }}
-        KEY: ${{ secrets.STAGE_AWS_PRIVATE_KEY }}
-      with:
-        source: './infrastructure/aws_ec2.sh'
-        target: '.'
-
-    - name: SCP files via ssh key - .stage.aws.env
-      uses: appleboy/scp-action@master
-      env:
-        USERNAME: ${{ secrets.AWS_EC2_USER }}
-        HOST: ${{ secrets.STAGE_UI_URL }}
-        KEY: ${{ secrets.STAGE_AWS_PRIVATE_KEY }}
-      with:
-        source: '.stage.aws.env'
-        target: '.'
-
     - name: Deploy
       run: |
         TEMP=$(mktemp)
         echo "${{ secrets.STAGE_AWS_PRIVATE_KEY }}" > $TEMP
         chmod 400 $TEMP
+        scp -o 'StrictHostKeyChecking no' -i $TEMP ./.stage.aws.env ${{ secrets.AWS_EC2_USER }}@${{ secrets.STAGE_UI_URL }}:.
+        scp -o 'StrictHostKeyChecking no' -i $TEMP ./infrastructure/aws_ec2.sh ${{ secrets.AWS_EC2_USER }}@${{ secrets.STAGE_UI_URL }}:./infrastructure/aws_ec2.sh
         ssh -o 'StrictHostKeyChecking no' -i $TEMP ${{ secrets.AWS_EC2_USER }}@${{ secrets.STAGE_UI_URL }} "chmod +x ./infrastructure/aws_ec2.sh"
         ssh -o 'StrictHostKeyChecking no' -i $TEMP ${{ secrets.AWS_EC2_USER }}@${{ secrets.STAGE_UI_URL }} "./infrastructure/aws_ec2.sh $RELEASE_VERSION" stage