diff --git a/Dockerfile b/Dockerfile
index 1c9b042..cf319ff 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,15 +4,15 @@ ARG TARGETOS
 ARG TARGETARCH
 
 WORKDIR /workspace
-# Copy the Go Modules manifests (go.sum and go.mod)
-COPY go.* .
+# Copy the Go Modules manifests
+COPY go.sum go.mod .
 # cache deps before building and copying source so that we don't need to re-download as much
 # and so that source changes don't invalidate our downloaded layer
 RUN apk upgrade --no-cache && \
     go mod download
 
 # Copy the go source
-COPY cmd/main.go cmd/main.go
+COPY cmd/ cmd/
 COPY api/ api/
 COPY internal/controller/ internal/controller/
 
@@ -28,8 +28,7 @@ RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -a -o ma
 FROM gcr.io/distroless/static-debian12:nonroot
 # FROM gcr.io/distroless/static-debian12:debug
 WORKDIR /
-COPY --from=builder /workspace/manager .
-COPY cmd/debug-entrypoint.sh .
+COPY --from=builder /workspace/manager /workspace/cmd/debug-entrypoint.sh .
 USER 65532:65532
 
 ENTRYPOINT ["/manager"]
diff --git a/VERSION b/VERSION
index 818944f..236c7ad 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.0.22
+0.0.21
diff --git a/bundle/manifests/susql-operator.clusterserviceversion.yaml b/bundle/manifests/susql-operator.clusterserviceversion.yaml
index 2315148..04703c7 100644
--- a/bundle/manifests/susql-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/susql-operator.clusterserviceversion.yaml
@@ -22,14 +22,14 @@ metadata:
       ]
     capabilities: Basic Install
     categories: Monitoring
-    containerImage: quay.io/sustainable_computing_io/susql_operator:0.0.22
-    createdAt: "2024-07-01T08:04:51Z"
+    containerImage: quay.io/sustainable_computing_io/susql_operator:0.0.21
+    createdAt: "2024-07-02T05:17:47Z"
     description: 'Aggregates energy data from pods tagged with SusQL labels '
     operators.operatorframework.io/builder: operator-sdk-v1.34.1
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v4
     repository: https://github.com/sustainable-computing-io/susql-operator
     support: https://github.com/sustainable-computing-io/susql-operator/issues
-  name: susql-operator.v0.0.22
+  name: susql-operator.v0.0.21
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -224,7 +224,7 @@ spec:
                   value: :8081
                 - name: METRICS-BIND-ADDRESS
                   value: 127.0.0.1:9999
-                image: quay.io/sustainable_computing_io/susql_operator:0.0.22
+                image: quay.io/sustainable_computing_io/susql_operator:0.0.21
                 imagePullPolicy: IfNotPresent
                 livenessProbe:
                   httpGet:
@@ -328,4 +328,4 @@ spec:
   provider:
     name: SusQL Operator Contributors
     url: https://github.com/sustainable-computing-io/susql-operator
-  version: 0.0.22
+  version: 0.0.21
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 06c051c..3a9192b 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/sustainable_computing_io/susql_operator
-  newTag: 0.0.22
+  newTag: 0.0.21