diff --git a/.github/workflows/container-stable.yaml b/.github/workflows/container-stable.yaml
index 9357916..f3e145b 100644
--- a/.github/workflows/container-stable.yaml
+++ b/.github/workflows/container-stable.yaml
@@ -3,10 +3,8 @@ name: "Stable container"
 
 on:
   push:
-    # branches:
-    # - main
-    # paths:
-    # - "src/**"
+    branches:
+      - main
 
 jobs:
   containerization:
@@ -32,22 +30,22 @@ jobs:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
-            #      - name: Build base
-            #        uses: docker/build-push-action@v2
-            #        with:
-            #          builder: ${{ steps.buildx.outputs.name }}
-            #          context: .
-            #          file: ./Dockerfile
-            #          platforms: linux/amd64,linux/arm64
-            #          push: true
-            #          tags: |
-            #            ghcr.io/${{ github.repository }}-base:latest
-            #          labels: |
-            #            action_id=${{ github.action }}
-            #            action_link=${{ env.LINK }}
-            #            actor=${{ github.actor }}
-            #            sha=${{ github.sha }}
-            #            ref=${{ github.ref }}
+      - name: Build base
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}-base:latest
+          labels: |
+            action_id=${{ github.action }}
+            action_link=${{ env.LINK }}
+            actor=${{ github.actor }}
+            sha=${{ github.sha }}
+            ref=${{ github.ref }}
       - name: Build helmfile
         uses: docker/build-push-action@v2
         with:
diff --git a/.github/workflows/container-version.yaml b/.github/workflows/container-version.yaml
index 535160f..288ad56 100644
--- a/.github/workflows/container-version.yaml
+++ b/.github/workflows/container-version.yaml
@@ -1,5 +1,5 @@
 ---
-name: "Version container"
+name: "Versioned container"
 
 on:
   push:
@@ -27,15 +27,13 @@ jobs:
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@master
-
       - name: Login to GitHub Container Registry
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
-
-      - name: Build
+      - name: Build base
         uses: docker/build-push-action@v2
         with:
           builder: ${{ steps.buildx.outputs.name }}
@@ -44,7 +42,40 @@ jobs:
           platforms: linux/amd64,linux/arm64
           push: true
           tags: |
-            ghcr.io/${{ github.repository }}:${{ env.TAG }}
+            ghcr.io/${{ github.repository }}-base:${{ env.TAG }}
+          labels: |
+            action_id=${{ github.action }}
+            action_link=${{ env.LINK }}
+            actor=${{ github.actor }}
+            sha=${{ github.sha }}
+            ref=${{ github.ref }}
+      - name: Build helmfile
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: ./dockerfiles
+          file: ./dockerfiles/Dockerfile-helmfile
+          platforms: linux/arm64
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}-helmfile:${{ env.TAG }}
+          labels: |
+            action_id=${{ github.action }}
+            action_link=${{ env.LINK }}
+            actor=${{ github.actor }}
+            sha=${{ github.sha }}
+            ref=${{ github.ref }}
+
+      - name: Build argo
+        uses: docker/build-push-action@v2
+        with:
+          builder: ${{ steps.buildx.outputs.name }}
+          context: ./dockerfiles
+          file: ./dockerfiles/Dockerfile-argo
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            ghcr.io/${{ github.repository }}-argo:${{ env.TAG }}
           labels: |
             action_id=${{ github.action }}
             action_link=${{ env.LINK }}