diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 1f43273..c60237f 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -6,10 +6,7 @@ on:
 jobs:
   build:
     runs-on: docker
-    container:
-      image: docker:24-cli
     steps:
-      - run: apk --no-cache add nodejs git
       - uses: actions/checkout@v3
       - name: docker login
         run: docker login -u $REGISTRY_USER -p $REGISTRY_PASSWORD gitea.sikorski.cloud
@@ -17,12 +14,12 @@ jobs:
           REGISTRY_USER: ${{ secrets.REGISTRY_USER }}
           REGISTRY_PASSWORD: ${{ secrets.REGISTRY_PASSWORD }}
       - name: Pull Docker Image for caching
-        run: docker pull gitea.sikorski.cloud/rogersik/docker-admin-helper:development || exit 0
+        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/docker-admin-helper:development \
+            --cache-from gitea.sikorski.cloud/rogersik/devops-helper:development \
             --file Dockerfile \
-            --tag gitea.sikorski.cloud/rogersik/docker-admin-helper:development
+            --tag gitea.sikorski.cloud/rogersik/devops-helper:development
       - name: Push docker image
-        run: docker push gitea.sikorski.cloud/rogersik/docker-admin-helper --all-tags
+        run: docker push gitea.sikorski.cloud/rogersik/devops-helper --all-tags
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
new file mode 100644
index 0000000..5ce465b
--- /dev/null
+++ b/.gitea/workflows/main.yaml
@@ -0,0 +1,24 @@
+on:
+  push:
+      - main
+
+jobs:
+  build:
+    runs-on: docker
+    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