diff --git a/influxdb/2.3/Dockerfile b/influxdb/2.3/Dockerfile
index f55496322..c25cb6884 100644
--- a/influxdb/2.3/Dockerfile
+++ b/influxdb/2.3/Dockerfile
@@ -37,6 +37,7 @@ RUN set -eux && \
     gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
     tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
     cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
+    rm -rf influxdb2* && \
     influxd version
 
 # Install the influx CLI
@@ -53,15 +54,14 @@ RUN set -eux && \
     gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
     tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
     cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
+    rm -rf influxdb2* && \
     influx version
 
 # Remove GNUPG Configuration
 RUN gpgconf --kill all                                      && \
     rm -rf                                                     \
       "/root/.gnupg"                                           \
-      influxdb2.key                                            \
-      influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}*             \
-      influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
+      influxdb2.key
 
 # Create standard directories expected by the entry-point.
 RUN mkdir /docker-entrypoint-initdb.d && \
diff --git a/influxdb/2.3/alpine/Dockerfile b/influxdb/2.3/alpine/Dockerfile
index d7a1d163a..98be8eee0 100644
--- a/influxdb/2.3/alpine/Dockerfile
+++ b/influxdb/2.3/alpine/Dockerfile
@@ -30,6 +30,7 @@ RUN set -eux && \
     gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
     tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
     cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
+    rm -rf influxdb2* && \
     influxd version
 
 # Install the influx CLI
@@ -48,15 +49,14 @@ RUN set -eux && \
     gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
     tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
     cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
+    rm -rf influxdb2* && \
     influx version
 
 # Remove GNUPG Configuration
 RUN gpgconf --kill all                                      && \
     rm -rf                                                     \
       "/root/.gnupg"                                           \
-      influxdb2.key                                            \
-      influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}*             \
-      influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
+      influxdb2.key
 
 # Create standard directories expected by the entry-point.
 RUN mkdir /docker-entrypoint-initdb.d && \
diff --git a/influxdb/2.4/Dockerfile b/influxdb/2.4/Dockerfile
index 055bf33de..ca5d5ab06 100644
--- a/influxdb/2.4/Dockerfile
+++ b/influxdb/2.4/Dockerfile
@@ -37,6 +37,7 @@ RUN set -eux && \
     gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
     tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
     cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
+    rm -rf influxdb2* && \
     influxd version
 
 # Install the influx CLI
@@ -53,15 +54,14 @@ RUN set -eux && \
     gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
     tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
     cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
+    rm -rf influxdb2* && \
     influx version
 
 # Remove GNUPG Configuration
 RUN gpgconf --kill all                                      && \
     rm -rf                                                     \
       "/root/.gnupg"                                           \
-      influxdb2.key                                            \
-      influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}*             \
-      influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
+      influxdb2.key
 
 # Create standard directories expected by the entry-point.
 RUN mkdir /docker-entrypoint-initdb.d && \
diff --git a/influxdb/2.4/alpine/Dockerfile b/influxdb/2.4/alpine/Dockerfile
index d364e07b0..4b6db6f02 100644
--- a/influxdb/2.4/alpine/Dockerfile
+++ b/influxdb/2.4/alpine/Dockerfile
@@ -30,6 +30,7 @@ RUN set -eux && \
     gpg --batch --verify influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
     tar xzf influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}.tar.gz && \
     cp influxdb2_linux_${ARCH}/influxd /usr/local/bin/influxd && \
+    rm -rf influxdb2* && \
     influxd version
 
 # Install the influx CLI
@@ -48,15 +49,14 @@ RUN set -eux && \
     gpg --batch --verify influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz.asc influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
     tar xzf influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}.tar.gz && \
     cp influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}/influx /usr/local/bin/influx && \
+    rm -rf influxdb2* && \
     influx version
 
 # Remove GNUPG Configuration
 RUN gpgconf --kill all                                      && \
     rm -rf                                                     \
       "/root/.gnupg"                                           \
-      influxdb2.key                                            \
-      influxdb2-${INFLUXDB_VERSION}-linux-${ARCH}*             \
-      influxdb2-client-${INFLUX_CLI_VERSION}-linux-${ARCH}*
+      influxdb2.key
 
 # Create standard directories expected by the entry-point.
 RUN mkdir /docker-entrypoint-initdb.d && \