diff --git a/.github/workflows/release_insignia.yaml b/.github/workflows/release_insignia.yaml
index 55f73bc1..d7a59b96 100644
--- a/.github/workflows/release_insignia.yaml
+++ b/.github/workflows/release_insignia.yaml
@@ -21,11 +21,15 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       # skip Set up QEMU because it fail on act and container
+      # Gen Version try to get version from tag or inut
+      - name: Set output tags
+        id: vars
+        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
       - name: Gen Version
         id: gen_ver
         run: |
           if [[ $GITHUB_REF == 'refs/tags/'* ]]; then
-            IMAGE_VER='${GITHUB_REF/refs\/tags\//}'
+            IMAGE_VER=${{ steps.vars.outputs.tag }}
           else
             IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
           fi
@@ -33,10 +37,11 @@ jobs:
             IMAGE_VER='test-vBeta'
           fi
           echo '::set-output name=image_ver::'$IMAGE_VER
-      - name: Test Version
+      - name: Check Version
         run: |
           echo $GITHUB_REF
           echo ${{ steps.gen_ver.outputs.image_ver }}
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Login in to registry
@@ -45,7 +50,7 @@ jobs:
           registry: ${{env.REGISTRY}}
           username: ${{secrets.DOCKER_USER}}
           password: ${{secrets.DOCKER_PASS}}
-      - name: Build and load local docker image
+      - name: Build and push docker image
         uses: docker/build-push-action@v3
         with:
           context: .
@@ -53,14 +58,13 @@ jobs:
           file: BMA.EHR.Insignia/Dockerfile
           push: true
           tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest
-
-      - name: Reload docker compose
+      - name: Remote Deployment
         uses: appleboy/ssh-action@v0.1.8
         with:
           host: ${{env.DEPLOY_HOST}}
           username: frappet
           password: ${{ secrets.SSH_PASSWORD }}
-          port: ${{env.DEPLOY_PORT}}
+          port: 10102
           script: |
             cd "${{env.COMPOSE_PATH}}"
             docker compose pull
@@ -69,18 +73,18 @@ jobs:
       - uses: snow-actions/line-notify@v1.1.0
         if: success()
         with:
-          access_token: ${{ env.TOKEN_LINE }}
+          access_token: ${{ secrets.TOKEN_LINE }}
           message: |
             -Success✅✅✅
             Image: ${{env.IMAGE_NAME}}
-            Version: ${{ github.event.inputs.IMAGE_VER }}
+            Version: ${{ steps.gen_ver.outputs.IMAGE_VER }}
             By: ${{secrets.DOCKER_USER}}
       - uses: snow-actions/line-notify@v1.1.0
         if: failure()
         with:
-          access_token: ${{ env.TOKEN_LINE }}
+          access_token: ${{ secrets.TOKEN_LINE }}
           message: |
             -Failure❌❌❌
             Image: ${{env.IMAGE_NAME}}
-            Version: ${{ github.event.inputs.IMAGE_VER }}
-            By: ${{secrets.DOCKER_USER}}
+            Version: ${{ steps.gen_ver.outputs.IMAGE_VER }}
+            By: ${{secrets.DOCKER_USER}}
\ No newline at end of file
diff --git a/.github/workflows/release_leave.yaml b/.github/workflows/release_leave.yaml
index 5a3194be..d819190e 100644
--- a/.github/workflows/release_leave.yaml
+++ b/.github/workflows/release_leave.yaml
@@ -21,11 +21,15 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       # skip Set up QEMU because it fail on act and container
+      # Gen Version try to get version from tag or inut
+      - name: Set output tags
+        id: vars
+        run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
       - name: Gen Version
         id: gen_ver
         run: |
           if [[ $GITHUB_REF == 'refs/tags/'* ]]; then
-            IMAGE_VER='${GITHUB_REF/refs\/tags\//}'
+            IMAGE_VER=${{ steps.vars.outputs.tag }}
           else
             IMAGE_VER=${{ github.event.inputs.IMAGE_VER }}
           fi
@@ -33,10 +37,11 @@ jobs:
             IMAGE_VER='test-vBeta'
           fi
           echo '::set-output name=image_ver::'$IMAGE_VER
-      - name: Test Version
+      - name: Check Version
         run: |
           echo $GITHUB_REF
           echo ${{ steps.gen_ver.outputs.image_ver }}
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
       - name: Login in to registry
@@ -45,7 +50,7 @@ jobs:
           registry: ${{env.REGISTRY}}
           username: ${{secrets.DOCKER_USER}}
           password: ${{secrets.DOCKER_PASS}}
-      - name: Build and load local docker image
+      - name: Build and push docker image
         uses: docker/build-push-action@v3
         with:
           context: .
@@ -53,14 +58,13 @@ jobs:
           file: BMA.EHR.Leave/Dockerfile
           push: true
           tags: ${{env.REGISTRY}}/${{env.IMAGE_NAME}}:${{ steps.gen_ver.outputs.image_ver }},${{env.REGISTRY}}/${{env.IMAGE_NAME}}:latest
-
-      - name: Reload docker compose
+      - name: Remote Deployment
         uses: appleboy/ssh-action@v0.1.8
         with:
           host: ${{env.DEPLOY_HOST}}
           username: frappet
           password: ${{ secrets.SSH_PASSWORD }}
-          port: ${{env.DEPLOY_PORT}}
+          port: 10102
           script: |
             cd "${{env.COMPOSE_PATH}}"
             docker compose pull
@@ -69,18 +73,18 @@ jobs:
       - uses: snow-actions/line-notify@v1.1.0
         if: success()
         with:
-          access_token: ${{ env.TOKEN_LINE }}
+          access_token: ${{ secrets.TOKEN_LINE }}
           message: |
             -Success✅✅✅
             Image: ${{env.IMAGE_NAME}}
-            Version: ${{ github.event.inputs.IMAGE_VER }}
+            Version: ${{ steps.gen_ver.outputs.IMAGE_VER }}
             By: ${{secrets.DOCKER_USER}}
       - uses: snow-actions/line-notify@v1.1.0
         if: failure()
         with:
-          access_token: ${{ env.TOKEN_LINE }}
+          access_token: ${{ secrets.TOKEN_LINE }}
           message: |
             -Failure❌❌❌
             Image: ${{env.IMAGE_NAME}}
-            Version: ${{ github.event.inputs.IMAGE_VER }}
-            By: ${{secrets.DOCKER_USER}}
+            Version: ${{ steps.gen_ver.outputs.IMAGE_VER }}
+            By: ${{secrets.DOCKER_USER}}
\ No newline at end of file