diff --git a/.gitea/workflows/harmony_composer.yaml b/.gitea/workflows/harmony_composer.yaml
index c093f24..f977978 100644
--- a/.gitea/workflows/harmony_composer.yaml
+++ b/.gitea/workflows/harmony_composer.yaml
@@ -8,29 +8,24 @@ on:
 jobs:
   package_harmony_composer:
     container:
-      volumes:
-        - /run/user/1001/docker.sock:/var/run/docker.sock
-      image: hub.nationtech.io/harmony/harmony_composer:latest@sha256:2e200c4fba73ab33d40e7f14d9f7f8a3a3ffa69a086887c201f9eb0d51661081
-    runs-on: docker
+      image: hub.nationtech.io/harmony/harmony_composer:latest
+    runs-on: dind
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
-      # - name: Build for Linux x86_64
-      #   run: cargo build --release --bin harmony_composer --target x86_64-unknown-linux-gnu
+      - name: Build for Linux x86_64
+        run: cargo build --release --bin harmony_composer --target x86_64-unknown-linux-gnu
 
-      # - name: Build for Linux ARM64
-      #   run: cargo build --release --bin harmony_composer --target aarch64-unknown-linux-gnu
+      - name: Build for Windows x86_64 GNU
+        run: cargo build --release --bin harmony_composer --target x86_64-pc-windows-gnu
 
-      # - name: Build for Windows x86_64 GNU
-      #   run: cargo build --release --bin harmony_composer --target x86_64-pc-windows-gnu
-
-      # - uses: actions/upload-artifact@v3
-      #   with:
-      #     name: binaries
-      #     path: |
-      #       target/x86_64-unknown-linux-gnu/release/harmony_composer
-      #       target/x86_64-pc-windows-gnu/release/harmony_composer.exe
+      - uses: actions/upload-artifact@v3
+        with:
+          name: binaries
+          path: |
+            target/x86_64-unknown-linux-gnu/release/harmony_composer
+            target/x86_64-pc-windows-gnu/release/harmony_composer.exe
 
       - name: Setup log into hub.nationtech.io
         uses: docker/login-action@v3
@@ -39,19 +34,14 @@ jobs:
           username: ${{ secrets.HUB_BOT_USER }}
           password: ${{ secrets.HUB_BOT_PASSWORD }}
 
-      # TODO: build ARM images too
-      - name: Build docker container
-        run: docker build . -t hub.nationtech.io/harmony/harmony_composer:latest
+      # TODO: build ARM images and MacOS binaries (or other targets) too
 
-      - name: Push docker container
-        run: docker push -a hub.nationtech.io/harmony/harmony_composer
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
 
-      # - name: Set up Docker Buildx
-      #   uses: docker/setup-buildx-action@v3
-
-      # - name: Build and push
-      #   uses: docker/build-push-action@v6
-      #   with:
-      #     context: .
-      #     push: true
-      #     tags: hub.nationtech.io/harmony/harmony_composer:latest
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          push: true
+          tags: hub.nationtech.io/harmony/harmony_composer:latest
diff --git a/Dockerfile b/Dockerfile
index e785a2c..4a68932 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,15 +16,13 @@ RUN apt update
 RUN apt install -y nodejs
 
 RUN apt install -y docker.io
-# RUN apt install -y podman podman-docker
 
 RUN rustup target add x86_64-unknown-linux-gnu
 
 RUN apt install -y mingw-w64
 RUN rustup target add x86_64-pc-windows-gnu
 
-# RUN apt install -y gcc-aarch64-linux-gnu
-# RUN rustup target add aarch64-unknown-linux-gnu
+# TODO: Consider adding more supported targets
 
 COPY --from=build /app/target/release/harmony_composer .