diff --git a/build-tools/build-docker-images/tag-management/image-tags-3.0.yaml b/build-tools/build-docker-images/tag-management/image-tags-3.0.yaml
deleted file mode 100644
index 9a8850bf..00000000
--- a/build-tools/build-docker-images/tag-management/image-tags-3.0.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-# yamllint disable rule:line-length
----
-images:
-  - name: docker.io/starlingx/k8s-cni-sriov
-    src_build_tag: master-centos-stable-20191203T153530Z.0
-    src_ref: https://opendev.org/starlingx/integ/commit/dac417bd31ed36d455e94db4aabe5916367654d4
-    # Tag determined based on release tag associated with upstream commit
-    tag: stx.3.0-v2.2
-  - name: docker.io/starlingx/k8s-plugins-sriov-network-device
-    src_build_tag: master-centos-stable-20191203T153530Z.0
-    src_ref: https://opendev.org/starlingx/integ/commit/dac417bd31ed36d455e94db4aabe5916367654d4
-    # Tag determined based on release tag associated with upstream commit
-    tag: stx.3.0-v3.1
-  - name: docker.io/starlingx/intel-fpga-admissionwebhook
-    src_build_tag: master-distroless-stable-20191203T153530Z.0
-    src_ref: https://opendev.org/starlingx/integ/commit/5f72ddb26a38d41fef919060585daaafae677433
-    # Version determined by running 'git describe --tags' in clone of upstream repo
-    tag: stx.3.0-v0.11.0-103-g4f28657
-  - name: docker.io/starlingx/intel-fpga-initcontainer
-    src_build_tag: master-distroless-stable-20191203T153530Z.0
-    src_ref: https://opendev.org/starlingx/integ/commit/5f72ddb26a38d41fef919060585daaafae677433
-    # Version determined by running 'git describe --tags' in clone of upstream repo
-    tag: stx.3.0-v0.11.0-103-g4f28657
-  - name: docker.io/starlingx/intel-fpga-plugin
-    src_build_tag: master-distroless-stable-20191203T153530Z.0
-    src_ref: https://opendev.org/starlingx/integ/commit/5f72ddb26a38d41fef919060585daaafae677433
-    # Version determined by running 'git describe --tags' in clone of upstream repo
-    tag: stx.3.0-v0.11.0-103-g4f28657
-  - name: docker.io/starlingx/intel-gpu-plugin
-    src_build_tag: master-distroless-stable-20191203T153530Z.0
-    src_ref: https://opendev.org/starlingx/integ/commit/5f72ddb26a38d41fef919060585daaafae677433
-    # Version determined by running 'git describe --tags' in clone of upstream repo
-    tag: stx.3.0-v0.11.0-103-g4f28657
-  - name: docker.io/starlingx/intel-qat-plugin
-    src_build_tag: master-distroless-stable-20191203T153530Z.0
-    src_ref: https://opendev.org/starlingx/integ/commit/d9d92a6997f939cb1ec41813dbf2d72d0b80d79c
-    # Version determined by running 'git describe --tags' in clone of upstream repo
-    tag: stx.3.0-v0.11.0-109-gc48c502
diff --git a/build-tools/build-docker-images/tag-management/image-tags-4.0.yaml b/build-tools/build-docker-images/tag-management/image-tags.yaml
similarity index 100%
rename from build-tools/build-docker-images/tag-management/image-tags-4.0.yaml
rename to build-tools/build-docker-images/tag-management/image-tags.yaml