diff --git a/.gitea/workflows/demo.yaml b/.gitea/workflows/demo.yaml
index 147d87a..b292764 100644
--- a/.gitea/workflows/demo.yaml
+++ b/.gitea/workflows/demo.yaml
@@ -8,15 +8,11 @@ jobs:
     steps:
       - name: Check out repository code
         uses: actions/checkout@v4
-      - name: Build Image
-        run: docker build . -t ${{secret.DOCKER_REGISTRY}}/${{ gitea.event.repository.name }}:${{ gitea.sha }}
-      - name: Login to Registry
-        uses: docker/login-action@v3
-        with:
-          registry: swaous.asuscomm.com
-          username: ${{secret.DOCKER_USERNAME}}
-          password: ${{secret.DOCKER_PASSWORD}}
-      - name: Push Image
-        run: docker push ${{secret.DOCKER_REGISTRY}}/${{ gitea.event.repository.name }}:${{ gitea.sha }}
-      - name: Verify
-        run: echo "Built and pushed image ${{ gitea.event.repository.name }}:${{ gitea.sha }}!"
+    - uses: mr-smithers-excellent/docker-build-push@v6
+      name: Build & push Docker image
+      with:
+        image: act-runner-test
+        registry: swaous.asuscomm.com
+        dockerfile: Dockerfile
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}