diff --git a/.forgejo/workflows/buildpush.yaml b/.forgejo/workflows/buildpush.yaml
index 4dd0dd3..6441035 100644
--- a/.forgejo/workflows/buildpush.yaml
+++ b/.forgejo/workflows/buildpush.yaml
@@ -17,20 +17,37 @@ jobs:
                   registry: git.jakest.us
             - name: Checkout
               uses: https://github.com/actions/checkout@v4
-            - name: Set up Docker Buildx
-              uses: https://github.com/docker/setup-buildx-action@v3
+
+            - name: Extract metadata (tags, labels) for Docker
+              id: meta
+              uses: https://github.com/docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
               with:
-                  config-inline: |
-                      [registry."git.jakest.us"] # IP from local gitea instance
-                        http = true
-                        insecure = true
+                images: jt/hopeasini
+
             - name: Build and push Docker image
-              uses: https://github.com/docker/build-push-action@v5
+              uses: https://github.com/docker/build-push-action@3b5e8027fcad23fda98b2e3ac259d8d67585f671
               with:
-                  context: .
-                  file: ./Dockerfile
-                  push: true
-                  tags: test
-            - name: Stop the docker container
-              continue-on-error: true
-              run: sudo docker stop homepage
+                context: .
+                file: ./Dockerfile
+                push: true
+                tags: ${{ steps.meta.outputs.tags }}
+                labels: ${{ steps.meta.outputs.labels }}
+
+
+#            - name: Set up Docker Buildx
+#              uses: https://github.com/docker/setup-buildx-action@v3
+#              with:
+#                  config-inline: |
+#                      [registry."git.jakest.us"] # IP from local gitea instance
+#                        http = true
+#                        insecure = true
+#            - name: Build and push Docker image
+#              uses: https://github.com/docker/build-push-action@v5
+#              with:
+#                  context: .
+#                  file: ./Dockerfile
+#                  push: true
+#                  tags: test
+#            - name: Stop the docker container
+#              continue-on-error: true
+#              run: sudo docker stop homepage