diff --git a/python-suse-edge-components-versions/python-suse-edge-components-versions.spec b/python-suse-edge-components-versions/python-suse-edge-components-versions.spec
index 0d83e7f..5157cf3 100644
--- a/python-suse-edge-components-versions/python-suse-edge-components-versions.spec
+++ b/python-suse-edge-components-versions/python-suse-edge-components-versions.spec
@@ -20,7 +20,7 @@
 %endif
 
 Name:           python-suse-edge-components-versions
-Version:        0.1.1
+Version:        0.2.1
 Release:        0%{?dist}
 Summary:        A tool to gather and display component versions for SUSE Edge products.
 License:        Apache-2.0
@@ -73,9 +73,9 @@ cd components-versions
 mv %{buildroot}%{_bindir}/components-versions %{buildroot}%{_bindir}/suse-edge-components-versions
 %python_clone -a %{buildroot}%{_bindir}/suse-edge-components-versions
 cd ..
-# Move the json files to /usr/share/suse-edge-components-versions instead
+# Move the yaml files to /usr/share/suse-edge-components-versions instead
 mkdir -p %{buildroot}/usr/share/suse-edge-components-versions/
-mv %{buildroot}%{python_sitelib}/components_versions/data/*.json %{buildroot}/usr/share/suse-edge-components-versions/
+mv %{buildroot}%{python_sitelib}/components_versions/data/*.yaml %{buildroot}/usr/share/suse-edge-components-versions/
 rmdir %{buildroot}%{python_sitelib}/components_versions/data/
 
 %post
@@ -92,7 +92,7 @@ rmdir %{buildroot}%{python_sitelib}/components_versions/data/
 %{python_sitelib}/suse_edge_components_versions-%{version}*.dist-info
 # Include the main executable with its new name.
 %python_alternative %{_bindir}/suse-edge-components-versions
-# Include the json files
+# Include the yaml files
 /usr/share/suse-edge-components-versions/
 
 %changelog
diff --git a/suse-edge-components-versions-image/Dockerfile b/suse-edge-components-versions-image/Dockerfile
index be5b4db..c5e9a16 100644
--- a/suse-edge-components-versions-image/Dockerfile
+++ b/suse-edge-components-versions-image/Dockerfile
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
-#!BuildTag: %%IMG_PREFIX%%suse-edge-components-versions:0.1.1
-#!BuildTag: %%IMG_PREFIX%%suse-edge-components-versions:0.1.1-%RELEASE%
+#!BuildTag: %%IMG_PREFIX%%suse-edge-components-versions:0.2.1
+#!BuildTag: %%IMG_PREFIX%%suse-edge-components-versions:0.2.1-%RELEASE%
 
 ARG SLE_VERSION
 FROM registry.suse.com/bci/bci-micro:$SLE_VERSION AS micro
@@ -29,8 +29,8 @@ LABEL org.opencontainers.image.description="Gather and display component version
 LABEL org.opencontainers.image.url="https://github.com/suse-edge/support-tools/tree/main/components-versions"
 LABEL org.opencontainers.image.created="%BUILDTIME%"
 LABEL org.opencontainers.image.vendor="SUSE LLC"
-LABEL org.opencontainers.image.version="0.1.1"
-LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%suse-edge-components-versions:0.1.1-%RELEASE%"
+LABEL org.opencontainers.image.version="0.2.1"
+LABEL org.opensuse.reference="%%IMG_REPO%%/%%IMG_PREFIX%%suse-edge-components-versions:0.2.1-%RELEASE%"
 LABEL org.openbuildservice.disturl="%DISTURL%"
 LABEL com.suse.supportlevel="%%SUPPORT_LEVEL%%"
 LABEL com.suse.eula="SUSE Combined EULA February 2024"