diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
index 50375415..d9f42c92 100644
--- a/.github/workflows/release.yaml
+++ b/.github/workflows/release.yaml
@@ -36,7 +36,7 @@ jobs:
         uses: goreleaser/goreleaser-action@v2
         with:
           version: latest
-          args: release --rm-dist
+          args: release
         env:
           GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
           HOMEBREW_TAP_GITHUB_TOKEN: ${{ secrets.GORELEASER_GITHUB_TOKEN }}
diff --git a/.github/workflows/simple.yaml b/.github/workflows/simple.yaml
index bafc6566..70290d67 100644
--- a/.github/workflows/simple.yaml
+++ b/.github/workflows/simple.yaml
@@ -1,7 +1,7 @@
 ## workflow for running the build and unit tests
 
 on:
-  # run this workflow on main branch or a PR
+  # run this workflow on any branch or a PR
   push:
     branches:
       - "**"
@@ -53,5 +53,8 @@ jobs:
             ${{ runner.os }}-go-
       - name: Test
         run: go test -failfast ./...
-      - name: Build
-        run: go build -o build/bubbly .
+      - name: Run GoReleaser
+        uses: goreleaser/goreleaser-action@v2
+        with:
+          version: latest
+          args: build
diff --git a/Dockerfile b/Dockerfile
index ccd45b24..ee8ef521 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -32,13 +32,13 @@ RUN go build -tags ui -o /go/bin/bubbly
 FROM gcr.io/distroless/base-debian10
 
 # Copy our static executable.
-COPY --from=builder /go/bin/bubbly go/bin/bubbly
+COPY --from=builder /go/bin/bubbly /bubbly
 
 # Use an unprivileged user.
 USER nonroot:nonroot
 
-ENTRYPOINT ["go/bin/bubbly"]
-# 4223 NATS service
-# 8111 bubbly agent
-# 8222 NATS HTTP
-EXPOSE 4223 8111 8222
+EXPOSE 8111
+ENTRYPOINT ["/bubbly"]
+CMD ["server"]
+
+
diff --git a/Dockerfile.goreleaser b/Dockerfile.goreleaser
index 93b3728a..4b403abe 100644
--- a/Dockerfile.goreleaser
+++ b/Dockerfile.goreleaser
@@ -4,13 +4,10 @@ FROM gcr.io/distroless/base-debian10
 # Copy the static executable built by goreleaser
 COPY bubbly /bubbly
 
-# Bubbly makes use of these TCP ports:
-#   4223 NATS service
-#   8111 bubbly agent
-#   8222 NATS HTTP
-EXPOSE 4223 8111 8222
+EXPOSE 8111
 
 # Run as unprivileged user
 USER nonroot:nonroot
 
 ENTRYPOINT ["/bubbly"]
+CMD ["server"]