diff --git a/software/debian/deb_folder/rules b/software/debian/deb_folder/rules
index fde219b5..9d44ffad 100755
--- a/software/debian/deb_folder/rules
+++ b/software/debian/deb_folder/rules
@@ -6,13 +6,13 @@ PMONDIR := ${ROOT}/usr/share/starlingx/pmon.d
 
 ROOT := $(CURDIR)/debian/tmp
 export PLATFORM_RELEASE="$(shell grep SW_VERSION /usr/include/build_info.h | cut -d ' ' -f 3)"
-export METADATA_FILE="STX_${PLATFORM_RELEASE}_GA-metadata.xml"
+export METADATA_FILE="starlingx-${PLATFORM_RELEASE}.0-metadata.xml"
 
 %:
 	dh $@ --with python3 --buildsystem=pybuild
 
 override_dh_auto_build:
-	cp service-files/STX_GA-metadata.xml ${METADATA_FILE}
+	cp service-files/starlingx-GA-metadata.xml ${METADATA_FILE}
 	sed -i "s/xxxPLATFORM_RELEASExxx/${PLATFORM_RELEASE}/g" ${METADATA_FILE}
 
 override_dh_install:
diff --git a/software/service-files/STX_GA-metadata.xml b/software/service-files/starlingx-GA-metadata.xml
similarity index 100%
rename from software/service-files/STX_GA-metadata.xml
rename to software/service-files/starlingx-GA-metadata.xml
diff --git a/software/software/constants.py b/software/software/constants.py
index 773d7568..8ad29731 100644
--- a/software/software/constants.py
+++ b/software/software/constants.py
@@ -100,7 +100,7 @@ SIG_EXTENSION = ".sig"
 PATCH_EXTENSION = ".patch"
 SUPPORTED_UPLOAD_FILE_EXT = [ISO_EXTENSION, SIG_EXTENSION, PATCH_EXTENSION]
 SCRATCH_DIR = "/scratch"
-RELEASE_METADATA_FILE = "STX_%s_GA-metadata.xml"
+RELEASE_GA_NAME = "starlingx-%s.0"
 
 CONTROLLER_HOSTNAME = 'controller'
 CONTROLLER_0_HOSTNAME = '%s-0' % CONTROLLER_HOSTNAME
diff --git a/software/software/software_controller.py b/software/software/software_controller.py
index 29567783..1e46c77f 100644
--- a/software/software/software_controller.py
+++ b/software/software/software_controller.py
@@ -1006,12 +1006,13 @@ class PatchController(PatchService):
 
             # After successful validation, copy metadata.xml to /opt/software/metadata/available
             os.makedirs(constants.AVAILABLE_DIR, exist_ok=True)
-            stx_release_metadata_file = "STX_%s_GA-metadata.xml" % to_release
-            abs_stx_release_metadata_file = os.path.join(iso_mount_dir,
-                                                         'upgrades',
+            to_release_name = constants.RELEASE_GA_NAME % to_release
+            stx_release_metadata_file = "%s-metadata.xml" % to_release_name
+            abs_stx_release_metadata_file = os.path.join(iso_mount_dir, 'upgrades',
                                                          stx_release_metadata_file)
 
             # Copy stx release metadata.xml to available metadata dir
+            # TODO(heitormatsui): treat the prepatched iso scenario
             shutil.copyfile(abs_stx_release_metadata_file,
                             os.path.join(constants.AVAILABLE_DIR, stx_release_metadata_file))
             LOG.info("Copied %s to %s", abs_stx_release_metadata_file, constants.AVAILABLE_DIR)
diff --git a/software/software/tests/test_software_controller.py b/software/software/tests/test_software_controller.py
index ca75a96f..c5ed800a 100644
--- a/software/software/tests/test_software_controller.py
+++ b/software/software/tests/test_software_controller.py
@@ -68,11 +68,11 @@ class TestSoftwareController(unittest.TestCase):
         self.assertEqual(error, '')
 
         # Verify that the expected methods were called on the ReleaseData object
-        release_data.parse_metadata.assert_called_once_with('/mnt/iso/upgrades/STX_2.0_GA-metadata.xml', state='available')
+        release_data.parse_metadata.assert_called_once_with('/mnt/iso/upgrades/starlingx-2.0.0-metadata.xml', state='available')
 
         # Verify that the expected files were copied to the expected directories
-        mock_copyfile.assert_called_once_with('/mnt/iso/upgrades/STX_2.0_GA-metadata.xml',
-                                              constants.AVAILABLE_DIR + '/STX_2.0_GA-metadata.xml')
+        mock_copyfile.assert_called_once_with('/mnt/iso/upgrades/starlingx-2.0.0-metadata.xml',
+                                              constants.AVAILABLE_DIR + '/starlingx-2.0.0-metadata.xml')
         expected_calls = [call(constants.AVAILABLE_DIR, exist_ok=True),
                           call(constants.FEED_OSTREE_BASE_DIR, exist_ok=True)]
         self.assertEqual(mock_makedirs.call_count, 2)