diff --git a/build/ubuntu/Dockerfile.deps b/build/ubuntu/Dockerfile.deps
index c2999b35e0..0164d3a6ba 100644
--- a/build/ubuntu/Dockerfile.deps
+++ b/build/ubuntu/Dockerfile.deps
@@ -10,14 +10,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
     export SODIUM_USE_PKG_CONFIG=1 && \
     cargo build --release
 
-# FUTUREWORK: remove core-crypto once #2508 is merged
-# compile legacy core-crypto cli tool
-RUN cd /tmp && \
-  apt-get install -y libssl-dev && \
-  git clone -b cli https://github.com/wireapp/core-crypto && \
-  cd core-crypto/cli && \
-  cargo build --release
-
 # compile mls-test-cli tool
 RUN cd /tmp && \
   git clone https://github.com/wireapp/mls-test-cli && \
@@ -29,9 +21,8 @@ FROM ubuntu:20.04
 
 COPY --from=cryptobox-builder /tmp/cryptobox-c/target/release/libcryptobox.so /usr/lib
 
-# FUTUREWORK: only copy crypto-cli and mls-test-cli executables if we are building an
+# FUTUREWORK: only copy mls-test-cli executables if we are building an
 # integration test image
-COPY --from=cryptobox-builder /tmp/core-crypto/cli/target/release/crypto-cli /usr/bin
 COPY --from=cryptobox-builder /tmp/mls-test-cli/target/release/mls-test-cli /usr/bin
 
 RUN export DEBIAN_FRONTEND=noninteractive && \
diff --git a/changelog.d/5-internal/remove-crypto-cli b/changelog.d/5-internal/remove-crypto-cli
new file mode 100644
index 0000000000..5563bfe85f
--- /dev/null
+++ b/changelog.d/5-internal/remove-crypto-cli
@@ -0,0 +1 @@
+Remove old crypto-cli tool from the ubuntu image