diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 0f15f72..8136603 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -6,22 +6,25 @@ on:
       - main
 
 jobs:
-  build:
-    runs-on: docker
+  Dockerfile lint:
+    runs-on: k3s
     steps:
       - uses: actions/checkout@v3
-      - name: docker login
-        run: docker login -u $REGISTRY_USER -p $REGISTRY_PASSWORD gitea.sikorski.cloud
-        env:
-          REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
-          REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
-      - name: Pull Docker Image for caching
-        run: docker pull gitea.sikorski.cloud/rogersik/devops-helper:development || exit 0
-      - name: Build docker image
-        run: |
-          docker build . \
-            --cache-from gitea.sikorski.cloud/rogersik/devops-helper:development \
-            --file Dockerfile \
-            --tag gitea.sikorski.cloud/rogersik/devops-helper:development
-      - name: Push docker image
-        run: docker push gitea.sikorski.cloud/rogersik/devops-helper --all-tags
+      - uses: hadolint/hadolint-action@v3.1.0
+        with:
+          dockerfile: Dockerfile
+
+  build:
+    runs-on: k3s
+    needs: Dockerfile lint
+    steps:
+      - uses: actions/checkout@v3
+      - name: Kaniko build
+        uses: aevea/action-kaniko@master
+        with:
+          image: rogersik/devops-helper
+          registry: gitea.sikorski.cloud
+          tag: development
+          cache: true
+          username: rogersik
+          password: ${{ secrets.REGISTRY_PASSWORD }}
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index 3d388c1..e8ca6f3 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -7,22 +7,25 @@ on:
     - cron: "0 6 * * SUN"
 
 jobs:
-  build:
-    runs-on: docker
+  Dockerfile lint:
+    runs-on: k3s
     steps:
       - uses: actions/checkout@v3
-      - name: docker login
-        run: docker login -u $REGISTRY_USER -p $REGISTRY_PASSWORD gitea.sikorski.cloud
-        env:
-          REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
-          REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
-      - name: Pull Docker Image for caching
-        run: docker pull gitea.sikorski.cloud/rogersik/devops-helper:development || exit 0
-      - name: Build docker image
-        run: |
-          docker build . \
-            --cache-from gitea.sikorski.cloud/rogersik/devops-helper:development \
-            --file Dockerfile \
-            --tag gitea.sikorski.cloud/rogersik/devops-helper:latest
-      - name: Push docker image
-        run: docker push gitea.sikorski.cloud/rogersik/devops-helper --all-tags
+      - uses: hadolint/hadolint-action@v3.1.0
+        with:
+          dockerfile: Dockerfile
+
+  build:
+    runs-on: k3s
+    needs: Dockerfile lint
+    steps:
+      - uses: actions/checkout@v3
+      - name: Kaniko build
+        uses: aevea/action-kaniko@master
+        with:
+          image: rogersik/devops-helper
+          registry: gitea.sikorski.cloud
+          tag: latest
+          cache: true
+          username: rogersik
+          password: ${{ secrets.REGISTRY_PASSWORD }}