diff --git a/.gitea/workflows/fedora.yaml b/.gitea/workflows/fedora.yaml
index 14e65b9..aad9ba0 100644
--- a/.gitea/workflows/fedora.yaml
+++ b/.gitea/workflows/fedora.yaml
@@ -2,22 +2,14 @@ name: Build container
 on:
   push:
     branches: ["main"]
-    paths:
-      [
-        "containers/fedora/**",
-        "containers/go/**",
-        "containers/infra/**",
-        ".gitea/workflows/kali.yaml",
-      ]
+    paths: &paths
+      - "containers/fedora/**"
+      - "containers/go/**"
+      - "containers/infra/**"
+      - ".gitea/workflows/fedora.yaml"
   pull_request:
     branches: ["main"]
-    paths:
-      [
-        "containers/fedora/**",
-        "containers/go/**",
-        "containers/infra/**",
-        ".gitea/workflows/kali.yaml",
-      ]
+    paths: *paths
   schedule:
     - cron: "0 16 * * FRI"
 
@@ -41,9 +33,8 @@ jobs:
           context: ./containers/fedora
           file: ./containers/fedora/Containerfile
           push: true
-          tags: |
-            git.plabble.org/job79/fedora:${{ github.ref_name }}
-            git.plabble.org/job79/fedora:latest
+          tags: git.plabble.org/job79/fedora:${{ github.ref_name }}
+          build-args: TAG=${{ github.ref_name }}
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
       - name: Build and push go container
         uses: docker/build-push-action@v5
@@ -51,9 +42,8 @@ jobs:
           context: ./containers/go
           file: ./containers/go/Containerfile
           push: true
-          tags: |
-            git.plabble.org/job79/go:${{ github.ref_name }}
-            git.plabble.org/job79/go:latest
+          tags: git.plabble.org/job79/go:${{ github.ref_name }}
+          build-args: TAG=${{ github.ref_name }}
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
       - name: Build and push infra container
         uses: docker/build-push-action@v5
@@ -61,7 +51,6 @@ jobs:
           context: ./containers/infra
           file: ./containers/infra/Containerfile
           push: true
-          tags: |
-            git.plabble.org/job79/infra:${{ github.ref_name }}
-            git.plabble.org/job79/infra:latest
+          tags: git.plabble.org/job79/infra:${{ github.ref_name }}
+          build-args: TAG=${{ github.ref_name }}
           outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
diff --git a/.gitea/workflows/kali.yaml b/.gitea/workflows/kali.yaml
index 2dd7ddc..b5254e6 100644
--- a/.gitea/workflows/kali.yaml
+++ b/.gitea/workflows/kali.yaml
@@ -2,10 +2,12 @@ name: Build container
 on:
   push:
     branches: ["main"]
-    paths: ["containers/kali/**", ".gitea/workflows/kali.yaml"]
+    paths: &paths
+      - "containers/kali/**"
+      - ".gitea/workflows/kali.yaml"
   pull_request:
     branches: ["main"]
-    paths: ["containers/kali/**", ".gitea/workflows/kali.yaml"]
+    paths: *paths
   schedule:
     - cron: "0 16 * * FRI"
 
diff --git a/containers/go/Containerfile b/containers/go/Containerfile
index 06e2118..931895d 100644
--- a/containers/go/Containerfile
+++ b/containers/go/Containerfile
@@ -1,3 +1,4 @@
+ARG TAG
 FROM git.plabble.org/job79/fedora
 USER root
 RUN dnf -y install go
diff --git a/containers/infra/Containerfile b/containers/infra/Containerfile
index c816bf2..70f1418 100644
--- a/containers/infra/Containerfile
+++ b/containers/infra/Containerfile
@@ -1,4 +1,5 @@
-FROM git.plabble.org/job79/fedora
+ARG TAG
+FROM git.plabble.org/job79/fedora:${TAG}
 USER root
 RUN dnf -y install kubectl openssl
 RUN curl -sL https://talos.dev/install | sh