diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89760ea228..8f50cf81c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+# 0.9.6
+
+## Bug Fixes
+
+- **M3DB**: Revert Docker setcap change to allow image to run with no special flags (#1672)
+
 # 0.9.5
 
 ## Performance
diff --git a/docker/m3dbnode/Dockerfile b/docker/m3dbnode/Dockerfile
index 4f6134f422..6a306910a7 100644
--- a/docker/m3dbnode/Dockerfile
+++ b/docker/m3dbnode/Dockerfile
@@ -26,14 +26,5 @@ COPY --from=builder /go/src/github.com/m3db/m3/bin/m3dbnode /bin/
 COPY --from=builder /go/src/github.com/m3db/m3/src/dbnode/config/m3dbnode-local-etcd.yml /etc/m3dbnode/m3dbnode.yml
 COPY --from=builder /go/src/github.com/m3db/m3/scripts/m3dbnode_bootstrapped.sh /bin/
 
-# Use setcap to set +e "effective" and +p "permitted" to adjust the 
-# SYS_RESOURCE so the process can raise the hard file limit with 
-# setrlimit
-RUN apk add libcap && \
-    setcap cap_sys_resource=+ep /bin/m3dbnode
-
-# Set the environment variable to raise the limit on startup
-ENV PROCESS_LIMITS_RAISE true
-
 ENTRYPOINT [ "/bin/m3dbnode" ]
 CMD [ "-f", "/etc/m3dbnode/m3dbnode.yml" ]