diff --git a/.github/workflows/release_images.yml b/.github/workflows/release_images.yml
new file mode 100644
index 000000000..84bf6207a
--- /dev/null
+++ b/.github/workflows/release_images.yml
@@ -0,0 +1,24 @@
+name: Upload Images
+on:
+  push:
+    tags:
+      - "v*.*.*-k8s-1.21.6"
+jobs:
+  images:
+    runs-on: ubuntu-latest
+    permissions: write-all
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Set up qemu
+        uses: docker/setup-qemu-action@v2
+      - name: Login registry
+        run: |
+          echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+      - name: Push images
+        env:
+          ON_PLUGINS: true
+        run: |
+          make upload-images
diff --git a/Makefile b/Makefile
index 99f9c1ea9..09febe8dc 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 GOOS ?= $(shell go env GOOS)
 GOARCH ?= $(shell go env GOARCH)
-VERSION ?= '$(shell hack/version.sh)'
+VERSION ?= '$(shell hack/version.sh)'-k8s-1.21.6
 
 # Images management
 REGISTRY?="ghcr.io/kosmos-io"