diff --git a/flink-dist/src/main/assemblies/opt.xml b/flink-dist/src/main/assemblies/opt.xml
index aa2327c094f57..ed263a360cc17 100644
--- a/flink-dist/src/main/assemblies/opt.xml
+++ b/flink-dist/src/main/assemblies/opt.xml
@@ -75,28 +75,6 @@
0644
-
-
- ../flink-external-resources/flink-external-resource-gpu/target/flink-external-resource-gpu-${project.version}.jar
- opt/external-resource-gpu/
- flink-external-resource-gpu-${project.version}.jar
- 0644
-
-
-
- ../flink-external-resources/flink-external-resource-gpu/src/main/resources/gpu-discovery-common.sh
- opt/external-resource-gpu/
- gpu-discovery-common.sh
- 0755
-
-
-
- ../flink-external-resources/flink-external-resource-gpu/src/main/resources/nvidia-gpu-discovery.sh
- opt/external-resource-gpu/
- nvidia-gpu-discovery.sh
- 0755
-
-
../flink-filesystems/flink-s3-fs-hadoop/target/flink-s3-fs-hadoop-${project.version}.jar
opt/
diff --git a/flink-dist/src/main/assemblies/plugins.xml b/flink-dist/src/main/assemblies/plugins.xml
index e2824c44a12a4..b6008fe11d351 100644
--- a/flink-dist/src/main/assemblies/plugins.xml
+++ b/flink-dist/src/main/assemblies/plugins.xml
@@ -79,6 +79,28 @@
flink-metrics-slf4j-${project.version}.jar
0644
+
+
+
+ ../flink-external-resources/flink-external-resource-gpu/target/flink-external-resource-gpu-${project.version}.jar
+ plugins/external_resource_gpu/
+ flink-external-resource-gpu-${project.version}.jar
+ 0644
+
+
+
+ ../flink-external-resources/flink-external-resource-gpu/src/main/resources/gpu-discovery-common.sh
+ plugins/external_resource_gpu/
+ gpu-discovery-common.sh
+ 0755
+
+
+
+ ../flink-external-resources/flink-external-resource-gpu/src/main/resources/nvidia-gpu-discovery.sh
+ plugins/external_resource_gpu/
+ nvidia-gpu-discovery.sh
+ 0755
+