diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 68fe941..38a3c75 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,7 +37,7 @@ jobs:
             gradle-${{ runner.os }}-
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4
+        uses: gradle/actions/setup-gradle@0b6dd653ba04f4f93bf581ec31e66cbd7dcb644d
 
       - name: Build with Gradle
         run: ./gradlew clean build
@@ -55,9 +55,6 @@ jobs:
   publish:
     needs: build
     runs-on: ubuntu-latest
-    container:
-      image: gcr.io/kaniko-project/executor:debug
-      options: --entrypoint ""
 
     steps:
       - name: Checkout code
@@ -72,29 +69,28 @@ jobs:
       - name: Generate version tag
         id: version
         run: |
-          if [ "${GITHUB_REF#refs/tags/}" != "$GITHUB_REF" ]; then
-            VERSION_TAG=$(echo "$GITHUB_REF" | sed 's|refs/tags/v||')
-          elif [ "$GITHUB_REF" = "refs/heads/main" ]; then
-            SHORT_SHA=$(echo "$GITHUB_SHA" | cut -c1-7)
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION_TAG=${GITHUB_REF#refs/tags/v}
+          elif [[ $GITHUB_REF == refs/heads/main ]]; then
+            SHORT_SHA=$(git rev-parse --short HEAD)
             VERSION_TAG="main-${SHORT_SHA}"
           else
-            SHORT_SHA=$(echo "$GITHUB_SHA" | cut -c1-7)
+            SHORT_SHA=$(git rev-parse --short HEAD)
             VERSION_TAG="develop-${SHORT_SHA}"
           fi
           echo "tag=$VERSION_TAG" >> $GITHUB_OUTPUT
-
-      - name: Set up Kaniko Docker config
-        run: |
-          mkdir -p /kaniko/.docker
-          echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"auth\":\"$(echo -n $DOCKERHUB_USERNAME:$DOCKERHUB_TOKEN | base64)\"}}}" > /kaniko/.docker/config.json
-        env:
-          DOCKERHUB_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }}
+          echo "Generated version tag: $VERSION_TAG"
 
       - name: Build and push Docker image with Kaniko
         run: |
-          /kaniko/executor \
-            --context=$GITHUB_WORKSPACE \
-            --dockerfile=$GITHUB_WORKSPACE/Dockerfile \
+          mkdir -p /tmp/kaniko/.docker
+          echo "{\"auths\":{\"https://index.docker.io/v1/\":{\"auth\":\"$(echo -n ${{ env.DOCKERHUB_USERNAME }}:${{ secrets.DOCKERHUB_TOKEN }} | base64)\"}}}" > /tmp/kaniko/.docker/config.json
+          docker run \
+            -v ${{ github.workspace }}:/workspace \
+            -v /tmp/kaniko/.docker:/kaniko/.docker \
+            gcr.io/kaniko-project/executor:latest \
+            --context=/workspace \
+            --dockerfile=/workspace/Dockerfile \
             --destination=${{ env.DOCKERHUB_USERNAME }}/devoops-backend-poc:${{ steps.version.outputs.tag }} \
             --destination=${{ env.DOCKERHUB_USERNAME }}/devoops-backend-poc:latest \
             --cache=true \