diff --git a/.docker/Dockerfile b/.docker/Dockerfile
index c312f20..39d6614 100644
--- a/.docker/Dockerfile
+++ b/.docker/Dockerfile
@@ -12,11 +12,11 @@ ENV TERRAFORM_VERSION=1.9.5
 ENV ANSIBLE_VERSION=10.3.0
 ENV LINT_VERSION=4.1.0
 ENV KUBECTL_VERSION=1.31.0
-ENV HELM_VERSION=3.15.4
+ENV HELM_VERSION=3.16.1
 ENV AZURE_CLI_VERSION=2.64.0-1~jammy
-ENV AWS_CLI_VERSION=2.17.47
+ENV AWS_CLI_VERSION=2.17.49
 ENV K9s_Version=0.32.5
-ENV GCLOUD_VERSION=490.0.0
+ENV GCLOUD_VERSION=491.0.0
 ENV KUI_Version=13.1.4
 ENV KUBECTX_VERSION=0.9.4
 ENV KUBENS_VERSION=0.9.4
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 760d81f..d72a518 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -27,4 +27,17 @@ updates:
     reviewers:
       - "approvers"
     # Allow up to 3 open pull requests for pip dependencies
+    open-pull-requests-limit: 3
+
+  - package-ecosystem: "docker" # See documentation for possible values
+    directory: "./" # Location of package manifests
+    schedule:
+      interval: "weekly"
+    # Add assignees
+    assignees:
+      - "clouddrove-ci"
+    # Add reviewer
+    reviewers:
+      - "approvers"
+    # Allow up to 3 open pull requests for pip dependencies
     open-pull-requests-limit: 3
\ No newline at end of file
diff --git a/.github/workflows/enigma-docker.yml b/.github/workflows/enigma-docker.yml
index a566fba..0639f9d 100644
--- a/.github/workflows/enigma-docker.yml
+++ b/.github/workflows/enigma-docker.yml
@@ -11,35 +11,33 @@ jobs:
       id-token: 'write'
     env:
       DOCKER_IMAGE: devops-machine
-      DOCKER_TAG: ghcr.io/${{ github.repository }}:${{ github.ref_name }}
+      DOCKER_TAG_ARM64: ghcr.io/${{ github.repository }}:${{ github.ref_name }}-arm64
+      DOCKER_TAG_AMD64: ghcr.io/${{ github.repository }}:${{ github.ref_name }}-amd64
       PROVIDER: github
-    
+      BUILD_ARCHITECTURE_ARM64: arm64
+      BUILD_ARCHITECTURE_AMD64: amd64
+      PUBLISH: 'true'
+      
     steps:
       - name: Checkout code
         uses: actions/checkout@v4.1.7
-        
-      - name: Login to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-         
-      - name: Build Docker Image
-        uses: clouddrove/enigma@v0.0.7
+
+      - name: Build and Publish Docker Image
+        uses: clouddrove/enigma@v0.0.10
         with:
-          command: bake
+          command: build-publish
           DOCKER_IMAGE: ${{ env.DOCKER_IMAGE }}
-          DOCKER_TAG: ${{ env.DOCKER_TAG }}
+          DOCKER_TAG: ${{ env.DOCKER_TAG_ARM64 }}
+          BUILD_ARCHITECTURE: ${{ env.BUILD_ARCHITECTURE_ARM64 }}
           DOCKERFILE_PATH: .docker/Dockerfile
-          GITHUB_USERNAME: ${{ github.actor }}
-          TOKEN: ${{ secrets.GITHUB }}
-  
-      - name: Publish Docker Image
-        uses: clouddrove/enigma@v0.0.7
+          PUBLISH: ${{ env.PUBLISH }}
+
+      - name: Build and Publish Docker Image
+        uses: clouddrove/enigma@v0.0.10
         with:
-          command: publish
+          command: build-publish
           DOCKER_IMAGE: ${{ env.DOCKER_IMAGE }}
-          DOCKER_TAG: ${{ env.DOCKER_TAG }}
+          DOCKER_TAG: ${{ env.DOCKER_TAG_AMD64 }}
+          BUILD_ARCHITECTURE: ${{ env.BUILD_ARCHITECTURE_AMD64 }}
           DOCKERFILE_PATH: .docker/Dockerfile
-          GITHUB_USERNAME: ${{ github.actor }}
-          TOKEN: ${{ secrets.GITHUB }}
+          PUBLISH: ${{ env.PUBLISH }}
diff --git a/README.md b/README.md
index 0e987d1..5071999 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ This repository offers a comprehensive Docker-based environment configured with
   - **Helm**: v3.15.1
   - **Packer**: v1.11.2
   - **Kubectl**: v1.31.0
-  - **AWS CLI**: v2.17.33
+  - **AWS CLI**: v2.17.47
   - **Azure CLI**: v2.63.0
   - **GCloud CLI**: v490.0.0
   - **K9s**: v0.32.5
diff --git a/docker-compose.yml b/docker-compose.yml
index 1963ffa..0714422 100755
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,7 +1,7 @@
 services:
   devops:
     container_name: devops
-    image: clouddrove/devops-machine:0.0.1
+    image: clouddrove/devops-machine:v0.0.1
     mem_limit: 3g
     memswap_limit: 3g
     cpu_shares: 30