diff --git a/.github/workflows/on-push.yml b/.github/workflows/on-push.yml
index 6917491..afd464c 100644
--- a/.github/workflows/on-push.yml
+++ b/.github/workflows/on-push.yml
@@ -1,7 +1,8 @@
 name: Testing only
 on:
     push:
-        tags: [ '*' ]
+        branches: 
+          - *
 
 jobs:
     build:
@@ -15,10 +16,7 @@ jobs:
                 sudo systemctl restart docker
         - name: Run Build script
           run: sudo ./build-test.sh
-        - name: Release zip
-          uses: meeDamian/github-release@2.0
+        - name: Upload artifact
+          uses: actions/upload-artifact@v2
           with:
-            gzip: false
-            files: "overlay2.tar.gz"
-            token: ${{ secrets.GITHUB_TOKEN }}
-            allow_override: true
+            path: overlay2.tar.gz
diff --git a/.github/workflows/on-tag-only.yml b/.github/workflows/on-tag-only.yml
index d3dcdb5..aaaf7ca 100644
--- a/.github/workflows/on-tag-only.yml
+++ b/.github/workflows/on-tag-only.yml
@@ -1,47 +1,47 @@
-# name: Automatically Build image on tag ONLY
-# on:
-#     push:
-#         tags: [ '*' ]
+name: Automatically Build image on tag ONLY
+on:
+    push:
+        tags: [ '*' ]
 
-# jobs:
-#     build:
+jobs:
+    build:
 
-#         runs-on: ubuntu-18.04
+        runs-on: ubuntu-18.04
         
-#         steps:
-
-#         - uses: actions/checkout@v1
-#         - name: Run Apt-get update
-#           run: sudo apt-get update
-
-#         - name: Install Dependencies
-#           run: sudo apt-get -y install quilt qemu-user-static debootstrap bsdtar
-
-#         - name: Enable experimental features in Docker
-#           run: |
-#                 sudo rm -rf /etc/docker/daemon.json
-#                 echo '{"experimental": true}' | sudo tee -a /etc/docker/daemon.json
-#                 sudo systemctl restart docker
-
-#         - name: Run Build script
-#           run: sudo ./build.sh
-
-#         - name: Copy ZIP to current working dir
-#           run: cp deploy/*.zip ./
-
-#         - name: Debug current working dir
-#           run: ls -la
-
-#         # - name: Release Image to placeholder or release
-#         #   uses: meeDamian/github-release@2.0
-#         #   if: startsWith(github.ref, 'refs/tags/')
-#         #   with:
-#         #     gzip: false
-#         #     files: "*.zip"
-#         #     token: ${{ secrets.GITHUB_TOKEN }}
-#         #     allow_override: true
-
-#         - name: Upload artifact
-#           uses: actions/upload-artifact@v2
-#           with:
-#             path: "*.zip"
+        steps:
+
+        - uses: actions/checkout@v1
+        - name: Run Apt-get update
+          run: sudo apt-get update
+
+        - name: Install Dependencies
+          run: sudo apt-get -y install quilt qemu-user-static debootstrap bsdtar
+
+        - name: Enable experimental features in Docker
+          run: |
+                sudo rm -rf /etc/docker/daemon.json
+                echo '{"experimental": true}' | sudo tee -a /etc/docker/daemon.json
+                sudo systemctl restart docker
+
+        - name: Run Build script
+          run: sudo ./build.sh
+
+        - name: Copy ZIP to current working dir
+          run: cp deploy/*.zip ./
+
+        - name: Debug current working dir
+          run: ls -la
+
+        # - name: Release Image to placeholder or release
+        #   uses: meeDamian/github-release@2.0
+        #   if: startsWith(github.ref, 'refs/tags/')
+        #   with:
+        #     gzip: false
+        #     files: "*.zip"
+        #     token: ${{ secrets.GITHUB_TOKEN }}
+        #     allow_override: true
+
+        - name: Upload artifact
+          uses: actions/upload-artifact@v2
+          with:
+            path: "*.zip"