diff --git a/.github/workflows/cnspec.yaml b/.github/workflows/cnspec.yaml
index 5e1fc5cc4..177b4042a 100644
--- a/.github/workflows/cnspec.yaml
+++ b/.github/workflows/cnspec.yaml
@@ -26,8 +26,6 @@ jobs:
       matrix:
         suffix:
           - ""
-          - -rootless
-          - -ubi-rootless
           - -ubi
 
     steps:
@@ -67,7 +65,7 @@ jobs:
             type=semver,pattern={{major}},value=${{ env.VERSION }}
             type=raw,value=latest
           flavor: |
-            suffix=${{ matrix.suffix }},onlatest=true
+            suffix=${{ matrix.suffix }}-rootless,onlatest=true
 
       - name: Build and push cnspec image
         id: build-and-push-operator
@@ -75,8 +73,8 @@ jobs:
         with:
           context: .
           file: cnspec.Dockerfile
-          build-args: VERSION=${{ env.VERSION }}
-          platforms: linux/amd64,linux/arm64,linux/arm
+          build-args: VERSION=${{ env.VERSION }}${{ matrix.suffix }}
+          platforms: linux/amd64,linux/arm64
           push: true
           labels: ${{ steps.meta.outputs.labels }}
           tags: ${{ steps.meta.outputs.tags }}
\ No newline at end of file
diff --git a/cnspec.Dockerfile b/cnspec.Dockerfile
index 77b74e8cc..2299f09d2 100644
--- a/cnspec.Dockerfile
+++ b/cnspec.Dockerfile
@@ -7,4 +7,6 @@ FROM mondoo/cnspec:$VERSION
 
 RUN cnspec providers install os
 RUN cnspec providers install network
-RUN cnspec providers install k8s
\ No newline at end of file
+RUN cnspec providers install k8s
+
+USER 100:101
\ No newline at end of file